diff --git a/app/ARTraceArtPro.jks b/app/ARTraceArtPro.jks new file mode 100644 index 0000000..ffc5b79 Binary files /dev/null and b/app/ARTraceArtPro.jks differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dd8d82f..9f46671 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.key.artraceartpro" + namespace = "com.ar.artraceartpro" compileSdk = 34 defaultConfig { - applicationId = "com.key.artraceartpro" + applicationId = "com.ar.artraceartpro" minSdk = 23 targetSdk = 34 versionCode = 1 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..0a33f19 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,16 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile + +-keepclassmembers class com.ar.artraceartpro.MyApplication { + public static final java.lang.String Database_Name; + public static final int Database_Version; +} + +-keepclassmembers class * { + @androidx.room.Query ; +} +-keep class com.ar.artraceartpro.data.local.database.AppDatabase { *; } +-keep class com.ar.artraceartpro.data.local.entity.ImageData { *; } +-keep class com.ar.artraceartpro.data.local.dao.ImageDataDao { *; } \ No newline at end of file diff --git a/app/src/androidTest/java/com/key/artraceartpro/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/ar/artraceartpro/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/key/artraceartpro/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/ar/artraceartpro/ExampleInstrumentedTest.java index e295c3d..31980db 100644 --- a/app/src/androidTest/java/com/key/artraceartpro/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/ar/artraceartpro/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro; +package com.ar.artraceartpro; import android.content.Context; diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..1c03594 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/key/artraceartpro/MyApplication.java b/app/src/main/java/com/ar/artraceartpro/MyApplication.java similarity index 76% rename from app/src/main/java/com/key/artraceartpro/MyApplication.java rename to app/src/main/java/com/ar/artraceartpro/MyApplication.java index ea241c5..dc91378 100644 --- a/app/src/main/java/com/key/artraceartpro/MyApplication.java +++ b/app/src/main/java/com/ar/artraceartpro/MyApplication.java @@ -1,19 +1,12 @@ -package com.key.artraceartpro; +package com.ar.artraceartpro; import android.app.Application; import android.content.Context; import android.content.SharedPreferences; -import androidx.annotation.NonNull; -import androidx.lifecycle.ViewModel; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelStore; -import androidx.lifecycle.ViewModelStoreOwner; - -import com.key.artraceartpro.data.local.entity.ImageData; -import com.key.artraceartpro.data.repository.ImageRepository; -import com.key.artraceartpro.utils.Files; -import com.key.artraceartpro.viewmodel.ImageViewModel; +import com.ar.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.data.repository.ImageRepository; +import com.ar.artraceartpro.utils.Files; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/key/artraceartpro/data/local/dao/ImageDataDao.java b/app/src/main/java/com/ar/artraceartpro/data/local/dao/ImageDataDao.java similarity index 92% rename from app/src/main/java/com/key/artraceartpro/data/local/dao/ImageDataDao.java rename to app/src/main/java/com/ar/artraceartpro/data/local/dao/ImageDataDao.java index 1e94755..ad33c3d 100644 --- a/app/src/main/java/com/key/artraceartpro/data/local/dao/ImageDataDao.java +++ b/app/src/main/java/com/ar/artraceartpro/data/local/dao/ImageDataDao.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.data.local.dao; +package com.ar.artraceartpro.data.local.dao; import androidx.lifecycle.LiveData; import androidx.room.Dao; @@ -6,7 +6,7 @@ import androidx.room.Insert; import androidx.room.Query; import androidx.room.Update; -import com.key.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.data.local.entity.ImageData; import java.util.List; diff --git a/app/src/main/java/com/key/artraceartpro/data/local/database/AppDatabase.java b/app/src/main/java/com/ar/artraceartpro/data/local/database/AppDatabase.java similarity index 80% rename from app/src/main/java/com/key/artraceartpro/data/local/database/AppDatabase.java rename to app/src/main/java/com/ar/artraceartpro/data/local/database/AppDatabase.java index 866302c..9df5bb1 100644 --- a/app/src/main/java/com/key/artraceartpro/data/local/database/AppDatabase.java +++ b/app/src/main/java/com/ar/artraceartpro/data/local/database/AppDatabase.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.data.local.database; +package com.ar.artraceartpro.data.local.database; import android.content.Context; @@ -6,14 +6,15 @@ import androidx.room.Database; import androidx.room.Room; import androidx.room.RoomDatabase; -import com.key.artraceartpro.MyApplication; -import com.key.artraceartpro.data.local.dao.ImageDataDao; -import com.key.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.MyApplication; +import com.ar.artraceartpro.data.local.dao.ImageDataDao; +import com.ar.artraceartpro.data.local.entity.ImageData; @Database(entities = {ImageData.class}, version = MyApplication.Database_Version, exportSchema = false) public abstract class AppDatabase extends RoomDatabase { public abstract ImageDataDao imageDataDao(); + private static volatile AppDatabase INSTANCE; public static AppDatabase getInstance(Context context) { diff --git a/app/src/main/java/com/key/artraceartpro/data/local/entity/ImageData.java b/app/src/main/java/com/ar/artraceartpro/data/local/entity/ImageData.java similarity index 94% rename from app/src/main/java/com/key/artraceartpro/data/local/entity/ImageData.java rename to app/src/main/java/com/ar/artraceartpro/data/local/entity/ImageData.java index 1e498dc..f0a3b92 100644 --- a/app/src/main/java/com/key/artraceartpro/data/local/entity/ImageData.java +++ b/app/src/main/java/com/ar/artraceartpro/data/local/entity/ImageData.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.data.local.entity; +package com.ar.artraceartpro.data.local.entity; import androidx.room.Entity; import androidx.room.PrimaryKey; diff --git a/app/src/main/java/com/key/artraceartpro/data/repository/ImageRepository.java b/app/src/main/java/com/ar/artraceartpro/data/repository/ImageRepository.java similarity index 91% rename from app/src/main/java/com/key/artraceartpro/data/repository/ImageRepository.java rename to app/src/main/java/com/ar/artraceartpro/data/repository/ImageRepository.java index 6050395..47f904d 100644 --- a/app/src/main/java/com/key/artraceartpro/data/repository/ImageRepository.java +++ b/app/src/main/java/com/ar/artraceartpro/data/repository/ImageRepository.java @@ -1,13 +1,13 @@ -package com.key.artraceartpro.data.repository; +package com.ar.artraceartpro.data.repository; import android.content.Context; import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; -import com.key.artraceartpro.data.local.dao.ImageDataDao; -import com.key.artraceartpro.data.local.database.AppDatabase; -import com.key.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.data.local.dao.ImageDataDao; +import com.ar.artraceartpro.data.local.database.AppDatabase; +import com.ar.artraceartpro.data.local.entity.ImageData; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/key/artraceartpro/ui/activity/CameraActivity.java b/app/src/main/java/com/ar/artraceartpro/ui/activity/CameraActivity.java similarity index 95% rename from app/src/main/java/com/key/artraceartpro/ui/activity/CameraActivity.java rename to app/src/main/java/com/ar/artraceartpro/ui/activity/CameraActivity.java index 6505fbe..2d09e14 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/activity/CameraActivity.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/activity/CameraActivity.java @@ -1,26 +1,20 @@ -package com.key.artraceartpro.ui.activity; +package com.ar.artraceartpro.ui.activity; import android.Manifest; import android.content.ContentValues; -import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.content.res.AssetManager; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Matrix; -import android.graphics.Point; import android.graphics.PointF; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.provider.MediaStore; -import android.util.DisplayMetrics; import android.util.Log; import android.view.MotionEvent; import android.view.View; -import android.view.WindowManager; import android.widget.ImageView; import android.widget.SeekBar; import android.widget.Toast; @@ -42,13 +36,11 @@ import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import com.google.common.util.concurrent.ListenableFuture; -import com.key.artraceartpro.R; -import com.key.artraceartpro.databinding.ActivityCameraBinding; -import com.key.artraceartpro.utils.PermissionUtils; -import com.key.artraceartpro.utils.TracingUtils; +import com.ar.artraceartpro.R; +import com.ar.artraceartpro.databinding.ActivityCameraBinding; +import com.ar.artraceartpro.utils.PermissionUtils; +import com.ar.artraceartpro.utils.TracingUtils; -import java.io.IOException; -import java.io.InputStream; import java.util.concurrent.ExecutionException; public class CameraActivity extends AppCompatActivity implements View.OnTouchListener, SeekBar.OnSeekBarChangeListener { @@ -212,23 +204,6 @@ public class CameraActivity extends AppCompatActivity implements View.OnTouchLis ); } - private String[] getRequiredPermissions() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - return new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_MEDIA_IMAGES}; - } else { - return new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; - } - } - - private void toggleFlash() { - if (camera != null) { - CameraControl cameraControl = camera.getCameraControl(); - isFlash = !isFlash; - cameraControl.enableTorch(isFlash); - binding.flash.setImageResource(isFlash ? R.drawable.flash : R.drawable.un_flash); - } - } - private void openImagePicker() { String[] permissions = PermissionUtils.getStoragePermissions(); if (ContextCompat.checkSelfPermission(this, permissions[0]) != PackageManager.PERMISSION_GRANTED) { @@ -324,6 +299,23 @@ public class CameraActivity extends AppCompatActivity implements View.OnTouchLis return true; } + private String[] getRequiredPermissions() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + return new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_MEDIA_IMAGES}; + } else { + return new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; + } + } + + private void toggleFlash() { + if (camera != null) { + CameraControl cameraControl = camera.getCameraControl(); + isFlash = !isFlash; + cameraControl.enableTorch(isFlash); + binding.flash.setImageResource(isFlash ? R.drawable.flash : R.drawable.un_flash); + } + } + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/key/artraceartpro/ui/activity/CategoryActivity.java b/app/src/main/java/com/ar/artraceartpro/ui/activity/CategoryActivity.java similarity index 87% rename from app/src/main/java/com/key/artraceartpro/ui/activity/CategoryActivity.java rename to app/src/main/java/com/ar/artraceartpro/ui/activity/CategoryActivity.java index 526303c..b4f804a 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/activity/CategoryActivity.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/activity/CategoryActivity.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.ui.activity; +package com.ar.artraceartpro.ui.activity; import android.os.Bundle; @@ -12,12 +12,12 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; -import com.key.artraceartpro.R; -import com.key.artraceartpro.data.local.entity.ImageData; -import com.key.artraceartpro.databinding.ActivityCategoryBinding; -import com.key.artraceartpro.ui.adapter.ImageRecyclerViewAdapter; -import com.key.artraceartpro.utils.ItemDecoration; -import com.key.artraceartpro.viewmodel.ImageViewModel; +import com.ar.artraceartpro.R; +import com.ar.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.databinding.ActivityCategoryBinding; +import com.ar.artraceartpro.ui.adapter.ImageRecyclerViewAdapter; +import com.ar.artraceartpro.utils.ItemDecoration; +import com.ar.artraceartpro.viewmodel.ImageViewModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/key/artraceartpro/ui/activity/MainActivity.java b/app/src/main/java/com/ar/artraceartpro/ui/activity/MainActivity.java similarity index 94% rename from app/src/main/java/com/key/artraceartpro/ui/activity/MainActivity.java rename to app/src/main/java/com/ar/artraceartpro/ui/activity/MainActivity.java index 9860fc7..aab5e0d 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/activity/MainActivity.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.ui.activity; +package com.ar.artraceartpro.ui.activity; import android.content.Intent; import android.os.Bundle; @@ -12,10 +12,10 @@ import androidx.core.view.WindowInsetsCompat; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import com.key.artraceartpro.R; -import com.key.artraceartpro.databinding.ActivityMainBinding; -import com.key.artraceartpro.databinding.TabCustomBinding; -import com.key.artraceartpro.ui.adapter.MainAViewPagerAdapter; +import com.ar.artraceartpro.R; +import com.ar.artraceartpro.databinding.ActivityMainBinding; +import com.ar.artraceartpro.databinding.TabCustomBinding; +import com.ar.artraceartpro.ui.adapter.MainAViewPagerAdapter; public class MainActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/key/artraceartpro/ui/activity/SettingActivity.java b/app/src/main/java/com/ar/artraceartpro/ui/activity/SettingActivity.java similarity index 84% rename from app/src/main/java/com/key/artraceartpro/ui/activity/SettingActivity.java rename to app/src/main/java/com/ar/artraceartpro/ui/activity/SettingActivity.java index d5e8d73..ced41fb 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/activity/SettingActivity.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/activity/SettingActivity.java @@ -1,11 +1,11 @@ -package com.key.artraceartpro.ui.activity; +package com.ar.artraceartpro.ui.activity; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; -import com.key.artraceartpro.databinding.ActivitySettingBinding; -import com.key.artraceartpro.utils.SettingUtils; +import com.ar.artraceartpro.databinding.ActivitySettingBinding; +import com.ar.artraceartpro.utils.SettingUtils; public class SettingActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/key/artraceartpro/ui/activity/SplashActivity.java b/app/src/main/java/com/ar/artraceartpro/ui/activity/SplashActivity.java similarity index 92% rename from app/src/main/java/com/key/artraceartpro/ui/activity/SplashActivity.java rename to app/src/main/java/com/ar/artraceartpro/ui/activity/SplashActivity.java index 2d2eb61..bb99907 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/activity/SplashActivity.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/activity/SplashActivity.java @@ -1,9 +1,8 @@ -package com.key.artraceartpro.ui.activity; +package com.ar.artraceartpro.ui.activity; import android.content.Intent; import android.os.Bundle; import android.os.CountDownTimer; -import android.widget.ProgressBar; import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; @@ -13,8 +12,8 @@ import androidx.core.view.WindowInsetsCompat; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.key.artraceartpro.R; -import com.key.artraceartpro.databinding.ActivitySplashBinding; +import com.ar.artraceartpro.R; +import com.ar.artraceartpro.databinding.ActivitySplashBinding; public class SplashActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/key/artraceartpro/ui/adapter/ImageRecyclerViewAdapter.java b/app/src/main/java/com/ar/artraceartpro/ui/adapter/ImageRecyclerViewAdapter.java similarity index 93% rename from app/src/main/java/com/key/artraceartpro/ui/adapter/ImageRecyclerViewAdapter.java rename to app/src/main/java/com/ar/artraceartpro/ui/adapter/ImageRecyclerViewAdapter.java index a934f8f..76f1e1f 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/adapter/ImageRecyclerViewAdapter.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/adapter/ImageRecyclerViewAdapter.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.ui.adapter; +package com.ar.artraceartpro.ui.adapter; import android.app.Activity; import android.content.Context; @@ -14,11 +14,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.key.artraceartpro.R; -import com.key.artraceartpro.data.local.database.AppDatabase; -import com.key.artraceartpro.data.local.entity.ImageData; -import com.key.artraceartpro.ui.activity.CameraActivity; -import com.key.artraceartpro.ui.activity.CategoryActivity; +import com.ar.artraceartpro.R; +import com.ar.artraceartpro.data.local.database.AppDatabase; +import com.ar.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.ui.activity.CameraActivity; +import com.ar.artraceartpro.ui.activity.CategoryActivity; import java.util.List; import java.util.concurrent.Executors; diff --git a/app/src/main/java/com/key/artraceartpro/ui/adapter/MainAViewPagerAdapter.java b/app/src/main/java/com/ar/artraceartpro/ui/adapter/MainAViewPagerAdapter.java similarity index 80% rename from app/src/main/java/com/key/artraceartpro/ui/adapter/MainAViewPagerAdapter.java rename to app/src/main/java/com/ar/artraceartpro/ui/adapter/MainAViewPagerAdapter.java index edcc8ce..9a98e9c 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/adapter/MainAViewPagerAdapter.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/adapter/MainAViewPagerAdapter.java @@ -1,13 +1,13 @@ -package com.key.artraceartpro.ui.adapter; +package com.ar.artraceartpro.ui.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.key.artraceartpro.ui.fragment.CategoryFragment; -import com.key.artraceartpro.ui.fragment.FavoriteFragment; -import com.key.artraceartpro.ui.fragment.ImportFragment; +import com.ar.artraceartpro.ui.fragment.CategoryFragment; +import com.ar.artraceartpro.ui.fragment.FavoriteFragment; +import com.ar.artraceartpro.ui.fragment.ImportFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/key/artraceartpro/ui/fragment/CategoryFragment.java b/app/src/main/java/com/ar/artraceartpro/ui/fragment/CategoryFragment.java similarity index 87% rename from app/src/main/java/com/key/artraceartpro/ui/fragment/CategoryFragment.java rename to app/src/main/java/com/ar/artraceartpro/ui/fragment/CategoryFragment.java index b399a1d..1a8f4b5 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/fragment/CategoryFragment.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/fragment/CategoryFragment.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.ui.fragment; +package com.ar.artraceartpro.ui.fragment; import android.os.Bundle; import android.view.LayoutInflater; @@ -11,19 +11,16 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; -import com.key.artraceartpro.data.local.entity.ImageData; -import com.key.artraceartpro.databinding.FragmentCategoryBinding; -import com.key.artraceartpro.ui.adapter.ImageRecyclerViewAdapter; -import com.key.artraceartpro.utils.Files; -import com.key.artraceartpro.utils.ItemDecoration; -import com.key.artraceartpro.viewmodel.ImageViewModel; +import com.ar.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.databinding.FragmentCategoryBinding; +import com.ar.artraceartpro.ui.adapter.ImageRecyclerViewAdapter; +import com.ar.artraceartpro.utils.Files; +import com.ar.artraceartpro.utils.ItemDecoration; +import com.ar.artraceartpro.viewmodel.ImageViewModel; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Random; -import java.util.concurrent.CopyOnWriteArrayList; public class CategoryFragment extends Fragment { diff --git a/app/src/main/java/com/key/artraceartpro/ui/fragment/FavoriteFragment.java b/app/src/main/java/com/ar/artraceartpro/ui/fragment/FavoriteFragment.java similarity index 87% rename from app/src/main/java/com/key/artraceartpro/ui/fragment/FavoriteFragment.java rename to app/src/main/java/com/ar/artraceartpro/ui/fragment/FavoriteFragment.java index 67d1c37..72930d9 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/fragment/FavoriteFragment.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/fragment/FavoriteFragment.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.ui.fragment; +package com.ar.artraceartpro.ui.fragment; import android.os.Bundle; import android.view.LayoutInflater; @@ -10,11 +10,11 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; -import com.key.artraceartpro.data.local.entity.ImageData; -import com.key.artraceartpro.databinding.FragmentFavoriteBinding; -import com.key.artraceartpro.ui.adapter.ImageRecyclerViewAdapter; -import com.key.artraceartpro.utils.ItemDecoration; -import com.key.artraceartpro.viewmodel.ImageViewModel; +import com.ar.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.databinding.FragmentFavoriteBinding; +import com.ar.artraceartpro.ui.adapter.ImageRecyclerViewAdapter; +import com.ar.artraceartpro.utils.ItemDecoration; +import com.ar.artraceartpro.viewmodel.ImageViewModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/key/artraceartpro/ui/fragment/ImportFragment.java b/app/src/main/java/com/ar/artraceartpro/ui/fragment/ImportFragment.java similarity index 91% rename from app/src/main/java/com/key/artraceartpro/ui/fragment/ImportFragment.java rename to app/src/main/java/com/ar/artraceartpro/ui/fragment/ImportFragment.java index 9c3f68b..5ccf230 100644 --- a/app/src/main/java/com/key/artraceartpro/ui/fragment/ImportFragment.java +++ b/app/src/main/java/com/ar/artraceartpro/ui/fragment/ImportFragment.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.ui.fragment; +package com.ar.artraceartpro.ui.fragment; import android.app.Activity; import android.content.Intent; @@ -14,12 +14,12 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; -import com.key.artraceartpro.data.local.entity.ImageData; -import com.key.artraceartpro.databinding.FragmentImportBinding; -import com.key.artraceartpro.ui.adapter.ImageRecyclerViewAdapter; -import com.key.artraceartpro.utils.ImportUtils; -import com.key.artraceartpro.utils.ItemDecoration; -import com.key.artraceartpro.viewmodel.ImageViewModel; +import com.ar.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.databinding.FragmentImportBinding; +import com.ar.artraceartpro.ui.adapter.ImageRecyclerViewAdapter; +import com.ar.artraceartpro.utils.ImportUtils; +import com.ar.artraceartpro.utils.ItemDecoration; +import com.ar.artraceartpro.viewmodel.ImageViewModel; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/com/key/artraceartpro/utils/Files.java b/app/src/main/java/com/ar/artraceartpro/utils/Files.java similarity index 96% rename from app/src/main/java/com/key/artraceartpro/utils/Files.java rename to app/src/main/java/com/ar/artraceartpro/utils/Files.java index c892e00..bea4bda 100644 --- a/app/src/main/java/com/key/artraceartpro/utils/Files.java +++ b/app/src/main/java/com/ar/artraceartpro/utils/Files.java @@ -1,6 +1,6 @@ -package com.key.artraceartpro.utils; +package com.ar.artraceartpro.utils; -import com.key.artraceartpro.MyApplication; +import com.ar.artraceartpro.MyApplication; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/com/key/artraceartpro/utils/ImportUtils.java b/app/src/main/java/com/ar/artraceartpro/utils/ImportUtils.java similarity index 95% rename from app/src/main/java/com/key/artraceartpro/utils/ImportUtils.java rename to app/src/main/java/com/ar/artraceartpro/utils/ImportUtils.java index f2aa8b6..cb136e6 100644 --- a/app/src/main/java/com/key/artraceartpro/utils/ImportUtils.java +++ b/app/src/main/java/com/ar/artraceartpro/utils/ImportUtils.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.utils; +package com.ar.artraceartpro.utils; import android.app.Activity; import android.content.Context; @@ -7,8 +7,8 @@ import android.graphics.BitmapFactory; import android.net.Uri; import android.widget.Toast; -import com.key.artraceartpro.data.local.entity.ImageData; -import com.key.artraceartpro.viewmodel.ImageViewModel; +import com.ar.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.viewmodel.ImageViewModel; import java.io.File; import java.io.FileOutputStream; diff --git a/app/src/main/java/com/key/artraceartpro/utils/ItemDecoration.java b/app/src/main/java/com/ar/artraceartpro/utils/ItemDecoration.java similarity index 97% rename from app/src/main/java/com/key/artraceartpro/utils/ItemDecoration.java rename to app/src/main/java/com/ar/artraceartpro/utils/ItemDecoration.java index e9aec5e..c35e368 100644 --- a/app/src/main/java/com/key/artraceartpro/utils/ItemDecoration.java +++ b/app/src/main/java/com/ar/artraceartpro/utils/ItemDecoration.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.utils; +package com.ar.artraceartpro.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.key.artraceartpro.MyApplication; +import com.ar.artraceartpro.MyApplication; public class ItemDecoration extends RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/key/artraceartpro/utils/PermissionUtils.java b/app/src/main/java/com/ar/artraceartpro/utils/PermissionUtils.java similarity index 97% rename from app/src/main/java/com/key/artraceartpro/utils/PermissionUtils.java rename to app/src/main/java/com/ar/artraceartpro/utils/PermissionUtils.java index d9f9f88..843b696 100644 --- a/app/src/main/java/com/key/artraceartpro/utils/PermissionUtils.java +++ b/app/src/main/java/com/ar/artraceartpro/utils/PermissionUtils.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.utils; +package com.ar.artraceartpro.utils; import android.Manifest; import android.app.Activity; diff --git a/app/src/main/java/com/key/artraceartpro/utils/SettingUtils.java b/app/src/main/java/com/ar/artraceartpro/utils/SettingUtils.java similarity index 97% rename from app/src/main/java/com/key/artraceartpro/utils/SettingUtils.java rename to app/src/main/java/com/ar/artraceartpro/utils/SettingUtils.java index ac65ad3..aca2172 100644 --- a/app/src/main/java/com/key/artraceartpro/utils/SettingUtils.java +++ b/app/src/main/java/com/ar/artraceartpro/utils/SettingUtils.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.utils; +package com.ar.artraceartpro.utils; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/key/artraceartpro/utils/TracingUtils.java b/app/src/main/java/com/ar/artraceartpro/utils/TracingUtils.java similarity index 98% rename from app/src/main/java/com/key/artraceartpro/utils/TracingUtils.java rename to app/src/main/java/com/ar/artraceartpro/utils/TracingUtils.java index 0ddc123..4214ee5 100644 --- a/app/src/main/java/com/key/artraceartpro/utils/TracingUtils.java +++ b/app/src/main/java/com/ar/artraceartpro/utils/TracingUtils.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro.utils; +package com.ar.artraceartpro.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/key/artraceartpro/viewmodel/ImageViewModel.java b/app/src/main/java/com/ar/artraceartpro/viewmodel/ImageViewModel.java similarity index 88% rename from app/src/main/java/com/key/artraceartpro/viewmodel/ImageViewModel.java rename to app/src/main/java/com/ar/artraceartpro/viewmodel/ImageViewModel.java index 950e117..36aadd9 100644 --- a/app/src/main/java/com/key/artraceartpro/viewmodel/ImageViewModel.java +++ b/app/src/main/java/com/ar/artraceartpro/viewmodel/ImageViewModel.java @@ -1,12 +1,12 @@ -package com.key.artraceartpro.viewmodel; +package com.ar.artraceartpro.viewmodel; import android.app.Application; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; -import com.key.artraceartpro.data.local.entity.ImageData; -import com.key.artraceartpro.data.repository.ImageRepository; +import com.ar.artraceartpro.data.local.entity.ImageData; +import com.ar.artraceartpro.data.repository.ImageRepository; import java.util.List; diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..ca3826a 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_import.xml b/app/src/main/res/layout/fragment_import.xml index 9e017c1..3347a27 100644 --- a/app/src/main/res/layout/fragment_import.xml +++ b/app/src/main/res/layout/fragment_import.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:text="@string/there_s_absolutely_nothing_here" android:textColor="@color/gray" - android:textSize="16sp" + android:textSize="18sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78..ccd032f 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..9dee4a9 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d..40d0218 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d6..5b6acc9 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..fdd7576 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611d..44c64c7 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a307..330d5ee 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..64d643a Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a695..548b93a 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77..6b16902 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..87ac7b4 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f50..e6ff962 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d642..4b4d929 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..1ec430b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae3..87cd215 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/test/java/com/key/artraceartpro/ExampleUnitTest.java b/app/src/test/java/com/ar/artraceartpro/ExampleUnitTest.java similarity index 91% rename from app/src/test/java/com/key/artraceartpro/ExampleUnitTest.java rename to app/src/test/java/com/ar/artraceartpro/ExampleUnitTest.java index 97fd9d0..5019399 100644 --- a/app/src/test/java/com/key/artraceartpro/ExampleUnitTest.java +++ b/app/src/test/java/com/ar/artraceartpro/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.key.artraceartpro; +package com.ar.artraceartpro; import org.junit.Test; diff --git a/keystore.properties b/keystore.properties new file mode 100644 index 0000000..02e2cf2 --- /dev/null +++ b/keystore.properties @@ -0,0 +1,6 @@ +app_name=AR TraceArt Pro +package_name=com.ar.artraceartpro +keystoreFile=app/ARTraceArtPro.jks +key_alias=ARTraceArtProkey0 +key_store_password=ARTraceArtPro +key_password=ARTraceArtPro \ No newline at end of file