布局配色方案调整

app/build.gradle

@@ -119,4 +119,6 @@ dependencies {
     testImplementation "androidx.room:room-testing:$room_version"
 
     implementation 'com.youth.banner:banner:2.0.7'
+
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
 }

app/src/main/res/drawable/black_border.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="#000000" />
+    <solid android:color="@android:color/transparent" />
+</shape>

app/src/main/res/drawable/ic_arrow_left.xml

@@ -1,7 +1,7 @@
-<vector android:height="100dp"
+<vector android:height="50dp"
     android:viewportHeight="1024"
     android:viewportWidth="1024"
-    android:width="100dp"
+    android:width="50dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
         android:fillColor="#323233"

app/src/main/res/drawable/ic_arrow_right.xml

@@ -1,7 +1,7 @@
-<vector android:height="100dp"
+<vector android:height="50dp"
     android:viewportHeight="1024"
     android:viewportWidth="1024"
-    android:width="100dp"
+    android:width="50dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
         android:fillColor="#323233"

app/src/main/res/drawable/ic_forum.xml

@@ -0,0 +1,12 @@
+<vector android:height="50dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M810.67,256h42.67a128,128 0,0 1,128 128v363.22A106.11,106.11 0,0 1,875.22 853.33h-53.76a42.67,42.67 0,0 0,-38.44 24.28l-26.03,54.44a85.33,85.33 0,0 1,-155.65 -3.58l-20.69,-49.07a42.67,42.67 0,0 0,-39.3 -26.07h-113.92a42.67,42.67 0,0 1,0 -85.33h113.92a128,128 0,0 1,117.93 78.25l20.69,49.07 26.03,-54.49A128,128 0,0 1,821.5 768h53.72c11.48,0 20.78,-9.3 20.78,-20.78L896,384a42.67,42.67 0,0 0,-42.67 -42.67h-42.67v255.32a128.13,128.13 0,0 1,-127.87 128.3h-213.59c-35.71,0 -90.2,22.49 -115.37,47.53l-37.42,37.21C272.98,852.91 213.33,829.1 213.33,767.23h85.33v0.68L213.33,767.91c0,-24.28 -19.54,-44.37 -43.61,-44.89A130.26,130.26 0,0 1,42.67 593.45L42.67,255.66A127.74,127.74 0,0 1,170.41 128h512.51A128.09,128.09 0,0 1,810.67 256zM298.67,767.91L213.33,767.91v-0.68h85.33v0.68zM288.43,717.23l5.25,-5.25c41.13,-40.96 117.29,-72.36 175.53,-72.36h213.59c23.38,0 42.54,-19.2 42.54,-42.97L725.33,256.3C725.33,232.58 706.22,213.33 682.92,213.33L170.41,213.33A42.41,42.41 0,0 0,128 255.66v337.79c0,23.68 19.67,43.73 43.61,44.29A130.13,130.13 0,0 1,288.43 717.23z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M256,384h341.33a42.67,42.67 0,0 0,0 -85.33H256a42.67,42.67 0,1 0,0 85.33zM256,554.67h256a42.67,42.67 0,0 0,0 -85.33H256a42.67,42.67 0,1 0,0 85.33z" />
+</vector>

app/src/main/res/drawable/ic_garbage.xml

@@ -0,0 +1,9 @@
+<vector android:height="50dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M437.9,165.2C485.6,208 566,305.3 570.2,310.4l-59.1,40.5 215.6,-0.1 63.2,-171.4 -60.6,28.8 -55.5,-64.9c-0.7,-0.8 -13.9,-17 -25.7,-21.4 -11.8,-4.3 -33.7,-3 -34.9,-3l-245.9,16c6.2,-0.2 36.8,0.1 70.6,30.3zM797.1,632.4c5.1,-1.2 102.8,-24.5 121.7,-38.9 18.8,-14.4 46.9,-44.2 40.2,-87.1L819.7,333.5 659.8,447.8l137.3,184.6zM486,237.2c-3.4,-3.7 -70.6,-72.9 -93.4,-81.9 -13.7,-5.3 -34.5,-11 -57.3,-9.5 -15.1,1.1 -31.2,5.4 -46.8,15L180.8,349.6 366,429.7l120,-192.5zM889.4,625.7c-63.1,19.5 -194.3,40.8 -201.2,41.9l-14.3,-66.3 -94.1,175.2 141.6,128.9 -1.9,-62.2 88.4,-15.8c1,-0.2 22.8,-3.6 32.3,-11.3 9.5,-7.6 17.8,-26 18.2,-27l91.7,-207c-2.3,5.2 -16.1,29.9 -60.7,43.6zM278.9,674.2c-1.6,4.6 -31.3,92.1 -27.7,114.4 3.5,22.4 16.5,59.9 60.1,78l234.5,-13.7 -22.6,-184.6 -244.3,5.9zM236.4,748.5c15.1,-58.9 64.2,-171.2 66.8,-177.1l69.5,24.9 -114,-166.9L64,468.5l59,32.2 -31.7,76.4c-0.4,1 -8.6,19.5 -6.5,30.9 2.2,11.4 14.9,27.5 15.6,28.5l144.8,182.1c-3.7,-4.7 -19.4,-28.6 -8.8,-70.1z" />
+</vector>

app/src/main/res/drawable/ic_info.xml

@@ -0,0 +1,9 @@
+<vector android:height="50dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M513.2,2.1C231.01,2.1 2.25,230.86 2.25,513.05S231.01,1024 513.2,1024s510.95,-228.76 510.95,-510.95S795.4,2.1 513.2,2.1zM513.2,71.78c243.73,0 441.27,197.55 441.27,441.27 0,86.6 -25.31,167.16 -68.43,235.31 -72.74,-77.77 -169.13,-133.2 -278.13,-153.64 67.82,-34.54 114.31,-104.85 114.31,-186.16 0,-115.44 -93.58,-209.02 -209.02,-209.02s-209.02,93.58 -209.02,209.02c0,81.31 46.54,151.62 114.31,186.16 -108.96,20.44 -205.35,75.87 -278.11,153.64 -43.12,-68.15 -68.45,-148.72 -68.45,-235.31 -0,-243.73 197.59,-441.27 441.27,-441.27zM513.2,559.52c-83.37,0 -150.96,-67.59 -150.96,-150.96s67.59,-150.96 150.96,-150.96 150.96,67.59 150.96,150.96c0,83.38 -67.59,150.96 -150.96,150.96zM513.2,954.33c-131.59,0 -249.42,-57.95 -330.27,-149.33 80.79,-91.54 198.64,-149.51 330.27,-149.51 131.68,0 249.53,57.97 330.3,149.49 -80.86,91.4 -198.66,149.35 -330.3,149.35z" />
+</vector>

app/src/main/res/drawable/ic_score.xml

@@ -0,0 +1,9 @@
+<vector android:height="50dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#515151"
+        android:pathData="M709.89,705.86c-12.93,-90.88 -83.14,-165.89 -174.78,-186.82 -19.97,-4.61 -19.71,-4.61 -20.16,-24.9 -0.19,-9.02 1.09,-16.19 8.51,-23.1 28.29,-26.56 55.68,-54.08 83.71,-80.96a19.65,19.65 0,0 0,6.53 -15.74c-0.19,-98.94 -0.13,-197.89 -0.06,-296.83v-12.1L352.7,65.41c-0.26,2.24 -0.51,3.2 -0.51,4.16 0,102.59 -0.13,205.18 0.13,307.84 0,3.97 2.82,8.77 5.76,11.78 26.11,25.92 52.16,51.97 79.1,76.93 9.98,9.28 14.66,18.56 13.7,32.13 -1.15,16.9 -0.26,16.96 -17.34,20.35 -115.07,23.04 -195.71,136.26 -177.54,249.02 20.22,125.57 137.15,208.64 265.09,188.22 121.22,-19.33 205.76,-131.33 188.8,-249.98zM641.28,708.61c-24.96,20.29 -49.92,40.38 -75.2,60.29 -5.76,4.54 -7.55,8.64 -5.44,16.13 8.51,30.08 16.26,60.42 23.87,90.75 0.96,3.71 1.92,10.3 -0.83,11.97 -2.75,1.6 -7.87,-1.28 -11.01,-3.2a4781.76,4781.76 0,0 1,-81.22 -50.5c-6.46,-4.16 -11.07,-3.84 -17.41,0.26 -27.46,17.47 -55.17,34.62 -82.94,51.52 -2.5,1.6 -6.14,3.46 -9.28,1.54 -3.07,-1.92 -1.86,-3.71 -2.43,-5.06l15.42,-58.94c3.39,-12.86 6.34,-25.86 10.43,-38.53 2.24,-6.98 0.45,-11.01 -5.06,-15.36 -24.96,-19.71 -49.73,-39.62 -74.37,-59.71 -3.01,-2.5 -8.13,-6.21 -6.72,-10.05 1.41,-3.84 7.81,-3.58 11.84,-3.84 33.02,-2.3 66.11,-3.9 99.2,-6.4 3.2,-0.26 7.49,-4.1 8.83,-7.23 12.35,-29.57 24.06,-59.39 36.35,-88.96 1.47,-3.58 2.82,-9.28 7.74,-9.28s6.08,6.02 7.62,9.6c12.1,29.25 24.06,58.62 35.58,88.19 2.3,5.82 5.18,8 11.71,8.26 33.41,1.6 66.88,3.78 100.22,6.02 2.94,0.19 7.68,1.15 8.51,4.03s-2.94,6.4 -5.44,8.51zM299.46,332.16c5.63,5.5 11.39,10.88 18.24,17.47L317.7,65.66c-41.79,-3.9 -64.13,15.74 -64.06,55.3 0.06,47.62 0.13,95.23 -0.06,142.78a52.16,52.16 0,0 0,17.54 40.96c9.73,8.9 18.88,18.37 28.35,27.46zM711.68,269.18c0.7,-52.54 0.9,-105.22 0.19,-157.76 -0.45,-31.81 -32.77,-53.82 -64.06,-44.74v278.98c18.24,-16.7 37.82,-33.22 55.36,-51.52 5.7,-5.89 8.45,-16.45 8.51,-24.96zM711.68,269.18" />
+</vector>

app/src/main/res/drawable/ic_visitor.xml

@@ -0,0 +1,9 @@
+<vector android:height="31.7425dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1613"
+    android:width="50dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M1158.89,685.5c-71.52,-75.92 -161.51,-114.16 -263.39,-127.57 -39.77,-5.24 -79.7,-5.79 -119.7,-3.42 -47.44,2.81 -94.03,10.49 -139.16,25.6 -126.28,42.27 -211.29,126.15 -253.13,252.87 -19.68,59.61 -25.9,121.12 -23.79,183.65 0.18,5.33 1.68,6.64 6.92,6.64 299.25,-0.13 598.49,-0.11 897.74,-0.11 1.97,0 3.94,0 6.1,0 0.19,-1.71 0.37,-2.77 0.43,-3.84 2.46,-51.1 -2,-101.57 -14.49,-151.22C1239.07,799.16 1207.85,737.47 1158.89,685.5zM664.91,414.13c53.98,47.08 117.18,64.95 187.96,52.09 60.04,-10.91 108.93,-41.68 145.45,-90.05 56.18,-74.41 68.57,-155.91 29.58,-241.68C982.93,35.54 872.06,-17.93 765.87,5.45c-108.45,23.87 -184.72,117.01 -184.72,234.4C582.87,304.02 609.72,365.99 664.91,414.13zM497.81,588.14c-5.83,-2.52 -10.99,-4.9 -16.26,-7.02 -39.88,-16.03 -81.46,-23.94 -124.26,-25.87 -56.42,-2.55 -111.89,2.8 -165.47,21.63 -68.23,23.97 -121.42,66.23 -155.63,130.71 -25.4,47.87 -35.66,99.46 -36.14,153.28 -0.07,7.85 -0.01,15.7 -0.01,23.76 104.99,0 208.84,0 312.86,0C335.64,761.66 392.73,660.27 497.81,588.14zM1611.38,751.41c-0.01,-2.48 -0.74,-5.08 -1.65,-7.43 -30.9,-79.82 -87.02,-134.3 -166.51,-165.08 -38.48,-14.9 -78.6,-22 -119.7,-23.73 -59.44,-2.5 -117.66,3.88 -173.67,25.16 -6.44,2.45 -12.71,5.33 -20,8.4 50.84,34.88 91.87,77.59 123.82,128.96 31.98,51.41 52.29,107.29 63.63,166.79 98.4,0 196.13,0 293.92,0 0.1,-1.35 0.21,-2.26 0.21,-3.18C1611.45,838.01 1611.48,794.71 1611.38,751.41zM1296.01,496.27c91.93,0.57 168.76,-75.46 169.18,-167.41 0.41,-90.51 -72.68,-162.18 -165.8,-162.6 -91.93,-0.41 -165.39,70.7 -165.91,160.62C1132.93,420.89 1204.72,495.7 1296.01,496.27zM328.48,496.27c91.92,0.55 168.78,-75.55 169.12,-167.45 0.33,-90.59 -72.7,-162.19 -165.81,-162.56 -92.16,-0.37 -165.48,70.88 -165.89,161.22C165.46,421.02 237.42,495.72 328.48,496.27z" />
+</vector>

app/src/main/res/layout/main/layout/activity_main_menu.xml

@@ -34,10 +34,10 @@
         android:id="@+id/nav_view"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?android:attr/windowBackground"
+        android:background="@color/colorBlue"
         android:textAlignment="gravity"
-        app:itemTextAppearanceActive="@style/selected_menu"
+        app:itemTextAppearanceActive="@style/Button_select"
-        app:itemTextAppearanceInactive="@style/unselected_menu"
+        app:itemTextAppearanceInactive="@style/Button_unselect"
         app:labelVisibilityMode="labeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"

app/src/main/res/layout/main/layout/forum/layout/forum.xml

@@ -34,7 +34,7 @@
                     android:id="@+id/notice_next"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="32dp"
+                    android:layout_marginTop="82dp"
                     android:alpha="0.1"
                     android:contentDescription="@string/notice_next"
                     android:visibility="gone"
@@ -46,7 +46,7 @@
                     android:id="@+id/notice_prev"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="32dp"
+                    android:layout_marginTop="82dp"
                     android:alpha="0.1"
                     android:contentDescription="@string/notice_prev"
                     android:visibility="gone"

app/src/main/res/layout/main/layout/info/layout/info_fragment.xml

@@ -14,18 +14,31 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="#ededed"
             android:orientation="vertical">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <ImageView
+                <!--                <ImageView-->
+                <!--                    android:id="@+id/headimg"-->
+                <!--                    android:layout_width="@dimen/size_200"-->
+                <!--                    android:layout_height="@dimen/size_200"-->
+                <!--                    android:background="@drawable/border"-->
+                <!--                    android:contentDescription="@string/headimg"-->
+                <!--                    app:layout_constraintStart_toStartOf="parent"-->
+                <!--                    app:layout_constraintTop_toTopOf="parent" />-->
+
+
+                <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/headimg"
-                    android:layout_width="@dimen/size_200"
+                    android:layout_width="120dp"
-                    android:layout_height="@dimen/size_200"
+                    android:layout_height="120dp"
-                    android:background="@drawable/border"
+                    android:layout_marginStart="32dp"
-                    android:contentDescription="@string/headimg"
+                    android:layout_marginTop="32dp"
+                    app:civ_border_color="#FF000000"
+                    app:civ_border_width="2dp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -33,9 +46,10 @@
                     android:id="@+id/nickname"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
                     android:layout_marginTop="@dimen/size_50"
+                    android:gravity="center"
                     android:textSize="18sp"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/headimg"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -43,20 +57,21 @@
                     android:id="@+id/credit_score"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
                     android:layout_marginTop="@dimen/size_50"
+                    android:gravity="center"
                     android:textSize="18sp"
-                    app:layout_constraintStart_toEndOf="@id/headimg"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@id/nickname"
                     app:layout_constraintTop_toBottomOf="@id/nickname" />
 
                 <TextView
                     android:id="@+id/check_headimg"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
                     android:gravity="center"
                     android:text="@string/set_headimg"
-                    android:textSize="24sp"
+                    android:textSize="14sp"
-                    app:layout_constraintEnd_toEndOf="@id/headimg"
                     app:layout_constraintStart_toStartOf="@id/headimg"
                     app:layout_constraintTop_toBottomOf="@id/headimg" />
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -72,7 +87,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
-                    android:background="@drawable/border"
+                    android:background="@drawable/black_border"
                     android:gravity="center"
                     android:textSize="18sp" />
 
@@ -81,7 +96,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@drawable/border"
+                    android:background="@drawable/black_border"
                     android:gravity="center"
                     android:textSize="18sp" />
             </LinearLayout>
@@ -95,7 +110,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
-                    android:background="@drawable/border"
+                    android:background="@drawable/black_border"
                     android:gravity="center"
                     android:text="@string/mobie"
                     android:textSize="18sp" />
@@ -105,7 +120,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@drawable/border"
+                    android:background="@drawable/black_border"
                     android:gravity="center"
                     android:textSize="18sp" />
             </LinearLayout>
@@ -119,7 +134,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
-                    android:background="@drawable/border"
+                    android:background="@drawable/black_border"
                     android:gravity="center"
                     android:text="@string/email"
                     android:textSize="18sp" />
@@ -129,19 +144,36 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@drawable/border"
+                    android:background="@drawable/black_border"
                     android:gravity="center"
                     android:textSize="18sp" />
             </LinearLayout>
 
-            <TextView
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/size_30"
+                android:layout_marginTop="@dimen/size_30">
-                android:gravity="center"
+
-                android:text="@string/active_history"
+                <ImageView
-                android:textSize="24sp"
+                    android:id="@+id/score"
-                android:textStyle="bold" />
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:src="@drawable/ic_score"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/active_history"
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@id/score"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <HorizontalScrollView
                 android:layout_width="match_parent"

app/src/main/res/menu/bottom_nav_menu.xml

@@ -2,18 +2,22 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:id="@+id/navigation_home"
+        android:id="@+id/navigation_forum"
+        android:icon="@drawable/ic_forum"
         android:title="@string/title_home" />
 
     <item
-        android:id="@+id/navigation_dashboard"
+        android:id="@+id/navigation_visitor"
+        android:icon="@drawable/ic_visitor"
         android:title="@string/title_dashboard" />
 
     <item
-        android:id="@+id/navigation_notifications"
+        android:id="@+id/navigation_garbage"
+        android:icon="@drawable/ic_garbage"
         android:title="@string/title_notifications" />
     <item
         android:id="@+id/navigation_info"
+        android:icon="@drawable/ic_info"
         android:title="@string/title_info" />
 
 </menu>

app/src/main/res/navigation/nav_mainmenu.xml

@@ -3,22 +3,22 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mobile_navigation"
-    app:startDestination="@+id/navigation_home">
+    app:startDestination="@+id/navigation_forum">
 
     <fragment
-        android:id="@+id/navigation_home"
+        android:id="@+id/navigation_forum"
         android:name="com.community.pocket.ui.main.ui.forum.main.ForumFragment"
         android:label="@string/title_home"
         tools:layout="@layout/forum" />
 
     <fragment
-        android:id="@+id/navigation_dashboard"
+        android:id="@+id/navigation_visitor"
         android:name="com.community.pocket.ui.main.ui.visitor.VisitorFragment"
         android:label="@string/title_dashboard"
         tools:layout="@layout/visitor" />
 
     <fragment
-        android:id="@+id/navigation_notifications"
+        android:id="@+id/navigation_garbage"
         android:name="com.community.pocket.ui.main.ui.garbage.GarbageFragment"
         android:label="@string/title_notifications"
         tools:layout="@layout/garbage" />