V1.0.0(1) 包名修改为com.ar.ardrawing

app/build.gradle.kts

@@ -6,11 +6,11 @@ plugins {
 }
 val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date())
 android {
-    namespace = "com.ar.artracestudio"
+    namespace = "com.ar.ardrawing"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.ar.artracestudio"
+        applicationId = "com.ar.ardrawing"
         minSdk = 23
         targetSdk = 34
         versionCode = 1

app/keystore.properties

@@ -1,6 +1,6 @@
-app_name=AR Trace Studio
-package_name=com.ar.artracestudio
-keystoreFile=app/ARTraceStudio.jks
-key_alias=ARTraceStudiokey0
-key_store_password=ARTraceStudio
-key_password=ARTraceStudio
+app_name=AR Drawing
+package_name=com.ar.ardrawing
+keystoreFile=app/ARDrawing.jks
+key_alias=ARDrawingkey0
+key_store_password=ARDrawing
+key_password=ARDrawing

app/proguard-rules.pro

@@ -20,7 +20,7 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keepclassmembers class com.ar.artracestudio.MyApplication {
+-keepclassmembers class com.ar.ardrawing.MyApplication {
     public static final java.lang.String DB_Name;
     public static final int DB_Version;
 }
@@ -28,6 +28,6 @@
 -keepclassmembers class * {
     @androidx.room.Query <methods>;
 }
--keep class com.ar.artracestudio.room.AppDatabase { *; }
--keep  class com.ar.artracestudio.room.ImageEntryDao { *; }
--keep  class com.ar.artracestudio.room.ImageEntry { *; }
+-keep class com.ar.ardrawing.room.AppDatabase { *; }
+-keep  class com.ar.ardrawing.room.ImageEntryDao { *; }
+-keep  class com.ar.ardrawing.room.ImageEntry { *; }

app/src/androidTest/java/com/ar/ardrawing/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio;
+package com.ar.ardrawing;
 
 import android.content.Context;
 

app/src/main/java/com/ar/ardrawing/MyApplication.java

@@ -1,11 +1,11 @@
-package com.ar.artracestudio;
+package com.ar.ardrawing;
 
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
-import com.ar.artracestudio.utils.DatabaseUtils;
+import com.ar.ardrawing.utils.DatabaseUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;

app/src/main/java/com/ar/ardrawing/activity/CameraActivity.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.activity;
+package com.ar.ardrawing.activity;
 
 import android.Manifest;
 import android.content.ContentValues;
@@ -37,10 +37,10 @@ import androidx.camera.lifecycle.ProcessCameraProvider;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
-import com.ar.artracestudio.R;
-import com.ar.artracestudio.databinding.ActivityCameraBinding;
-import com.ar.artracestudio.utils.PermissionUtils;
-import com.ar.artracestudio.utils.Tracing;
+import com.ar.ardrawing.R;
+import com.ar.ardrawing.databinding.ActivityCameraBinding;
+import com.ar.ardrawing.utils.PermissionUtils;
+import com.ar.ardrawing.utils.Tracing;
 import com.google.common.util.concurrent.ListenableFuture;
 
 

app/src/main/java/com/ar/ardrawing/activity/ImageActivity.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.activity;
+package com.ar.ardrawing.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,11 +7,11 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.ar.artracestudio.adapter.FavoriteAdapter;
-import com.ar.artracestudio.databinding.ActivityImageBinding;
-import com.ar.artracestudio.room.AppDatabase;
-import com.ar.artracestudio.room.ImageEntry;
-import com.ar.artracestudio.utils.ItemDecoration;
+import com.ar.ardrawing.adapter.FavoriteAdapter;
+import com.ar.ardrawing.databinding.ActivityImageBinding;
+import com.ar.ardrawing.room.AppDatabase;
+import com.ar.ardrawing.room.ImageEntry;
+import com.ar.ardrawing.utils.ItemDecoration;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/ar/ardrawing/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.activity;
+package com.ar.ardrawing.activity;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -6,10 +6,10 @@ import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.ar.artracestudio.R;
-import com.ar.artracestudio.adapter.MainViewPager2Adapter;
-import com.ar.artracestudio.databinding.ActivityMainBinding;
-import com.ar.artracestudio.databinding.MainTabItemCustomBinding;
+import com.ar.ardrawing.R;
+import com.ar.ardrawing.adapter.MainViewPager2Adapter;
+import com.ar.ardrawing.databinding.ActivityMainBinding;
+import com.ar.ardrawing.databinding.MainTabItemCustomBinding;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 

app/src/main/java/com/ar/ardrawing/activity/SplashActivity.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.activity;
+package com.ar.ardrawing.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -8,9 +8,8 @@ import android.widget.ProgressBar;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.ar.artracestudio.R;
+import com.ar.ardrawing.R;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 
 public class SplashActivity extends AppCompatActivity {

app/src/main/java/com/ar/ardrawing/adapter/CategoryAdapter.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.adapter;
+package com.ar.ardrawing.adapter;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -12,9 +12,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.ar.artracestudio.R;
-import com.ar.artracestudio.activity.ImageActivity;
-import com.ar.artracestudio.room.ImageEntry;
+import com.ar.ardrawing.R;
+import com.ar.ardrawing.activity.ImageActivity;
+import com.ar.ardrawing.room.ImageEntry;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 

app/src/main/java/com/ar/ardrawing/adapter/FavoriteAdapter.java

@@ -1,6 +1,5 @@
-package com.ar.artracestudio.adapter;
+package com.ar.ardrawing.adapter;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.view.LayoutInflater;
@@ -11,10 +10,10 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.ar.artracestudio.R;
-import com.ar.artracestudio.activity.CameraActivity;
-import com.ar.artracestudio.room.AppDatabase;
-import com.ar.artracestudio.room.ImageEntry;
+import com.ar.ardrawing.R;
+import com.ar.ardrawing.activity.CameraActivity;
+import com.ar.ardrawing.room.AppDatabase;
+import com.ar.ardrawing.room.ImageEntry;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 

app/src/main/java/com/ar/ardrawing/adapter/ImportAdapter.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.adapter;
+package com.ar.ardrawing.adapter;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -10,10 +10,10 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.ar.artracestudio.R;
-import com.ar.artracestudio.activity.CameraActivity;
-import com.ar.artracestudio.room.AppDatabase;
-import com.ar.artracestudio.room.ImageEntry;
+import com.ar.ardrawing.R;
+import com.ar.ardrawing.activity.CameraActivity;
+import com.ar.ardrawing.room.AppDatabase;
+import com.ar.ardrawing.room.ImageEntry;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;

app/src/main/java/com/ar/ardrawing/adapter/MainViewPager2Adapter.java

@@ -1,13 +1,13 @@
-package com.ar.artracestudio.adapter;
+package com.ar.ardrawing.adapter;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
-import com.ar.artracestudio.fragment.CategoryFragment;
-import com.ar.artracestudio.fragment.FavoriteFragment;
-import com.ar.artracestudio.fragment.ImportFragment;
+import com.ar.ardrawing.fragment.CategoryFragment;
+import com.ar.ardrawing.fragment.FavoriteFragment;
+import com.ar.ardrawing.fragment.ImportFragment;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/ar/ardrawing/fragment/CategoryFragment.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.fragment;
+package com.ar.ardrawing.fragment;
 
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -14,15 +14,14 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.ar.artracestudio.MyApplication;
-import com.ar.artracestudio.R;
-import com.ar.artracestudio.adapter.CategoryAdapter;
-import com.ar.artracestudio.databinding.FragmentCategoryBinding;
-import com.ar.artracestudio.room.AppDatabase;
-import com.ar.artracestudio.room.ImageEntry;
-import com.ar.artracestudio.utils.DatabaseUtils;
-import com.ar.artracestudio.utils.ItemDecoration;
-import com.ar.artracestudio.utils.Names;
+import com.ar.ardrawing.MyApplication;
+import com.ar.ardrawing.R;
+import com.ar.ardrawing.adapter.CategoryAdapter;
+import com.ar.ardrawing.databinding.FragmentCategoryBinding;
+import com.ar.ardrawing.room.AppDatabase;
+import com.ar.ardrawing.room.ImageEntry;
+import com.ar.ardrawing.utils.ItemDecoration;
+import com.ar.ardrawing.utils.Names;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 
 import java.util.ArrayList;
@@ -30,9 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class CategoryFragment extends Fragment {
 

app/src/main/java/com/ar/ardrawing/fragment/FavoriteFragment.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.fragment;
+package com.ar.ardrawing.fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -9,11 +9,11 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.ar.artracestudio.adapter.FavoriteAdapter;
-import com.ar.artracestudio.databinding.FragmentFavoriteBinding;
-import com.ar.artracestudio.room.AppDatabase;
-import com.ar.artracestudio.room.ImageEntry;
-import com.ar.artracestudio.utils.ItemDecoration;
+import com.ar.ardrawing.adapter.FavoriteAdapter;
+import com.ar.ardrawing.databinding.FragmentFavoriteBinding;
+import com.ar.ardrawing.room.AppDatabase;
+import com.ar.ardrawing.room.ImageEntry;
+import com.ar.ardrawing.utils.ItemDecoration;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/ar/ardrawing/fragment/ImportFragment.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.fragment;
+package com.ar.ardrawing.fragment;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -14,12 +14,12 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.ar.artracestudio.adapter.ImportAdapter;
-import com.ar.artracestudio.databinding.FragmentImportBinding;
-import com.ar.artracestudio.room.AppDatabase;
-import com.ar.artracestudio.room.ImageEntry;
-import com.ar.artracestudio.room.ImageEntryDao;
-import com.ar.artracestudio.utils.ItemDecoration;
+import com.ar.ardrawing.adapter.ImportAdapter;
+import com.ar.ardrawing.databinding.FragmentImportBinding;
+import com.ar.ardrawing.room.AppDatabase;
+import com.ar.ardrawing.room.ImageEntry;
+import com.ar.ardrawing.room.ImageEntryDao;
+import com.ar.ardrawing.utils.ItemDecoration;
 
 import java.io.File;
 import java.io.FileOutputStream;

app/src/main/java/com/ar/ardrawing/room/AppDatabase.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.room;
+package com.ar.ardrawing.room;
 
 import android.content.Context;
 
@@ -6,7 +6,7 @@ import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
 
-import com.ar.artracestudio.MyApplication;
+import com.ar.ardrawing.MyApplication;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

app/src/main/java/com/ar/ardrawing/room/ImageEntry.java

@@ -1,13 +1,9 @@
-package com.ar.artracestudio.room;
-
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
+package com.ar.ardrawing.room;
 
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Entity(tableName = "image_entry")
 public class ImageEntry implements Serializable {

app/src/main/java/com/ar/ardrawing/room/ImageEntryDao.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.room;
+package com.ar.ardrawing.room;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;

app/src/main/java/com/ar/ardrawing/utils/DatabaseUtils.java

@@ -1,10 +1,10 @@
-package com.ar.artracestudio.utils;
+package com.ar.ardrawing.utils;
 
 import android.content.Context;
 
-import com.ar.artracestudio.room.AppDatabase;
-import com.ar.artracestudio.room.ImageEntry;
-import com.ar.artracestudio.room.ImageEntryDao;
+import com.ar.ardrawing.room.AppDatabase;
+import com.ar.ardrawing.room.ImageEntry;
+import com.ar.ardrawing.room.ImageEntryDao;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/ar/ardrawing/utils/ItemDecoration.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.utils;
+package com.ar.ardrawing.utils;
 
 import android.graphics.Rect;
 import android.view.View;
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
-import com.ar.artracestudio.MyApplication;
+import com.ar.ardrawing.MyApplication;
 
 
 public class ItemDecoration extends RecyclerView.ItemDecoration {

app/src/main/java/com/ar/ardrawing/utils/Names.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.utils;
+package com.ar.ardrawing.utils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/ar/ardrawing/utils/PermissionUtils.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.utils;
+package com.ar.ardrawing.utils;
 
 import android.Manifest;
 import android.app.Activity;

app/src/main/java/com/ar/ardrawing/utils/Tracing.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio.utils;
+package com.ar.ardrawing.utils;
 
 import android.view.MotionEvent;
 

app/src/test/java/com/ar/ardrawing/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.ar.artracestudio;
+package com.ar.ardrawing;
 
 import org.junit.Test;