From 753ad206e53fa9362784bebff4e8ca15f00bf474 Mon Sep 17 00:00:00 2001 From: lihongwei Date: Fri, 15 Nov 2024 17:04:45 +0800 Subject: [PATCH] =?UTF-8?q?V1.0.0(1)=20=E5=8C=85=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAcom.ar.ardrawing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ARDrawing.jks | Bin 0 -> 2550 bytes app/build.gradle.kts | 4 ++-- app/keystore.properties | 12 +++++----- app/proguard-rules.pro | 8 +++---- .../ExampleInstrumentedTest.java | 2 +- .../MyApplication.java | 4 ++-- .../activity/CameraActivity.java | 10 ++++---- .../activity/ImageActivity.java | 12 +++++----- .../activity/MainActivity.java | 10 ++++---- .../activity/SplashActivity.java | 5 ++-- .../adapter/CategoryAdapter.java | 8 +++---- .../adapter/FavoriteAdapter.java | 11 ++++----- .../adapter/ImportAdapter.java | 10 ++++---- .../adapter/MainViewPager2Adapter.java | 8 +++---- .../fragment/CategoryFragment.java | 22 +++++++----------- .../fragment/FavoriteFragment.java | 12 +++++----- .../fragment/ImportFragment.java | 14 +++++------ .../room/AppDatabase.java | 4 ++-- .../room/ImageEntry.java | 6 +---- .../room/ImageEntryDao.java | 2 +- .../utils/DatabaseUtils.java | 8 +++---- .../utils/ItemDecoration.java | 4 ++-- .../utils/Names.java | 2 +- .../utils/PermissionUtils.java | 2 +- .../utils/Tracing.java | 2 +- .../ExampleUnitTest.java | 2 +- 26 files changed, 87 insertions(+), 97 deletions(-) create mode 100644 app/ARDrawing.jks rename app/src/androidTest/java/com/ar/{artracestudio => ardrawing}/ExampleInstrumentedTest.java (96%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/MyApplication.java (97%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/activity/CameraActivity.java (98%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/activity/ImageActivity.java (86%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/activity/MainActivity.java (94%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/activity/SplashActivity.java (92%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/adapter/CategoryAdapter.java (94%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/adapter/FavoriteAdapter.java (94%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/adapter/ImportAdapter.java (96%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/adapter/MainViewPager2Adapter.java (83%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/fragment/CategoryFragment.java (90%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/fragment/FavoriteFragment.java (88%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/fragment/ImportFragment.java (95%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/room/AppDatabase.java (92%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/room/ImageEntry.java (90%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/room/ImageEntryDao.java (97%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/utils/DatabaseUtils.java (88%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/utils/ItemDecoration.java (97%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/utils/Names.java (97%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/utils/PermissionUtils.java (97%) rename app/src/main/java/com/ar/{artracestudio => ardrawing}/utils/Tracing.java (88%) rename app/src/test/java/com/ar/{artracestudio => ardrawing}/ExampleUnitTest.java (92%) diff --git a/app/ARDrawing.jks b/app/ARDrawing.jks new file mode 100644 index 0000000000000000000000000000000000000000..13b935b6ecba3c1320df3b48fed4ee4100be89a9 GIT binary patch literal 2550 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 literal 0 HcmV?d00001 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5640a23..bc3cf26 100644 --- a/app/build.gradle.kts +++ b/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 diff --git a/app/keystore.properties b/app/keystore.properties index bbe7a75..abd9527 100644 --- a/app/keystore.properties +++ b/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 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5107776..5781a52 100644 --- a/app/proguard-rules.pro +++ b/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 ; } --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 { *; } diff --git a/app/src/androidTest/java/com/ar/artracestudio/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/ar/ardrawing/ExampleInstrumentedTest.java similarity index 96% rename from app/src/androidTest/java/com/ar/artracestudio/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/ar/ardrawing/ExampleInstrumentedTest.java index 395db7e..a453b39 100644 --- a/app/src/androidTest/java/com/ar/artracestudio/ExampleInstrumentedTest.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/MyApplication.java b/app/src/main/java/com/ar/ardrawing/MyApplication.java similarity index 97% rename from app/src/main/java/com/ar/artracestudio/MyApplication.java rename to app/src/main/java/com/ar/ardrawing/MyApplication.java index 85495fa..4a56973 100644 --- a/app/src/main/java/com/ar/artracestudio/MyApplication.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/activity/CameraActivity.java b/app/src/main/java/com/ar/ardrawing/activity/CameraActivity.java similarity index 98% rename from app/src/main/java/com/ar/artracestudio/activity/CameraActivity.java rename to app/src/main/java/com/ar/ardrawing/activity/CameraActivity.java index a2daacd..c988bfa 100644 --- a/app/src/main/java/com/ar/artracestudio/activity/CameraActivity.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/activity/ImageActivity.java b/app/src/main/java/com/ar/ardrawing/activity/ImageActivity.java similarity index 86% rename from app/src/main/java/com/ar/artracestudio/activity/ImageActivity.java rename to app/src/main/java/com/ar/ardrawing/activity/ImageActivity.java index 27da8d5..30c816c 100644 --- a/app/src/main/java/com/ar/artracestudio/activity/ImageActivity.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/activity/MainActivity.java b/app/src/main/java/com/ar/ardrawing/activity/MainActivity.java similarity index 94% rename from app/src/main/java/com/ar/artracestudio/activity/MainActivity.java rename to app/src/main/java/com/ar/ardrawing/activity/MainActivity.java index 5158601..e97b754 100644 --- a/app/src/main/java/com/ar/artracestudio/activity/MainActivity.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/activity/SplashActivity.java b/app/src/main/java/com/ar/ardrawing/activity/SplashActivity.java similarity index 92% rename from app/src/main/java/com/ar/artracestudio/activity/SplashActivity.java rename to app/src/main/java/com/ar/ardrawing/activity/SplashActivity.java index 86ddb29..e1b7b3a 100644 --- a/app/src/main/java/com/ar/artracestudio/activity/SplashActivity.java +++ b/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 { diff --git a/app/src/main/java/com/ar/artracestudio/adapter/CategoryAdapter.java b/app/src/main/java/com/ar/ardrawing/adapter/CategoryAdapter.java similarity index 94% rename from app/src/main/java/com/ar/artracestudio/adapter/CategoryAdapter.java rename to app/src/main/java/com/ar/ardrawing/adapter/CategoryAdapter.java index cef6954..868843c 100644 --- a/app/src/main/java/com/ar/artracestudio/adapter/CategoryAdapter.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/adapter/FavoriteAdapter.java b/app/src/main/java/com/ar/ardrawing/adapter/FavoriteAdapter.java similarity index 94% rename from app/src/main/java/com/ar/artracestudio/adapter/FavoriteAdapter.java rename to app/src/main/java/com/ar/ardrawing/adapter/FavoriteAdapter.java index 6e21d5e..fc3a2d9 100644 --- a/app/src/main/java/com/ar/artracestudio/adapter/FavoriteAdapter.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/adapter/ImportAdapter.java b/app/src/main/java/com/ar/ardrawing/adapter/ImportAdapter.java similarity index 96% rename from app/src/main/java/com/ar/artracestudio/adapter/ImportAdapter.java rename to app/src/main/java/com/ar/ardrawing/adapter/ImportAdapter.java index 31fbbaf..8ec2d11 100644 --- a/app/src/main/java/com/ar/artracestudio/adapter/ImportAdapter.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/adapter/MainViewPager2Adapter.java b/app/src/main/java/com/ar/ardrawing/adapter/MainViewPager2Adapter.java similarity index 83% rename from app/src/main/java/com/ar/artracestudio/adapter/MainViewPager2Adapter.java rename to app/src/main/java/com/ar/ardrawing/adapter/MainViewPager2Adapter.java index 9b16d77..be62a48 100644 --- a/app/src/main/java/com/ar/artracestudio/adapter/MainViewPager2Adapter.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/fragment/CategoryFragment.java b/app/src/main/java/com/ar/ardrawing/fragment/CategoryFragment.java similarity index 90% rename from app/src/main/java/com/ar/artracestudio/fragment/CategoryFragment.java rename to app/src/main/java/com/ar/ardrawing/fragment/CategoryFragment.java index 341ec44..fd4b152 100644 --- a/app/src/main/java/com/ar/artracestudio/fragment/CategoryFragment.java +++ b/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 { diff --git a/app/src/main/java/com/ar/artracestudio/fragment/FavoriteFragment.java b/app/src/main/java/com/ar/ardrawing/fragment/FavoriteFragment.java similarity index 88% rename from app/src/main/java/com/ar/artracestudio/fragment/FavoriteFragment.java rename to app/src/main/java/com/ar/ardrawing/fragment/FavoriteFragment.java index bd6f45d..1a2aee5 100644 --- a/app/src/main/java/com/ar/artracestudio/fragment/FavoriteFragment.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/fragment/ImportFragment.java b/app/src/main/java/com/ar/ardrawing/fragment/ImportFragment.java similarity index 95% rename from app/src/main/java/com/ar/artracestudio/fragment/ImportFragment.java rename to app/src/main/java/com/ar/ardrawing/fragment/ImportFragment.java index 5011ca1..d54429e 100644 --- a/app/src/main/java/com/ar/artracestudio/fragment/ImportFragment.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/room/AppDatabase.java b/app/src/main/java/com/ar/ardrawing/room/AppDatabase.java similarity index 92% rename from app/src/main/java/com/ar/artracestudio/room/AppDatabase.java rename to app/src/main/java/com/ar/ardrawing/room/AppDatabase.java index 6d8f780..48e536f 100644 --- a/app/src/main/java/com/ar/artracestudio/room/AppDatabase.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/room/ImageEntry.java b/app/src/main/java/com/ar/ardrawing/room/ImageEntry.java similarity index 90% rename from app/src/main/java/com/ar/artracestudio/room/ImageEntry.java rename to app/src/main/java/com/ar/ardrawing/room/ImageEntry.java index 6a766f3..64ce7fd 100644 --- a/app/src/main/java/com/ar/artracestudio/room/ImageEntry.java +++ b/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 { diff --git a/app/src/main/java/com/ar/artracestudio/room/ImageEntryDao.java b/app/src/main/java/com/ar/ardrawing/room/ImageEntryDao.java similarity index 97% rename from app/src/main/java/com/ar/artracestudio/room/ImageEntryDao.java rename to app/src/main/java/com/ar/ardrawing/room/ImageEntryDao.java index f9697ad..ca6e5d2 100644 --- a/app/src/main/java/com/ar/artracestudio/room/ImageEntryDao.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/utils/DatabaseUtils.java b/app/src/main/java/com/ar/ardrawing/utils/DatabaseUtils.java similarity index 88% rename from app/src/main/java/com/ar/artracestudio/utils/DatabaseUtils.java rename to app/src/main/java/com/ar/ardrawing/utils/DatabaseUtils.java index 883d8a1..d8f2580 100644 --- a/app/src/main/java/com/ar/artracestudio/utils/DatabaseUtils.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/utils/ItemDecoration.java b/app/src/main/java/com/ar/ardrawing/utils/ItemDecoration.java similarity index 97% rename from app/src/main/java/com/ar/artracestudio/utils/ItemDecoration.java rename to app/src/main/java/com/ar/ardrawing/utils/ItemDecoration.java index 9784a03..ecd8942 100644 --- a/app/src/main/java/com/ar/artracestudio/utils/ItemDecoration.java +++ b/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 { diff --git a/app/src/main/java/com/ar/artracestudio/utils/Names.java b/app/src/main/java/com/ar/ardrawing/utils/Names.java similarity index 97% rename from app/src/main/java/com/ar/artracestudio/utils/Names.java rename to app/src/main/java/com/ar/ardrawing/utils/Names.java index a6ffa50..d3a8651 100644 --- a/app/src/main/java/com/ar/artracestudio/utils/Names.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/utils/PermissionUtils.java b/app/src/main/java/com/ar/ardrawing/utils/PermissionUtils.java similarity index 97% rename from app/src/main/java/com/ar/artracestudio/utils/PermissionUtils.java rename to app/src/main/java/com/ar/ardrawing/utils/PermissionUtils.java index 91a2117..4b9f43b 100644 --- a/app/src/main/java/com/ar/artracestudio/utils/PermissionUtils.java +++ b/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; diff --git a/app/src/main/java/com/ar/artracestudio/utils/Tracing.java b/app/src/main/java/com/ar/ardrawing/utils/Tracing.java similarity index 88% rename from app/src/main/java/com/ar/artracestudio/utils/Tracing.java rename to app/src/main/java/com/ar/ardrawing/utils/Tracing.java index 73f5397..1b413f5 100644 --- a/app/src/main/java/com/ar/artracestudio/utils/Tracing.java +++ b/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; diff --git a/app/src/test/java/com/ar/artracestudio/ExampleUnitTest.java b/app/src/test/java/com/ar/ardrawing/ExampleUnitTest.java similarity index 92% rename from app/src/test/java/com/ar/artracestudio/ExampleUnitTest.java rename to app/src/test/java/com/ar/ardrawing/ExampleUnitTest.java index 2edebde..69ab981 100644 --- a/app/src/test/java/com/ar/artracestudio/ExampleUnitTest.java +++ b/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;