From 10ac96be6ae699a34c74e199afb48a5836f54cf8 Mon Sep 17 00:00:00 2001 From: ocean <503259349@qq.com> Date: Sun, 2 Mar 2025 18:16:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 +++ .idea/.name | 1 + .idea/compiler.xml | 6 ++++++ .idea/deploymentTargetSelector.xml | 10 ++++++++++ .idea/gradle.xml | 19 +++++++++++++++++++ .idea/migrations.xml | 10 ++++++++++ .idea/misc.xml | 10 ++++++++++ .idea/vcs.xml | 6 ++++++ app/build.gradle.kts | 4 ++-- app/proguard-rules.pro | 10 +++++----- .../ExampleInstrumentedTest.java | 2 +- .../coolwallpaper/MyApplication.java | 8 ++++---- .../activity/DetailActivity.java | 17 ++++++++--------- .../coolwallpaper/activity/MainActivity.java | 10 +++++----- .../activity/SubListActivity.java | 14 +++++++------- .../activity/WelcomeActivity.java | 6 +++--- .../coolwallpaper/adapter/MainAdapter.java | 6 +++--- .../coolwallpaper/adapter/SubListAdapter.java | 8 ++++---- .../adapter/WallpaperAdapter.java | 10 +++++----- .../callback/DownloadCallback.java | 2 +- .../coolwallpaper/database/AppDatabase.java | 4 ++-- .../coolwallpaper/database/CategoryList.java | 2 +- .../coolwallpaper/database/CoolEntity.java | 2 +- .../coolwallpaper/database/CoolEntityDao.java | 2 +- .../fragment/CollectionFragment.java | 13 ++++++------- .../coolwallpaper/fragment/HomeFragment.java | 12 ++++++------ .../coolwallpaper/util/ItemDecoration.java | 4 ++-- .../coolwallpaper/util/JsonParse.java | 8 ++++---- .../coolwallpaper/util/RoomUtils.java | 11 +++++------ .../util/SetAndDownloadUtils.java | 8 ++------ .../coolwallpaper/ExampleUnitTest.java | 2 +- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 33 files changed, 147 insertions(+), 89 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/migrations.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml rename app/src/androidTest/java/com/{wallpaper => free}/coolwallpaper/ExampleInstrumentedTest.java (95%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/MyApplication.java (88%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/activity/DetailActivity.java (94%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/activity/MainActivity.java (93%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/activity/SubListActivity.java (86%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/activity/WelcomeActivity.java (93%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/adapter/MainAdapter.java (82%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/adapter/SubListAdapter.java (93%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/adapter/WallpaperAdapter.java (93%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/callback/DownloadCallback.java (77%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/database/AppDatabase.java (89%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/database/CategoryList.java (91%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/database/CoolEntity.java (96%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/database/CoolEntityDao.java (94%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/fragment/CollectionFragment.java (82%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/fragment/HomeFragment.java (84%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/util/ItemDecoration.java (96%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/util/JsonParse.java (91%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/util/RoomUtils.java (80%) rename app/src/main/java/com/{wallpaper => free}/coolwallpaper/util/SetAndDownloadUtils.java (94%) rename app/src/test/java/com/{wallpaper => free}/coolwallpaper/ExampleUnitTest.java (90%) diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..2889f4a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Cool Wallpaper \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..0897082 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0ad17cb --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b7a397a..a60ea24 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,11 +6,11 @@ plugins { } val timestamp: String = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { - namespace = "com.wallpaper.coolwallpaper" + namespace = "com.free.coolwallpaper" compileSdk = 35 defaultConfig { - applicationId = "com.wallpaper.coolwallpaper" + applicationId = "com.free.coolwallpaper" minSdk = 23 targetSdk = 35 versionCode = 1 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 1ef142d..3165708 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.wallpaper.coolwallpaper.MyApplication { +-keepclassmembers class com.free.coolwallpaper.MyApplication { public static final java.lang.String DB_NAME; public static final int DB_VERSION; } @@ -29,7 +29,7 @@ @androidx.room.Query ; } --keep class com.wallpaper.coolwallpaper.database.AppDatabase { *; } --keep class com.wallpaper.coolwallpaper.database.CoolEntity { *; } --keep class com.wallpaper.coolwallpaper.database.CoolEntityDao { *; } --keep class com.wallpaper.coolwallpaper.database.CategoryList { *; } \ No newline at end of file +-keep class com.free.coolwallpaper.database.AppDatabase { *; } +-keep class com.free.coolwallpaper.database.CoolEntity { *; } +-keep class com.free.coolwallpaper.database.CoolEntityDao { *; } +-keep class com.free.coolwallpaper.database.CategoryList { *; } \ No newline at end of file diff --git a/app/src/androidTest/java/com/wallpaper/coolwallpaper/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/free/coolwallpaper/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/wallpaper/coolwallpaper/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/free/coolwallpaper/ExampleInstrumentedTest.java index 9082cd1..ec457ea 100644 --- a/app/src/androidTest/java/com/wallpaper/coolwallpaper/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/free/coolwallpaper/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper; +package com.free.coolwallpaper; import android.content.Context; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/MyApplication.java b/app/src/main/java/com/free/coolwallpaper/MyApplication.java similarity index 88% rename from app/src/main/java/com/wallpaper/coolwallpaper/MyApplication.java rename to app/src/main/java/com/free/coolwallpaper/MyApplication.java index ef478e1..e6f0cf2 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/MyApplication.java +++ b/app/src/main/java/com/free/coolwallpaper/MyApplication.java @@ -1,12 +1,12 @@ -package com.wallpaper.coolwallpaper; +package com.free.coolwallpaper; import android.app.Application; import android.content.Context; import android.content.SharedPreferences; -import com.wallpaper.coolwallpaper.database.CategoryList; -import com.wallpaper.coolwallpaper.util.JsonParse; -import com.wallpaper.coolwallpaper.util.RoomUtils; +import com.free.coolwallpaper.database.CategoryList; +import com.free.coolwallpaper.util.JsonParse; +import com.free.coolwallpaper.util.RoomUtils; import java.util.List; import java.util.concurrent.Executors; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/activity/DetailActivity.java b/app/src/main/java/com/free/coolwallpaper/activity/DetailActivity.java similarity index 94% rename from app/src/main/java/com/wallpaper/coolwallpaper/activity/DetailActivity.java rename to app/src/main/java/com/free/coolwallpaper/activity/DetailActivity.java index 2ab8673..cdd7a03 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/activity/DetailActivity.java +++ b/app/src/main/java/com/free/coolwallpaper/activity/DetailActivity.java @@ -1,6 +1,6 @@ -package com.wallpaper.coolwallpaper.activity; +package com.free.coolwallpaper.activity; -import static com.wallpaper.coolwallpaper.util.SetAndDownloadUtils.REQUEST_CODE_WRITE_EXTERNAL_STORAGE; +import static com.free.coolwallpaper.util.SetAndDownloadUtils.REQUEST_CODE_WRITE_EXTERNAL_STORAGE; import android.app.WallpaperManager; import android.content.pm.PackageManager; @@ -17,7 +17,6 @@ import android.widget.Toast; import androidx.activity.EdgeToEdge; import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; import androidx.appcompat.app.AppCompatActivity; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; @@ -27,12 +26,12 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.wallpaper.coolwallpaper.R; -import com.wallpaper.coolwallpaper.callback.DownloadCallback; -import com.wallpaper.coolwallpaper.database.CoolEntity; -import com.wallpaper.coolwallpaper.databinding.ActivityDetailBinding; -import com.wallpaper.coolwallpaper.util.SetAndDownloadUtils; -import com.wallpaper.coolwallpaper.util.RoomUtils; +import com.free.coolwallpaper.R; +import com.free.coolwallpaper.callback.DownloadCallback; +import com.free.coolwallpaper.database.CoolEntity; +import com.free.coolwallpaper.databinding.ActivityDetailBinding; +import com.free.coolwallpaper.util.SetAndDownloadUtils; +import com.free.coolwallpaper.util.RoomUtils; import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/activity/MainActivity.java b/app/src/main/java/com/free/coolwallpaper/activity/MainActivity.java similarity index 93% rename from app/src/main/java/com/wallpaper/coolwallpaper/activity/MainActivity.java rename to app/src/main/java/com/free/coolwallpaper/activity/MainActivity.java index fa83f0d..b06a205 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/activity/MainActivity.java +++ b/app/src/main/java/com/free/coolwallpaper/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.activity; +package com.free.coolwallpaper.activity; import android.os.Bundle; import android.view.LayoutInflater; @@ -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.wallpaper.coolwallpaper.R; -import com.wallpaper.coolwallpaper.adapter.MainAdapter; -import com.wallpaper.coolwallpaper.databinding.ActivityMainBinding; -import com.wallpaper.coolwallpaper.databinding.TabLayoutBinding; +import com.free.coolwallpaper.R; +import com.free.coolwallpaper.adapter.MainAdapter; +import com.free.coolwallpaper.databinding.ActivityMainBinding; +import com.free.coolwallpaper.databinding.TabLayoutBinding; public class MainActivity extends AppCompatActivity { private ActivityMainBinding binding; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/activity/SubListActivity.java b/app/src/main/java/com/free/coolwallpaper/activity/SubListActivity.java similarity index 86% rename from app/src/main/java/com/wallpaper/coolwallpaper/activity/SubListActivity.java rename to app/src/main/java/com/free/coolwallpaper/activity/SubListActivity.java index a468740..c8036e7 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/activity/SubListActivity.java +++ b/app/src/main/java/com/free/coolwallpaper/activity/SubListActivity.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.activity; +package com.free.coolwallpaper.activity; import android.os.Bundle; import android.widget.Toast; @@ -11,12 +11,12 @@ import androidx.core.view.WindowInsetsCompat; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.GridLayoutManager; -import com.wallpaper.coolwallpaper.R; -import com.wallpaper.coolwallpaper.adapter.WallpaperAdapter; -import com.wallpaper.coolwallpaper.database.CoolEntity; -import com.wallpaper.coolwallpaper.databinding.ActivitySubListBinding; -import com.wallpaper.coolwallpaper.util.ItemDecoration; -import com.wallpaper.coolwallpaper.util.RoomUtils; +import com.free.coolwallpaper.R; +import com.free.coolwallpaper.adapter.WallpaperAdapter; +import com.free.coolwallpaper.database.CoolEntity; +import com.free.coolwallpaper.databinding.ActivitySubListBinding; +import com.free.coolwallpaper.util.ItemDecoration; +import com.free.coolwallpaper.util.RoomUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/activity/WelcomeActivity.java b/app/src/main/java/com/free/coolwallpaper/activity/WelcomeActivity.java similarity index 93% rename from app/src/main/java/com/wallpaper/coolwallpaper/activity/WelcomeActivity.java rename to app/src/main/java/com/free/coolwallpaper/activity/WelcomeActivity.java index bb56bdf..1032a02 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/activity/WelcomeActivity.java +++ b/app/src/main/java/com/free/coolwallpaper/activity/WelcomeActivity.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.activity; +package com.free.coolwallpaper.activity; import android.content.Intent; import android.os.Bundle; @@ -13,8 +13,8 @@ import androidx.core.view.WindowInsetsCompat; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.wallpaper.coolwallpaper.R; -import com.wallpaper.coolwallpaper.databinding.ActivityWelcomeBinding; +import com.free.coolwallpaper.R; +import com.free.coolwallpaper.databinding.ActivityWelcomeBinding; public class WelcomeActivity extends AppCompatActivity { private ActivityWelcomeBinding binding; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/adapter/MainAdapter.java b/app/src/main/java/com/free/coolwallpaper/adapter/MainAdapter.java similarity index 82% rename from app/src/main/java/com/wallpaper/coolwallpaper/adapter/MainAdapter.java rename to app/src/main/java/com/free/coolwallpaper/adapter/MainAdapter.java index d8f989e..30e7893 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/adapter/MainAdapter.java +++ b/app/src/main/java/com/free/coolwallpaper/adapter/MainAdapter.java @@ -1,12 +1,12 @@ -package com.wallpaper.coolwallpaper.adapter; +package com.free.coolwallpaper.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.wallpaper.coolwallpaper.fragment.HomeFragment; -import com.wallpaper.coolwallpaper.fragment.CollectionFragment; +import com.free.coolwallpaper.fragment.HomeFragment; +import com.free.coolwallpaper.fragment.CollectionFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/adapter/SubListAdapter.java b/app/src/main/java/com/free/coolwallpaper/adapter/SubListAdapter.java similarity index 93% rename from app/src/main/java/com/wallpaper/coolwallpaper/adapter/SubListAdapter.java rename to app/src/main/java/com/free/coolwallpaper/adapter/SubListAdapter.java index 08b6b81..9ccd228 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/adapter/SubListAdapter.java +++ b/app/src/main/java/com/free/coolwallpaper/adapter/SubListAdapter.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.adapter; +package com.free.coolwallpaper.adapter; import android.app.Activity; import android.content.Context; @@ -14,9 +14,9 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.wallpaper.coolwallpaper.R; -import com.wallpaper.coolwallpaper.activity.SubListActivity; -import com.wallpaper.coolwallpaper.database.CoolEntity; +import com.free.coolwallpaper.R; +import com.free.coolwallpaper.activity.SubListActivity; +import com.free.coolwallpaper.database.CoolEntity; import java.util.List; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/adapter/WallpaperAdapter.java b/app/src/main/java/com/free/coolwallpaper/adapter/WallpaperAdapter.java similarity index 93% rename from app/src/main/java/com/wallpaper/coolwallpaper/adapter/WallpaperAdapter.java rename to app/src/main/java/com/free/coolwallpaper/adapter/WallpaperAdapter.java index 3c8895d..10c8f38 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/adapter/WallpaperAdapter.java +++ b/app/src/main/java/com/free/coolwallpaper/adapter/WallpaperAdapter.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.adapter; +package com.free.coolwallpaper.adapter; import android.app.Activity; import android.content.Context; @@ -13,10 +13,10 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.wallpaper.coolwallpaper.R; -import com.wallpaper.coolwallpaper.activity.DetailActivity; -import com.wallpaper.coolwallpaper.database.AppDatabase; -import com.wallpaper.coolwallpaper.database.CoolEntity; +import com.free.coolwallpaper.R; +import com.free.coolwallpaper.activity.DetailActivity; +import com.free.coolwallpaper.database.AppDatabase; +import com.free.coolwallpaper.database.CoolEntity; import java.util.List; import java.util.concurrent.Executor; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/callback/DownloadCallback.java b/app/src/main/java/com/free/coolwallpaper/callback/DownloadCallback.java similarity index 77% rename from app/src/main/java/com/wallpaper/coolwallpaper/callback/DownloadCallback.java rename to app/src/main/java/com/free/coolwallpaper/callback/DownloadCallback.java index 3dc0648..652acf2 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/callback/DownloadCallback.java +++ b/app/src/main/java/com/free/coolwallpaper/callback/DownloadCallback.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.callback; +package com.free.coolwallpaper.callback; import android.net.Uri; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/database/AppDatabase.java b/app/src/main/java/com/free/coolwallpaper/database/AppDatabase.java similarity index 89% rename from app/src/main/java/com/wallpaper/coolwallpaper/database/AppDatabase.java rename to app/src/main/java/com/free/coolwallpaper/database/AppDatabase.java index c343796..6de226d 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/database/AppDatabase.java +++ b/app/src/main/java/com/free/coolwallpaper/database/AppDatabase.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.database; +package com.free.coolwallpaper.database; import android.content.Context; @@ -6,7 +6,7 @@ import androidx.room.Database; import androidx.room.Room; import androidx.room.RoomDatabase; -import com.wallpaper.coolwallpaper.MyApplication; +import com.free.coolwallpaper.MyApplication; @Database(entities = {CoolEntity.class}, version = MyApplication.DB_VERSION, exportSchema = false) public abstract class AppDatabase extends RoomDatabase { diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/database/CategoryList.java b/app/src/main/java/com/free/coolwallpaper/database/CategoryList.java similarity index 91% rename from app/src/main/java/com/wallpaper/coolwallpaper/database/CategoryList.java rename to app/src/main/java/com/free/coolwallpaper/database/CategoryList.java index 98e1733..84a37c8 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/database/CategoryList.java +++ b/app/src/main/java/com/free/coolwallpaper/database/CategoryList.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.database; +package com.free.coolwallpaper.database; import java.util.List; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/database/CoolEntity.java b/app/src/main/java/com/free/coolwallpaper/database/CoolEntity.java similarity index 96% rename from app/src/main/java/com/wallpaper/coolwallpaper/database/CoolEntity.java rename to app/src/main/java/com/free/coolwallpaper/database/CoolEntity.java index 499975e..ab27320 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/database/CoolEntity.java +++ b/app/src/main/java/com/free/coolwallpaper/database/CoolEntity.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.database; +package com.free.coolwallpaper.database; import androidx.room.Entity; import androidx.room.PrimaryKey; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/database/CoolEntityDao.java b/app/src/main/java/com/free/coolwallpaper/database/CoolEntityDao.java similarity index 94% rename from app/src/main/java/com/wallpaper/coolwallpaper/database/CoolEntityDao.java rename to app/src/main/java/com/free/coolwallpaper/database/CoolEntityDao.java index 00f3f19..518b689 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/database/CoolEntityDao.java +++ b/app/src/main/java/com/free/coolwallpaper/database/CoolEntityDao.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.database; +package com.free.coolwallpaper.database; import androidx.lifecycle.LiveData; import androidx.room.Dao; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/fragment/CollectionFragment.java b/app/src/main/java/com/free/coolwallpaper/fragment/CollectionFragment.java similarity index 82% rename from app/src/main/java/com/wallpaper/coolwallpaper/fragment/CollectionFragment.java rename to app/src/main/java/com/free/coolwallpaper/fragment/CollectionFragment.java index e82bd34..b42e448 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/fragment/CollectionFragment.java +++ b/app/src/main/java/com/free/coolwallpaper/fragment/CollectionFragment.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.fragment; +package com.free.coolwallpaper.fragment; import android.os.Bundle; @@ -10,12 +10,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.wallpaper.coolwallpaper.adapter.SubListAdapter; -import com.wallpaper.coolwallpaper.adapter.WallpaperAdapter; -import com.wallpaper.coolwallpaper.database.CoolEntity; -import com.wallpaper.coolwallpaper.databinding.FragmentCollectionBinding; -import com.wallpaper.coolwallpaper.util.ItemDecoration; -import com.wallpaper.coolwallpaper.util.RoomUtils; +import com.free.coolwallpaper.adapter.WallpaperAdapter; +import com.free.coolwallpaper.database.CoolEntity; +import com.free.coolwallpaper.databinding.FragmentCollectionBinding; +import com.free.coolwallpaper.util.ItemDecoration; +import com.free.coolwallpaper.util.RoomUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/fragment/HomeFragment.java b/app/src/main/java/com/free/coolwallpaper/fragment/HomeFragment.java similarity index 84% rename from app/src/main/java/com/wallpaper/coolwallpaper/fragment/HomeFragment.java rename to app/src/main/java/com/free/coolwallpaper/fragment/HomeFragment.java index 7e448aa..e634f64 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/fragment/HomeFragment.java +++ b/app/src/main/java/com/free/coolwallpaper/fragment/HomeFragment.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.fragment; +package com.free.coolwallpaper.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.wallpaper.coolwallpaper.adapter.SubListAdapter; -import com.wallpaper.coolwallpaper.database.CoolEntity; -import com.wallpaper.coolwallpaper.databinding.FragmentHomeBinding; -import com.wallpaper.coolwallpaper.util.ItemDecoration; -import com.wallpaper.coolwallpaper.util.RoomUtils; +import com.free.coolwallpaper.adapter.SubListAdapter; +import com.free.coolwallpaper.database.CoolEntity; +import com.free.coolwallpaper.databinding.FragmentHomeBinding; +import com.free.coolwallpaper.util.ItemDecoration; +import com.free.coolwallpaper.util.RoomUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/util/ItemDecoration.java b/app/src/main/java/com/free/coolwallpaper/util/ItemDecoration.java similarity index 96% rename from app/src/main/java/com/wallpaper/coolwallpaper/util/ItemDecoration.java rename to app/src/main/java/com/free/coolwallpaper/util/ItemDecoration.java index ed2a565..bf72ca4 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/util/ItemDecoration.java +++ b/app/src/main/java/com/free/coolwallpaper/util/ItemDecoration.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.util; +package com.free.coolwallpaper.util; 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.wallpaper.coolwallpaper.MyApplication; +import com.free.coolwallpaper.MyApplication; public class ItemDecoration extends RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/util/JsonParse.java b/app/src/main/java/com/free/coolwallpaper/util/JsonParse.java similarity index 91% rename from app/src/main/java/com/wallpaper/coolwallpaper/util/JsonParse.java rename to app/src/main/java/com/free/coolwallpaper/util/JsonParse.java index e6ffa54..e1d568e 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/util/JsonParse.java +++ b/app/src/main/java/com/free/coolwallpaper/util/JsonParse.java @@ -1,10 +1,10 @@ -package com.wallpaper.coolwallpaper.util; +package com.free.coolwallpaper.util; import android.util.Log; -import com.wallpaper.coolwallpaper.MyApplication; -import com.wallpaper.coolwallpaper.database.CategoryList; -import com.wallpaper.coolwallpaper.database.CoolEntity; +import com.free.coolwallpaper.MyApplication; +import com.free.coolwallpaper.database.CategoryList; +import com.free.coolwallpaper.database.CoolEntity; import org.json.JSONArray; import org.json.JSONObject; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/util/RoomUtils.java b/app/src/main/java/com/free/coolwallpaper/util/RoomUtils.java similarity index 80% rename from app/src/main/java/com/wallpaper/coolwallpaper/util/RoomUtils.java rename to app/src/main/java/com/free/coolwallpaper/util/RoomUtils.java index ff562b3..2aa1f63 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/util/RoomUtils.java +++ b/app/src/main/java/com/free/coolwallpaper/util/RoomUtils.java @@ -1,14 +1,13 @@ -package com.wallpaper.coolwallpaper.util; +package com.free.coolwallpaper.util; import android.content.Context; import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import com.wallpaper.coolwallpaper.database.AppDatabase; -import com.wallpaper.coolwallpaper.database.CategoryList; -import com.wallpaper.coolwallpaper.database.CoolEntity; -import com.wallpaper.coolwallpaper.database.CoolEntityDao; +import com.free.coolwallpaper.database.AppDatabase; +import com.free.coolwallpaper.database.CategoryList; +import com.free.coolwallpaper.database.CoolEntity; +import com.free.coolwallpaper.database.CoolEntityDao; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/wallpaper/coolwallpaper/util/SetAndDownloadUtils.java b/app/src/main/java/com/free/coolwallpaper/util/SetAndDownloadUtils.java similarity index 94% rename from app/src/main/java/com/wallpaper/coolwallpaper/util/SetAndDownloadUtils.java rename to app/src/main/java/com/free/coolwallpaper/util/SetAndDownloadUtils.java index 88b7bb7..45d9a9b 100644 --- a/app/src/main/java/com/wallpaper/coolwallpaper/util/SetAndDownloadUtils.java +++ b/app/src/main/java/com/free/coolwallpaper/util/SetAndDownloadUtils.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper.util; +package com.free.coolwallpaper.util; import android.app.Activity; import android.content.ContentValues; @@ -6,15 +6,11 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.provider.MediaStore; -import android.view.View; -import android.widget.ImageView; -import android.widget.ProgressBar; -import android.widget.Toast; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; -import com.wallpaper.coolwallpaper.callback.DownloadCallback; +import com.free.coolwallpaper.callback.DownloadCallback; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/test/java/com/wallpaper/coolwallpaper/ExampleUnitTest.java b/app/src/test/java/com/free/coolwallpaper/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/com/wallpaper/coolwallpaper/ExampleUnitTest.java rename to app/src/test/java/com/free/coolwallpaper/ExampleUnitTest.java index 2f8f08d..f2b45b4 100644 --- a/app/src/test/java/com/wallpaper/coolwallpaper/ExampleUnitTest.java +++ b/app/src/test/java/com/free/coolwallpaper/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.wallpaper.coolwallpaper; +package com.free.coolwallpaper; import org.junit.Test; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0e3ee99..72a35e4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.8.1" +agp = "8.2.1" junit = "4.13.2" junitVersion = "1.2.1" espressoCore = "3.6.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 96d2738..c3c34fe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Feb 21 18:22:41 CST 2025 +#Sat Mar 01 23:10:06 CST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists