From b58024ca739fe7e87bef4de4ecfa20b7ef6c92bf Mon Sep 17 00:00:00 2001
From: litingting <litingting@lux-ad.com>
Date: Mon, 9 Sep 2024 15:35:30 +0800
Subject: [PATCH] =?UTF-8?q?ui=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  5 +-
 app/src/main/AndroidManifest.xml              |  3 +-
 .../java/com/lh/painting/db/AppDatabase.java  |  2 +-
 app/src/main/res/drawable/back_icon.xml       |  2 +-
 app/src/main/res/drawable/bg_circle.xml       |  5 ++
 app/src/main/res/drawable/left_back.xml       | 13 ++++
 app/src/main/res/drawable/main_bg_16.xml      |  5 ++
 app/src/main/res/layout/activity_camera.xml   |  2 +-
 app/src/main/res/layout/activity_home.xml     | 42 ++++++------
 app/src/main/res/layout/activity_main.xml     |  7 +-
 app/src/main/res/layout/adapter_home_vh.xml   | 64 +++++++++----------
 app/src/main/res/values/strings.xml           |  2 +-
 gradle/libs.versions.toml                     |  2 +-
 13 files changed, 86 insertions(+), 68 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_circle.xml
 create mode 100644 app/src/main/res/drawable/left_back.xml
 create mode 100644 app/src/main/res/drawable/main_bg_16.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 20cfeca..0bec4e5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,13 +12,14 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.drawing.trace.sketch.draw"
+        //com.drawing.trace.sketch.draw
+        applicationId = "com.drawing.trace.sketch.draw.test"
         minSdk = 23
         targetSdk = 34
         versionCode = 1
         versionName = "1.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        setProperty("archivesBaseName", "DrawSketch_V" + versionName + "(${versionCode})_$timestamp")
+        setProperty("archivesBaseName", "AR Draw_V" + versionName + "(${versionCode})_$timestamp")
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2cd93ef..dd7ccaf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,8 @@
         android:maxSdkVersion="32" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 
     <application
diff --git a/app/src/main/java/com/lh/painting/db/AppDatabase.java b/app/src/main/java/com/lh/painting/db/AppDatabase.java
index 7e9e883..bda4432 100644
--- a/app/src/main/java/com/lh/painting/db/AppDatabase.java
+++ b/app/src/main/java/com/lh/painting/db/AppDatabase.java
@@ -8,7 +8,7 @@ import com.lh.painting.dao.TaskDao;
 import com.lh.painting.entity.Favorite;
 
 
-@Database(entities = {Favorite.class}, version = 1)
+@Database(entities = {Favorite.class}, version = 1,exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
     public abstract TaskDao taskDao();
     private static volatile AppDatabase INSTANCE;
diff --git a/app/src/main/res/drawable/back_icon.xml b/app/src/main/res/drawable/back_icon.xml
index 52f0ec8..be6d665 100644
--- a/app/src/main/res/drawable/back_icon.xml
+++ b/app/src/main/res/drawable/back_icon.xml
@@ -7,7 +7,7 @@
       android:pathData="M15.5,18L9.5,12L15.5,6"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
-      android:fillColor="#00000000"
+      android:fillColor="@color/black"
       android:strokeColor="#80000000"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/bg_circle.xml b/app/src/main/res/drawable/bg_circle.xml
new file mode 100644
index 0000000..903f6f3
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/camera"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/left_back.xml b/app/src/main/res/drawable/left_back.xml
new file mode 100644
index 0000000..9c32cdf
--- /dev/null
+++ b/app/src/main/res/drawable/left_back.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.5,18L9.5,12L15.5,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/main_bg_16.xml b/app/src/main/res/drawable/main_bg_16.xml
new file mode 100644
index 0000000..f025902
--- /dev/null
+++ b/app/src/main/res/drawable/main_bg_16.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp" />
+    <solid android:color="@color/camera"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
index 21603ca..92e1213 100644
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -45,7 +45,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="40dp"
+        android:layout_marginBottom="50dp"
         android:gravity="center_vertical">
     <FrameLayout
         android:background="@drawable/rounded_corners_camera"
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 369faac..45c16d9 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -11,50 +11,50 @@
         android:layout_width="match_parent"
         android:layout_height="44dp"
         android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
         android:layout_marginTop="40dp"
-        >
+        android:layout_marginEnd="20dp">
+
         <FrameLayout
-            android:background="@drawable/rounded_corners_camera"
             android:id="@+id/imageview_back"
             android:layout_width="44dp"
-            android:layout_height="44dp">
+            android:layout_height="44dp"
+            android:background="@drawable/bg_circle">
+
             <ImageView
-                android:layout_gravity="center"
                 android:layout_width="23dp"
                 android:layout_height="23dp"
-                android:src="@drawable/back_icon" />
+                android:layout_gravity="center"
+                android:src="@drawable/left_back" />
         </FrameLayout>
+
         <TextView
             android:id="@+id/details_text"
-            android:gravity="center"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
+            android:gravity="center"
             android:text="@string/tab_draw"
             android:textColor="@color/text_color"
-            android:textStyle="bold"
-            android:textSize="24sp">
-        </TextView>
+            android:textSize="24sp"
+            android:textStyle="bold"/>
     </LinearLayout>
-    
+
     <com.google.android.material.tabs.TabLayout
-        android:layout_marginTop="20dp"
         android:id="@+id/tab_layout"
-        android:background="@color/background"
         android:layout_width="match_parent"
         android:layout_height="51dp"
+        android:layout_marginTop="20dp"
+        android:background="@color/background"
         app:tabIndicatorHeight="0dp"
-        app:tabMode="scrollable"
-        >
-    </com.google.android.material.tabs.TabLayout>
+        app:tabBackground="@null"
+        app:tabRippleColor="@null"
+        app:tabMode="scrollable"/>
 
     <androidx.viewpager2.widget.ViewPager2
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginTop="20dp"
         android:id="@+id/view_pager2"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </androidx.viewpager2.widget.ViewPager2>
+        android:layout_height="match_parent"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index aa2791f..b4e1685 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,13 +12,13 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingTop="52dp"
         android:layout_weight="370">
         <FrameLayout
             android:id="@+id/setting"
             android:layout_alignParentLeft="true"
             android:layout_marginStart="32dp"
-            android:layout_marginTop="33dp"
-            android:background="@drawable/rounded_corners_camera"
+            android:background="@drawable/main_bg_16"
             android:layout_width="44dp"
             android:layout_height="44dp"
             tools:ignore="RtlHardcoded,UselessParent">
@@ -32,8 +32,7 @@
             android:id="@+id/collection"
             android:layout_alignParentRight="true"
             android:layout_marginEnd="32dp"
-            android:layout_marginTop="33dp"
-            android:background="@drawable/rounded_corners_camera"
+            android:background="@drawable/main_bg_16"
             android:layout_width="44dp"
             android:layout_height="44dp"
             tools:ignore="RtlHardcoded,UselessParent">
diff --git a/app/src/main/res/layout/adapter_home_vh.xml b/app/src/main/res/layout/adapter_home_vh.xml
index 56ecb13..8a56cdd 100644
--- a/app/src/main/res/layout/adapter_home_vh.xml
+++ b/app/src/main/res/layout/adapter_home_vh.xml
@@ -1,44 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:id="@+id/card"
+    android:layout_width="160dp"
+    android:layout_height="146dp"
+    app:cardCornerRadius="16dp"
+    app:cardElevation="0dp">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="160dp"
-        android:layout_height="146dp"
-        android:id="@+id/card"
-        app:cardCornerRadius="16dp">
-        <RelativeLayout
-            android:gravity="center_horizontal"
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal">
+
+        <ImageView
+            android:id="@+id/imPreview"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/ic_launcher"
+            android:layout_below="@id/collect"
+            android:layout_marginTop="-10dp"
+            tools:ignore="ContentDescription" />
+        <ImageView
+            android:id="@+id/collect"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            android:layout_alignParentEnd="true"
+            android:padding="10dp"
+            android:src="@drawable/collect" />
 
-            <ImageView
-                android:id="@+id/imPreview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                android:layout_gravity="center_horizontal"
-                tools:ignore="ContentDescription" />
-            <FrameLayout
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="130dp">
-                <ImageView
-                    android:id="@+id/collect"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/collect"
-                    >
-                </ImageView>
-            </FrameLayout>
-        </RelativeLayout>
-        
+    </RelativeLayout>
 
 
-    </androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>
 
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b865f6..c442f0d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Draw Sketch</string>
+    <string name="app_name">AR Draw</string>
     <string name="tab_draw">Trace &amp; Draw</string>
     <string name="favorite">My favorites</string>
     <string name="import_photo">Import Photos</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7987b22..9400252 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.0"
+agp = "8.1.3"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"