tt/VscoolOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:2.6

Browse Source 
fix:
update:修改主页图标，布局
This commit is contained in:
Fanhuitong
2023-02-16 17:26:39 +08:00
parent 75214f440a
commit 38579282b7
29 changed files with 180 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/battery_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable-hdpi/battery_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-hdpi/default_head.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/drawable-hdpi/home_contact_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
app/src/main/res/drawable-hdpi/home_quick_app.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 39 KiB

BIN
app/src/main/res/drawable-hdpi/home_reminder_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 55 KiB

BIN
app/src/main/res/drawable-hdpi/home_settings_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
app/src/main/res/drawable-hdpi/home_sos_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 32 KiB

BIN
app/src/main/res/drawable-hdpi/icon_family_space.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
app/src/main/res/drawable-hdpi/systemapp_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/drawable-hdpi/wifi_connect.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
app/src/main/res/drawable-hdpi/wifi_disconnect.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
app/src/main/res/drawable-hdpi/wifi_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.7 KiB

2
app/src/main/res/drawable/background_weather_rain.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid
android:color="#00b7ee" />
android:color="#bad9f9" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="16dp"

2
app/src/main/res/drawable/background_weather_sun.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid
android:color="#fbc23b" />
android:color="#fcebc3" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="16dp"

2
app/src/main/res/drawable/background_weather_sunny.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid
android:color="#acd598" />
android:color="#90a1b7" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="16dp"

2
app/src/main/res/drawable/custom_bg_white.xml → app/src/main/res/drawable/custom_bg_alarm.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid
android:color="@color/white" />
android:color="@color/alarm_bg_color" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="10dp"

13
app/src/main/res/drawable/custom_bg_appstore.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid
android:color="@color/appstore_bg_color" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="10dp"
android:topRightRadius="10dp"
android:bottomLeftRadius="10dp"
android:bottomRightRadius="10dp" />
</shape>

2
app/src/main/res/drawable/custom_bg_health.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid
android:color="@color/white" />
android:color="@color/health_bg_color" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="10dp"

72
app/src/main/res/layout-land/fragment_custom.xml
View File

@@ -102,11 +102,9 @@
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/imageView6"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:id="@+id/iv_battery"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_8"
android:src="@drawable/battery_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -124,7 +122,7 @@
android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView6"
app:layout_constraintStart_toEndOf="@+id/iv_battery"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -216,7 +214,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="天气预报"
android:textColor="@color/white"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -229,7 +227,7 @@
android:layout_marginEnd="@dimen/dp_36"
android:gravity="center_vertical"
android:text="10℃"
android:textColor="@color/white"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_30"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@@ -243,7 +241,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:text="位置"
android:textColor="@color/white"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/tv_temp"
@@ -255,7 +253,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:text="天气"
android:textColor="@color/white"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/tv_location"
@@ -272,7 +270,7 @@
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="3"
android:background="@drawable/custom_bg_white">
android:background="@drawable/custom_bg_alarm">
<TextView
android:id="@+id/textView4"
@@ -281,14 +279,14 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="爱心闹钟"
android:textColor="@color/title_gray"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/iv_note_nodata"
android:id="@+id/tv_note_nodata"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/noti_background"
@@ -299,10 +297,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_note_nodata"
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_68"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:visibility="visible"
android:src="@drawable/home_reminder_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_noti"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:overScrollMode="never"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView4" />
@@ -317,7 +328,7 @@
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="2"
android:background="@drawable/custom_bg_white">
android:background="@drawable/custom_bg_sos">
<TextView
android:id="@+id/textView7"
@@ -326,7 +337,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="紧急呼叫"
android:textColor="@color/title_gray"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -337,7 +348,7 @@
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_68"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:scaleType="centerInside"
android:src="@drawable/home_sos_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -418,7 +429,7 @@
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_white"
android:background="@drawable/custom_bg_clean"
tools:ignore="NestedWeights">
<TextView
@@ -440,6 +451,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:visibility="gone"
android:src="@drawable/home_icon_clean"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -463,8 +475,8 @@
app:cpvDuration="1000"
app:cpvLabelTextColor="@color/black"
app:cpvLabelTextSize="26sp"
app:cpvNormalColor="#FFD3D3D3"
app:cpvProgressColor="#ff9300"
app:cpvNormalColor="#bae2d6"
app:cpvProgressColor="#05d192"
app:cpvShowTick="false"
app:cpvStrokeWidth="@dimen/dp_16"
app:layout_constraintBottom_toBottomOf="parent"
@@ -530,7 +542,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="快捷应用"
android:textColor="@color/title_gray"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -541,7 +553,7 @@
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_68"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:scaleType="centerInside"
android:src="@drawable/home_quick_app"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -559,7 +571,7 @@
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_white">
android:background="@drawable/custom_bg_contact">
<TextView
android:id="@+id/textView2"
@@ -568,7 +580,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="通讯录"
android:textColor="@color/title_gray"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -578,7 +590,7 @@
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_68"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:scaleType="centerInside"
android:src="@drawable/home_contact_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -595,7 +607,7 @@
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_ai"
android:background="@drawable/custom_bg_appstore"
android:visibility="gone">
<TextView
@@ -604,7 +616,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="应用市场"
android:textColor="@color/white"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -614,7 +626,7 @@
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_68"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:scaleType="centerInside"
android:src="@drawable/systemapp_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -639,7 +651,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="AI问诊"
android:textColor="@color/white"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -649,7 +661,7 @@
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_68"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:scaleType="centerInside"
android:src="@drawable/home_clinical_hand"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

1
app/src/main/res/layout-land/fragment_custom_back.xml
View File

@@ -328,7 +328,6 @@
android:layout_marginStart="32dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/wifi_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

27
app/src/main/res/layout-port/fragment_custom.xml
View File

@@ -101,7 +101,7 @@
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/imageView6"
android:id="@+id/iv_battery"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true"
@@ -123,7 +123,7 @@
android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView6"
app:layout_constraintStart_toEndOf="@+id/iv_battery"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -281,7 +281,7 @@
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/custom_bg_white">
android:background="@drawable/custom_bg_alarm">
<TextView
android:id="@+id/textView4"
@@ -297,7 +297,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/iv_note_nodata"
android:id="@+id/tv_note_nodata"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/noti_background"
@@ -308,6 +308,19 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_note_nodata"
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_68"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:visibility="visible"
android:src="@drawable/home_reminder_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_noti"
android:layout_width="match_parent"
@@ -334,7 +347,7 @@
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/custom_bg_white">
android:background="@drawable/custom_bg_alarm">
<TextView
android:id="@+id/textView7"
@@ -394,7 +407,7 @@
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="1"
android:background="@drawable/custom_bg_white"
android:background="@drawable/custom_bg_alarm"
tools:ignore="NestedWeights">
<ImageView
@@ -650,7 +663,7 @@
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_white">
android:background="@drawable/custom_bg_alarm">
<TextView
android:id="@+id/textView2"

2
app/src/main/res/layout/activity_main.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/wallpaper"
android:background="@color/main_bg_color"
tools:context=".activity.main.MainActivity">
<androidx.viewpager.widget.ViewPager

17
app/src/main/res/values/colors.xml
View File

@@ -21,12 +21,13 @@
<color name="voice_color">#00D56B</color>
<color name="weathet_bg_color">#3b6ab9</color>
<color name="health_bg_color">#00d56b</color>
<color name="sos_bg_color">#b25353</color>
<color name="clean_bg_color">#3f8f4b</color>
<color name="health_bg_color">#ecfafd</color>
<color name="alarm_bg_color">#e1e5fa</color>
<color name="sos_bg_color">#fadfdf</color>
<color name="clean_bg_color">#e0fbf3</color>
<color name="guard_bg_color">#e08c61</color>
<color name="contact_bg_color">#536fae</color>
<color name="appstore_bg_color">#00d56b</color>
<color name="contact_bg_color">#e8eafc</color>
<color name="appstore_bg_color">#fcf3e7</color>
<color name="noti_color">#eae8e8</color>
<color name="noti_font_color">#bbbaba</color>
@@ -34,4 +35,10 @@
<color name="title_gray">#858585</color>
<color name="title_red">#F44250</color>
<color name="title_red2">#F5AAA7</color>
<color name="default_text_color">#323a4c</color>
<color name="main_bg_color">#323a4c</color>
<color name="charging_color">#00d56b</color>
<color name="no_charging_color">#a0a0a0</color>
</resources>