优化项目操作体验

app/release/output-metadata.json

@@ -11,8 +11,13 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
+<<<<<<< HEAD
+      "versionCode": 7,
+      "versionName": "2.0.5",
+=======
       "versionCode": 6,
       "versionName": "2.0.4",
+>>>>>>> 5f4a7c674b00b9730ca17bd7ca48e43516ef2a0f
       "outputFile": "app-release.apk"
     }
   ],

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

@@ -37,12 +37,13 @@
                         android:visibility="visible" />
                 </FrameLayout>
             </com.haoduyoudu.DailyAccounts.MyScrollView>
+
             <ImageView
                 android:id="@+id/showright"
-                android:layout_gravity="end|center_vertical"
                 android:layout_width="20dp"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/pop_right"/>
+                android:layout_gravity="end|center_vertical"
+                android:src="@mipmap/pop_right" />
             <LinearLayout
                 android:id="@+id/sk_popview"
                 android:layout_width="match_parent"

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

@@ -90,7 +90,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/takephoto"
-            android:textColor="#FFF"
+            android:textColor="#595959"
             android:textSize="12dp"
             app:layout_constraintEnd_toEndOf="@+id/takephoto"
             app:layout_constraintStart_toStartOf="@+id/takephoto"
@@ -102,7 +102,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/fromalbum"
-            android:textColor="#FFF"
+            android:textColor="#595959"
             android:textSize="12dp"
             app:layout_constraintEnd_toEndOf="@+id/fromalbum"
             app:layout_constraintStart_toStartOf="@+id/fromalbum"
@@ -113,7 +113,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/takevideo"
-            android:textColor="#FFF"
+            android:textColor="#595959"
             android:textSize="12dp"
             app:layout_constraintEnd_toEndOf="@+id/takevideo"
             app:layout_constraintStart_toStartOf="@+id/takevideo"
@@ -124,7 +124,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/recordv"
-            android:textColor="#FFF"
+            android:textColor="#595959"
             android:textSize="12dp"
             app:layout_constraintEnd_toEndOf="@+id/recordthis"
             app:layout_constraintStart_toStartOf="@+id/recordthis"

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

@@ -97,7 +97,8 @@
                             android:layout_gravity="end|center_vertical"
                             android:layout_marginTop="1dp"
                             android:layout_marginEnd="22dp"
-                            android:src="@mipmap/ic_bianji2" />
+                            android:src="@mipmap/edit_emoji" />
+
                     </FrameLayout>
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -132,7 +133,9 @@
                             android:layout_height="22dp"
                             android:layout_gravity="end|center_vertical"
                             android:layout_marginTop="3dp"
-                            android:src="@mipmap/ic_bianji2" />
+
+                            android:src="@mipmap/edit_text" />
+
 
                     </LinearLayout>
 
@@ -185,7 +188,8 @@
                             android:layout_height="22dp"
                             android:layout_marginEnd="22dp"
                             android:layout_gravity="end|center_vertical"
-                            android:src="@mipmap/ic_bianji2" />
+                            android:src="@mipmap/edit_dmt" />
+
 
                     </LinearLayout>
 

app/src/main/res/values-v20/styles.xml

@@ -7,7 +7,9 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowSwipeToDismiss">false</item>
+        <!--应小天才要求取消屏蔽右滑返回-->
+        <!--<item name="android:windowSwipeToDismiss">false</item>-->
+
         <item name="android:hardwareAccelerated">false</item>
         <item name="android:largeHeap">true</item>
     </style>

build.gradle

@@ -7,7 +7,11 @@ buildscript {
         jcenter()
     }
     dependencies {
+
+        classpath 'com.android.tools.build:gradle:7.2.2'
+
         classpath 'com.android.tools.build:gradle:7.2.1'
+
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files