diff --git a/app/build.gradle b/app/build.gradle index b8f3c81a0..6729eb380 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -292,6 +292,8 @@ dependencies { // xplan flutter module implementation project(path: ':flutter') implementation project(path: ':flutter_boost') + + implementation 'me.jessyan:autosize:1.2.1' } repositories { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e746630bf..272680b92 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,6 +102,13 @@ android:usesCleartextTraffic="true" tools:replace="android:name, android:allowBackup"> + + + diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 3d638cecf..5a4e6ce7a 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -62,7 +62,7 @@ android:layout_height="@dimen/dp_15" android:layout_marginStart="4dp" android:layout_marginEnd="8dp" - android:src="@mipmap/ic_text_clear" /> + android:src="@drawable/ic_nick_delete" /> diff --git a/app/src/main/res/layout/item_micro_dating_boss.xml b/app/src/main/res/layout/item_micro_dating_boss.xml index cc797a1ec..8111e5c7a 100644 --- a/app/src/main/res/layout/item_micro_dating_boss.xml +++ b/app/src/main/res/layout/item_micro_dating_boss.xml @@ -9,11 +9,13 @@ + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintWidth_percent="0.2"> diff --git a/app/src/main/res/mipmap-xhdpi/ic_text_clear.png b/app/src/main/res/mipmap-xhdpi/ic_text_clear.png new file mode 100644 index 000000000..4d032e602 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_text_clear.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_text_clear.webp b/app/src/main/res/mipmap-xhdpi/ic_text_clear.webp deleted file mode 100644 index 28b385ece..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_text_clear.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_text_clear.webp b/app/src/main/res/mipmap-xxhdpi/ic_text_clear.webp deleted file mode 100644 index 4a4aba8d1..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_text_clear.webp and /dev/null differ diff --git a/app/src/module_labour_union/res/layout/item_clan_income.xml b/app/src/module_labour_union/res/layout/item_clan_income.xml index eb8e96de7..ee2093471 100644 --- a/app/src/module_labour_union/res/layout/item_clan_income.xml +++ b/app/src/module_labour_union/res/layout/item_clan_income.xml @@ -91,7 +91,7 @@ android:id="@+id/tv_normal_gift_income" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/app_248cfe" + android:textColor="@color/text_normal_c6c6e9" android:textSize="15sp" tools:text="+8" /> @@ -99,7 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="普通礼物流水" - android:textColor="@color/text_normal_c6c6e9" + android:textColor="@color/text_secondary_4f516a" android:textSize="10sp" /> @@ -114,7 +114,7 @@ android:id="@+id/tv_bag_income" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/app_248cfe" + android:textColor="@color/text_normal_c6c6e9" android:textSize="15sp" tools:text="+8" /> @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="背包礼物流水" - android:textColor="@color/text_normal_c6c6e9" + android:textColor="@color/text_secondary_4f516a" android:textSize="10sp" /> diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index dc13b263f..feee42675 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignBottom="@id/micro_view" android:layout_centerHorizontal="true" - android:layout_marginBottom="30dp" + android:layout_marginBottom="35dp" android:gravity="center" android:orientation="vertical" android:visibility="gone">