step5美化界面图标

guohuan78 · Dec 16, 2022 · a53bc37 · a53bc37
1 parent 4d4c87e
commit a53bc37
Show file tree

Hide file tree

Showing 75 changed files with 31 additions and 235 deletions.
diff --git a/README.md b/README.md
@@ -59,6 +59,22 @@
 | :--------------------------------------------: | :--------------------------------------------: |
 | ![step4图1主界面支出图标展示](img/step4_1.png) | ![step4图2主界面收入图标展示](img/step4_2.png) |
 
+### step5
+
+1. 美化软件界面按钮图标
+2. 更多菜单统一命名为两个字的
+3. 美化软件图标
+
+|                            主界面                            |                     主界面点击右上角更多                     |
+| :----------------------------------------------------------: | :----------------------------------------------------------: |
+|     ![step5图1主界面右上角更多图标展示](img/step5_1.png)     |        ![step5图2主界面收入图标展示](img/step5_2.png)        |
+|        **账单详情（记录界面相同）日历与返回图标更改**        |                     **搜索界面图标更改**                     |
+| ![step5图3账单详情界面左上角右上角两个图标更改](img/step5_3.png) | ![step5图4搜索界面左上角，中间与右上角三个图标更改](img/step5_4.png) |
+
+软件图标更改为如下：
+
+![step5图1主界面右上角更多图标展示](img/step5_5.png)
+
 ### todo
 
-1. 继续美化界面，更改系统的 `更多` `返回` `关闭`等 按钮图标
+1. 尝试写一下大作业的报告，遇到问题有需要补充的再继续开发
diff --git a/app/release/easy_bookkeeping_step5.apk b/app/release/easy_bookkeeping_step5.apk
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/drawable/main_morebtn_bg.xml b/app/src/main/res/drawable/main_morebtn_bg.xml
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
@@ -26,7 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginRight="10dp"
-            android:src="@mipmap/it_rili"
+            android:src="@mipmap/it_calendar"
             android:layout_alignParentRight="true"
             android:onClick="onClick"/>
     </RelativeLayout>

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -39,7 +39,7 @@
             android:layout_alignParentRight="true"
             android:onClick="onClick"
             android:padding="10dp"
-            android:src="@mipmap/more" />
+            android:src="@mipmap/it_more" />
     </RelativeLayout>
 
     <androidx.viewpager.widget.ViewPager

diff --git a/app/src/main/res/layout/activity_month_chart.xml b/app/src/main/res/layout/activity_month_chart.xml
@@ -25,7 +25,7 @@
             android:id="@+id/chart_iv_rili"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:src="@mipmap/it_rili"
+            android:src="@mipmap/it_calendar"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
             android:onClick="onClick"/>

diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
@@ -33,7 +33,7 @@
             android:id="@+id/search_iv_sh"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@mipmap/search"
+            android:src="@mipmap/it_search"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="20dp"

diff --git a/app/src/main/res/layout/dialog_calendar.xml b/app/src/main/res/layout/dialog_calendar.xml
@@ -23,6 +23,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/dialog_calendar_iv"
-        android:src="@mipmap/ih_error"
+        android:src="@mipmap/it_close"
         android:padding="20dp"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_more.xml b/app/src/main/res/layout/dialog_more.xml
@@ -11,19 +11,19 @@
         <Button
             android:id="@+id/dialog_more_btn_info"
             style="@style/dialogmoreStyle"
-            android:drawableTop="@mipmap/it_xiqing"
+            android:drawableTop="@mipmap/it_charts"
             android:text="@string/account_info" />
         <Button
             android:id="@+id/dialog_more_btn_record"
             style="@style/dialogmoreStyle"
-            android:drawableTop="@mipmap/it_jilu"
+            android:drawableTop="@mipmap/it_bill"
             android:text="@string/history_record"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"/>
         <Button
             android:id="@+id/dialog_more_btn_search"
             style="@style/dialogmoreStyle"
-            android:drawableTop="@mipmap/search"
+            android:drawableTop="@mipmap/it_search"
             android:text="@string/history_search" />
     </LinearLayout>
     <LinearLayout
@@ -35,13 +35,13 @@
         <Button
             android:id="@+id/dialog_more_btn_setting"
             style="@style/dialogmoreStyle"
-            android:drawableTop="@mipmap/it_shezhi"
+            android:drawableTop="@mipmap/it_settings"
             android:layout_marginRight="15dp"
             android:text="@string/setting"/>
         <Button
             android:id="@+id/dialog_more_btn_about"
             style="@style/dialogmoreStyle"
-            android:drawableTop="@mipmap/it_guanyu"
+            android:drawableTop="@mipmap/it_about"
             android:layout_marginRight="15dp"
             android:text="@string/about"/>
 
@@ -50,7 +50,7 @@
         android:id="@+id/dialog_more_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/ih_error"
+        android:src="@mipmap/it_close"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="10dp"/>
 </LinearLayout>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_about.png b/app/src/main/res/mipmap-xhdpi/it_about.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_back.png b/app/src/main/res/mipmap-xhdpi/it_back.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_bill.png b/app/src/main/res/mipmap-xhdpi/it_bill.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_calendar.png b/app/src/main/res/mipmap-xhdpi/it_calendar.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_charts.png b/app/src/main/res/mipmap-xhdpi/it_charts.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_close.png b/app/src/main/res/mipmap-xhdpi/it_close.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_more.png b/app/src/main/res/mipmap-xhdpi/it_more.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_search.png b/app/src/main/res/mipmap-xhdpi/it_search.png
diff --git a/app/src/main/res/mipmap-xhdpi/it_settings.png b/app/src/main/res/mipmap-xhdpi/it_settings.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_icon1.png b/app/src/main/res/mipmap-xxhdpi/ic_icon1.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ih_error.png b/app/src/main/res/mipmap-xxhdpi/ih_error.png
diff --git a/app/src/main/res/mipmap-xxhdpi/it_back.png b/app/src/main/res/mipmap-xxhdpi/it_back.png
diff --git a/app/src/main/res/mipmap-xxhdpi/it_guanyu.png b/app/src/main/res/mipmap-xxhdpi/it_guanyu.png
diff --git a/app/src/main/res/mipmap-xxhdpi/it_jilu.png b/app/src/main/res/mipmap-xxhdpi/it_jilu.png
diff --git a/app/src/main/res/mipmap-xxhdpi/it_rili.png b/app/src/main/res/mipmap-xxhdpi/it_rili.png
diff --git a/app/src/main/res/mipmap-xxhdpi/it_searchtext.png b/app/src/main/res/mipmap-xxhdpi/it_searchtext.png
diff --git a/app/src/main/res/mipmap-xxhdpi/it_shezhi.png b/app/src/main/res/mipmap-xxhdpi/it_shezhi.png
diff --git a/app/src/main/res/mipmap-xxhdpi/it_xiqing.png b/app/src/main/res/mipmap-xxhdpi/it_xiqing.png
diff --git a/app/src/main/res/mipmap-xxhdpi/more.png b/app/src/main/res/mipmap-xxhdpi/more.png
diff --git a/app/src/main/res/mipmap-xxhdpi/search.png b/app/src/main/res/mipmap-xxhdpi/search.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -14,9 +14,9 @@
     <string name="cancel">取消</string>
     <string name="about">关于</string>
     <string name="setting">设置</string>
-    <string name="history_record">账单记录</string>
-    <string name="history_search">账单搜索</string>
-    <string name="account_info">账单详情</string>
+    <string name="history_record">记录</string>
+    <string name="history_search">搜索</string>
+    <string name="account_info">图表</string>
     <string name="please_input_time">请输入时间(24小时制)</string>
     <string name="please_search_info">请输入搜索信息</string>
     <string name="date_empty">数据为空，无此类记录~~</string>

diff --git a/ico/128px/ic_drink.png b/ico/128px/ic_drink.png
diff --git a/ico/128px/ic_fruit.png b/ico/128px/ic_fruit.png
diff --git a/ico/128px/ic_meal.png b/ico/128px/ic_meal.png
diff --git a/ico/128px/ic_snack.png b/ico/128px/ic_snack.png
diff --git a/ico/128px/it_searchtext.png b/ico/128px/it_searchtext.png
diff --git a/ico/200px/it_about.png b/ico/200px/it_about.png
diff --git a/ico/200px/it_back.png b/ico/200px/it_back.png
diff --git a/ico/200px/it_bill.png b/ico/200px/it_bill.png
diff --git a/ico/200px/it_calendar.png b/ico/200px/it_calendar.png
diff --git a/ico/200px/it_charts.png b/ico/200px/it_charts.png
diff --git a/ico/200px/it_close.png b/ico/200px/it_close.png
diff --git a/ico/200px/it_more.png b/ico/200px/it_more.png
diff --git a/ico/200px/it_search.png b/ico/200px/it_search.png
diff --git a/ico/200px/it_searchtext.png b/ico/200px/it_searchtext.png
diff --git a/ico/200px/it_settings.png b/ico/200px/it_settings.png
diff --git a/ico/64px/it_about.png b/ico/64px/it_about.png
diff --git a/ico/64px/it_back.png b/ico/64px/it_back.png
diff --git a/ico/64px/it_bill.png b/ico/64px/it_bill.png
diff --git a/ico/64px/it_calendar.png b/ico/64px/it_calendar.png
diff --git a/ico/64px/it_charts.png b/ico/64px/it_charts.png
diff --git a/ico/64px/it_close.png b/ico/64px/it_close.png
diff --git a/ico/64px/it_more.png b/ico/64px/it_more.png
diff --git a/ico/64px/it_search.png b/ico/64px/it_search.png
diff --git a/ico/64px/it_settings.png b/ico/64px/it_settings.png
diff --git a/ico/ic_launcher.png b/ico/ic_launcher.png
diff --git a/ico/ic_launcher_round.png b/ico/ic_launcher_round.png
diff --git a/img/step5_1.png b/img/step5_1.png
diff --git a/img/step5_2.png b/img/step5_2.png
diff --git a/img/step5_3.png b/img/step5_3.png
diff --git a/img/step5_4.png b/img/step5_4.png
diff --git a/img/step5_5.png b/img/step5_5.png