Переглянути джерело

main首页的Icon尺寸固定与图标替换

liukai 2 роки тому
батько
коміт
84e7d06b55
24 змінених файлів з 28 додано та 33 видалено
  1. BIN
      cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_activities_blue_icon.webp
  2. BIN
      cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_activities_gray_icon.webp
  3. BIN
      cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_jobs_blue_icon.webp
  4. BIN
      cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_jobs_gray_icon.webp
  5. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_active_blue.webp
  6. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_active_gray.webp
  7. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_home_blue.png
  8. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_home_blue.webp
  9. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_home_gray.png
  10. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_home_gray.webp
  11. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_me_blue.png
  12. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_me_blue.webp
  13. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_me_gray.png
  14. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_me_gray.webp
  15. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_part_jobs_blue.webp
  16. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_part_jobs_gray.webp
  17. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_wallet_blue.webp
  18. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_wallet_gray.webp
  19. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_yypay_blue.png
  20. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_yypay_gray.png
  21. 6 6
      cpt_main/src/main/res/drawable/selector_main_tab_active.xml
  22. 6 6
      cpt_main/src/main/res/drawable/selector_main_tab_partjob.xml
  23. 6 6
      cpt_main/src/main/res/drawable/selector_main_tab_wallet.xml
  24. 10 15
      cpt_main/src/main/res/layout/activity_main.xml

BIN
cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_activities_blue_icon.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_activities_gray_icon.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_jobs_blue_icon.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_jobs_gray_icon.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_active_blue.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_active_gray.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_home_blue.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_home_blue.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_home_gray.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_home_gray.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_me_blue.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_me_blue.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_me_gray.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_me_gray.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_part_jobs_blue.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_part_jobs_gray.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_wallet_blue.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_wallet_gray.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_yypay_blue.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_yypay_gray.png


+ 6 - 6
cpt_main/src/main/res/drawable/selector_main_tab_active.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/iv_part_time_activities_blue_icon" android:state_pressed="true" />
-    <item android:drawable="@drawable/iv_part_time_activities_blue_icon" android:state_selected="true" />
-    <item android:drawable="@drawable/iv_part_time_activities_blue_icon" android:state_active="true" />
-    <item android:drawable="@drawable/iv_part_time_activities_gray_icon" android:state_selected="false" />
-    <item android:drawable="@drawable/iv_part_time_activities_gray_icon" android:state_active="false" />
-    <item android:drawable="@drawable/iv_part_time_activities_gray_icon" android:state_pressed="false" />
+    <item android:drawable="@drawable/main_active_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_active_blue" android:state_selected="true" />
+    <item android:drawable="@drawable/main_active_blue" android:state_active="true" />
+    <item android:drawable="@drawable/main_active_gray" android:state_selected="false" />
+    <item android:drawable="@drawable/main_active_gray" android:state_active="false" />
+    <item android:drawable="@drawable/main_active_gray" android:state_pressed="false" />
 
 </selector>

+ 6 - 6
cpt_main/src/main/res/drawable/selector_main_tab_partjob.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/iv_part_time_jobs_blue_icon" android:state_pressed="true" />
-    <item android:drawable="@drawable/iv_part_time_jobs_blue_icon" android:state_selected="true" />
-    <item android:drawable="@drawable/iv_part_time_jobs_blue_icon" android:state_active="true" />
-    <item android:drawable="@drawable/iv_part_time_jobs_gray_icon" android:state_selected="false" />
-    <item android:drawable="@drawable/iv_part_time_jobs_gray_icon" android:state_active="false" />
-    <item android:drawable="@drawable/iv_part_time_jobs_gray_icon" android:state_pressed="false" />
+    <item android:drawable="@drawable/main_part_jobs_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_part_jobs_blue" android:state_selected="true" />
+    <item android:drawable="@drawable/main_part_jobs_blue" android:state_active="true" />
+    <item android:drawable="@drawable/main_part_jobs_gray" android:state_selected="false" />
+    <item android:drawable="@drawable/main_part_jobs_gray" android:state_active="false" />
+    <item android:drawable="@drawable/main_part_jobs_gray" android:state_pressed="false" />
 
 </selector>

+ 6 - 6
cpt_main/src/main/res/drawable/selector_main_tab_wallet.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/main_yypay_blue" android:state_pressed="true" />
-    <item android:drawable="@drawable/main_yypay_blue" android:state_selected="true" />
-    <item android:drawable="@drawable/main_yypay_blue" android:state_active="true" />
-    <item android:drawable="@drawable/main_yypay_gray" android:state_selected="false" />
-    <item android:drawable="@drawable/main_yypay_gray" android:state_active="false" />
-    <item android:drawable="@drawable/main_yypay_gray" android:state_pressed="false" />
+    <item android:drawable="@drawable/main_wallet_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_wallet_blue" android:state_selected="true" />
+    <item android:drawable="@drawable/main_wallet_blue" android:state_active="true" />
+    <item android:drawable="@drawable/main_wallet_gray" android:state_selected="false" />
+    <item android:drawable="@drawable/main_wallet_gray" android:state_active="false" />
+    <item android:drawable="@drawable/main_wallet_gray" android:state_pressed="false" />
 </selector>

+ 10 - 15
cpt_main/src/main/res/layout/activity_main.xml

@@ -56,8 +56,8 @@
 
                 <ImageView
                     android:id="@+id/iv_home_text"
-                    android:layout_width="@dimen/d_25dp"
-                    android:layout_height="@dimen/d_25dp"
+                    android:layout_width="@dimen/d_30dp"
+                    android:layout_height="@dimen/d_30dp"
                     android:src="@drawable/selector_main_tab_home"
                     app:layout_constraintBottom_toTopOf="@+id/tv_home_text"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -69,7 +69,6 @@
                     android:id="@+id/tv_home_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="首页"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"
@@ -106,8 +105,8 @@
 
                 <ImageView
                     android:id="@+id/iv_parttime_text"
-                    android:layout_width="@dimen/d_25dp"
-                    android:layout_height="@dimen/d_25dp"
+                    android:layout_width="@dimen/d_30dp"
+                    android:layout_height="@dimen/d_30dp"
                     android:src="@drawable/selector_main_tab_partjob"
                     app:layout_constraintBottom_toTopOf="@+id/tv_parttime_text"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -119,7 +118,6 @@
                     android:id="@+id/tv_parttime_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="兼职"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"
@@ -156,8 +154,8 @@
 
                 <ImageView
                     android:id="@+id/iv_actives_text"
-                    android:layout_width="@dimen/d_25dp"
-                    android:layout_height="@dimen/d_25dp"
+                    android:layout_width="@dimen/d_30dp"
+                    android:layout_height="@dimen/d_30dp"
                     android:src="@drawable/selector_main_tab_active"
                     app:layout_constraintBottom_toTopOf="@+id/tv_actives_text"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -169,7 +167,6 @@
                     android:id="@+id/tv_actives_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="工作状态"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"
@@ -205,14 +202,13 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="@dimen/d_25dp"
-                    android:layout_height="@dimen/d_25dp"
+                    android:layout_width="@dimen/d_30dp"
+                    android:layout_height="@dimen/d_30dp"
                     android:src="@drawable/selector_main_tab_wallet" />
 
                 <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="钱包"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp" />
@@ -230,8 +226,8 @@
 
                 <ImageView
                     android:id="@+id/iv_me_text"
-                    android:layout_width="@dimen/d_25dp"
-                    android:layout_height="@dimen/d_25dp"
+                    android:layout_width="@dimen/d_30dp"
+                    android:layout_height="@dimen/d_30dp"
                     android:src="@drawable/selector_main_tab_me"
                     app:layout_constraintBottom_toTopOf="@+id/tv_me_text"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -243,7 +239,6 @@
                     android:id="@+id/tv_me_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="我的"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"