diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b0834b1..66c0892 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,15 +6,15 @@ plugins { } val timestamp: String = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { - namespace = "com.nature.wallpaper.naturewallpaper" + namespace = "com.nature.wallpapernature.naturewallpaper" compileSdk = 35 defaultConfig { - applicationId = "com.nature.wallpaper.naturewallpaper" + applicationId = "com.nature.wallpapernature.naturewallpaper" minSdk = 23 targetSdk = 35 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" setProperty("archivesBaseName", "Nature Wallpaper_V" + versionName + "(${versionCode})_$timestamp") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ca43c12..a5980cb 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.nature.wallpaper.naturewallpaper.MyApplication { +-keepclassmembers class com.nature.wallpapernature.naturewallpaper.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.nature.wallpaper.naturewallpaper.room.AppDatabase{ *; } --keep class com.nature.wallpaper.naturewallpaper.room.NatureData { *; } --keep class com.nature.wallpaper.naturewallpaper.room.NatureList { *; } --keep class com.nature.wallpaper.naturewallpaper.room.NatureDataDao { *; } \ No newline at end of file +-keep class com.nature.wallpapernature.naturewallpaper.room.AppDatabase{ *; } +-keep class com.nature.wallpapernature.naturewallpaper.room.NatureData { *; } +-keep class com.nature.wallpapernature.naturewallpaper.room.NatureList { *; } +-keep class com.nature.wallpapernature.naturewallpaper.room.NatureDataDao { *; } \ No newline at end of file diff --git a/app/src/androidTest/java/com/nature/wallpaper/naturewallpaper/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/nature/wallpapernature/naturewallpaper/ExampleInstrumentedTest.java similarity index 93% rename from app/src/androidTest/java/com/nature/wallpaper/naturewallpaper/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/nature/wallpapernature/naturewallpaper/ExampleInstrumentedTest.java index 9e78fe2..80813af 100644 --- a/app/src/androidTest/java/com/nature/wallpaper/naturewallpaper/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/nature/wallpapernature/naturewallpaper/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper; +package com.nature.wallpapernature.naturewallpaper; import android.content.Context; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/MyApplication.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/MyApplication.java similarity index 89% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/MyApplication.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/MyApplication.java index 2e6499b..77e9846 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/MyApplication.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/MyApplication.java @@ -1,12 +1,12 @@ -package com.nature.wallpaper.naturewallpaper; +package com.nature.wallpapernature.naturewallpaper; import android.app.Application; import android.content.Context; import android.content.SharedPreferences; -import com.nature.wallpaper.naturewallpaper.room.NatureList; -import com.nature.wallpaper.naturewallpaper.util.JsonParse; -import com.nature.wallpaper.naturewallpaper.util.RoomUtils; +import com.nature.wallpapernature.naturewallpaper.room.NatureList; +import com.nature.wallpapernature.naturewallpaper.util.JsonParse; +import com.nature.wallpapernature.naturewallpaper.util.RoomUtils; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/MainActivity.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/MainActivity.java similarity index 91% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/MainActivity.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/MainActivity.java index efb6a2e..f0a1911 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/MainActivity.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.activity; +package com.nature.wallpapernature.naturewallpaper.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.nature.wallpaper.naturewallpaper.R; -import com.nature.wallpaper.naturewallpaper.adapter.MainAdapter; -import com.nature.wallpaper.naturewallpaper.databinding.ActivityMainBinding; -import com.nature.wallpaper.naturewallpaper.databinding.TabLayoutBinding; +import com.nature.wallpapernature.naturewallpaper.R; +import com.nature.wallpapernature.naturewallpaper.adapter.MainAdapter; +import com.nature.wallpapernature.naturewallpaper.databinding.ActivityMainBinding; +import com.nature.wallpapernature.naturewallpaper.databinding.TabLayoutBinding; public class MainActivity extends AppCompatActivity { private ActivityMainBinding binding; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/NatureListActivity.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/NatureListActivity.java similarity index 83% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/NatureListActivity.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/NatureListActivity.java index f6c9c57..4a6b2de 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/NatureListActivity.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/NatureListActivity.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.activity; +package com.nature.wallpapernature.naturewallpaper.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.nature.wallpaper.naturewallpaper.R; -import com.nature.wallpaper.naturewallpaper.adapter.WallpaperAdapter; -import com.nature.wallpaper.naturewallpaper.databinding.ActivityNatureListBinding; -import com.nature.wallpaper.naturewallpaper.room.NatureData; -import com.nature.wallpaper.naturewallpaper.util.ItemDecoration; -import com.nature.wallpaper.naturewallpaper.util.RoomUtils; +import com.nature.wallpapernature.naturewallpaper.R; +import com.nature.wallpapernature.naturewallpaper.adapter.WallpaperAdapter; +import com.nature.wallpapernature.naturewallpaper.databinding.ActivityNatureListBinding; +import com.nature.wallpapernature.naturewallpaper.room.NatureData; +import com.nature.wallpapernature.naturewallpaper.util.ItemDecoration; +import com.nature.wallpapernature.naturewallpaper.util.RoomUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/StartActivity.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/StartActivity.java similarity index 93% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/StartActivity.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/StartActivity.java index 7fd9dfc..5080f04 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/StartActivity.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/StartActivity.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.activity; +package com.nature.wallpapernature.naturewallpaper.activity; import android.content.Intent; import android.os.Bundle; @@ -12,8 +12,8 @@ import androidx.core.view.WindowInsetsCompat; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.nature.wallpaper.naturewallpaper.R; -import com.nature.wallpaper.naturewallpaper.databinding.ActivityStartBinding; +import com.nature.wallpapernature.naturewallpaper.R; +import com.nature.wallpapernature.naturewallpaper.databinding.ActivityStartBinding; public class StartActivity extends AppCompatActivity { private ActivityStartBinding binding; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/WallpaperActivity.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/WallpaperActivity.java similarity index 96% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/WallpaperActivity.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/WallpaperActivity.java index 6a86ed0..ec2f5de 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/WallpaperActivity.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/WallpaperActivity.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.activity; +package com.nature.wallpapernature.naturewallpaper.activity; import android.app.WallpaperManager; import android.content.pm.PackageManager; @@ -24,11 +24,11 @@ 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.nature.wallpaper.naturewallpaper.R; -import com.nature.wallpaper.naturewallpaper.databinding.ActivityWallpaperBinding; -import com.nature.wallpaper.naturewallpaper.room.NatureData; -import com.nature.wallpaper.naturewallpaper.util.RoomUtils; -import com.nature.wallpaper.naturewallpaper.util.SetDownloadUtil; +import com.nature.wallpapernature.naturewallpaper.R; +import com.nature.wallpapernature.naturewallpaper.databinding.ActivityWallpaperBinding; +import com.nature.wallpapernature.naturewallpaper.room.NatureData; +import com.nature.wallpapernature.naturewallpaper.util.RoomUtils; +import com.nature.wallpapernature.naturewallpaper.util.SetDownloadUtil; import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/adapter/MainAdapter.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/adapter/MainAdapter.java similarity index 78% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/adapter/MainAdapter.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/adapter/MainAdapter.java index 25fcab1..e3ddc16 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/adapter/MainAdapter.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/adapter/MainAdapter.java @@ -1,12 +1,12 @@ -package com.nature.wallpaper.naturewallpaper.adapter; +package com.nature.wallpapernature.naturewallpaper.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.nature.wallpaper.naturewallpaper.fragment.FavoriteFragment; -import com.nature.wallpaper.naturewallpaper.fragment.NatureFragment; +import com.nature.wallpapernature.naturewallpaper.fragment.FavoriteFragment; +import com.nature.wallpapernature.naturewallpaper.fragment.NatureFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/adapter/WallpaperAdapter.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/adapter/WallpaperAdapter.java similarity index 91% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/adapter/WallpaperAdapter.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/adapter/WallpaperAdapter.java index cc04feb..599b704 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/adapter/WallpaperAdapter.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/adapter/WallpaperAdapter.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.adapter; +package com.nature.wallpapernature.naturewallpaper.adapter; import android.content.Context; import android.content.Intent; @@ -14,11 +14,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.nature.wallpaper.naturewallpaper.R; -import com.nature.wallpaper.naturewallpaper.activity.NatureListActivity; -import com.nature.wallpaper.naturewallpaper.activity.WallpaperActivity; -import com.nature.wallpaper.naturewallpaper.room.AppDatabase; -import com.nature.wallpaper.naturewallpaper.room.NatureData; +import com.nature.wallpapernature.naturewallpaper.R; +import com.nature.wallpapernature.naturewallpaper.activity.NatureListActivity; +import com.nature.wallpapernature.naturewallpaper.activity.WallpaperActivity; +import com.nature.wallpapernature.naturewallpaper.room.AppDatabase; +import com.nature.wallpapernature.naturewallpaper.room.NatureData; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/fragment/FavoriteFragment.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/fragment/FavoriteFragment.java similarity index 80% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/fragment/FavoriteFragment.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/fragment/FavoriteFragment.java index 24341b3..7fc933c 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/fragment/FavoriteFragment.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/fragment/FavoriteFragment.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.fragment; +package com.nature.wallpapernature.naturewallpaper.fragment; import android.os.Bundle; @@ -10,11 +10,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.nature.wallpaper.naturewallpaper.adapter.WallpaperAdapter; -import com.nature.wallpaper.naturewallpaper.databinding.FragmentFavoriteBinding; -import com.nature.wallpaper.naturewallpaper.room.NatureData; -import com.nature.wallpaper.naturewallpaper.util.ItemDecoration; -import com.nature.wallpaper.naturewallpaper.util.RoomUtils; +import com.nature.wallpapernature.naturewallpaper.adapter.WallpaperAdapter; +import com.nature.wallpapernature.naturewallpaper.databinding.FragmentFavoriteBinding; +import com.nature.wallpapernature.naturewallpaper.room.NatureData; +import com.nature.wallpapernature.naturewallpaper.util.ItemDecoration; +import com.nature.wallpapernature.naturewallpaper.util.RoomUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/fragment/NatureFragment.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/fragment/NatureFragment.java similarity index 80% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/fragment/NatureFragment.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/fragment/NatureFragment.java index 9c9b005..e70368f 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/fragment/NatureFragment.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/fragment/NatureFragment.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.fragment; +package com.nature.wallpapernature.naturewallpaper.fragment; import android.os.Bundle; @@ -10,11 +10,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.nature.wallpaper.naturewallpaper.adapter.WallpaperAdapter; -import com.nature.wallpaper.naturewallpaper.databinding.FragmentNatureBinding; -import com.nature.wallpaper.naturewallpaper.room.NatureData; -import com.nature.wallpaper.naturewallpaper.util.ItemDecoration; -import com.nature.wallpaper.naturewallpaper.util.RoomUtils; +import com.nature.wallpapernature.naturewallpaper.adapter.WallpaperAdapter; +import com.nature.wallpapernature.naturewallpaper.databinding.FragmentNatureBinding; +import com.nature.wallpapernature.naturewallpaper.room.NatureData; +import com.nature.wallpapernature.naturewallpaper.util.ItemDecoration; +import com.nature.wallpapernature.naturewallpaper.util.RoomUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/room/AppDatabase.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/AppDatabase.java similarity index 87% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/room/AppDatabase.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/AppDatabase.java index 4d1bd57..e6e35f9 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/room/AppDatabase.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/AppDatabase.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.room; +package com.nature.wallpapernature.naturewallpaper.room; import android.content.Context; @@ -6,7 +6,7 @@ import androidx.room.Database; import androidx.room.Room; import androidx.room.RoomDatabase; -import com.nature.wallpaper.naturewallpaper.MyApplication; +import com.nature.wallpapernature.naturewallpaper.MyApplication; @Database(entities = {NatureData.class}, version = MyApplication.DB_VERSION, exportSchema = false) public abstract class AppDatabase extends RoomDatabase { diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureData.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureData.java similarity index 96% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureData.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureData.java index 402f88f..2002a2e 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureData.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureData.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.room; +package com.nature.wallpapernature.naturewallpaper.room; import androidx.room.Entity; import androidx.room.PrimaryKey; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureDataDao.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureDataDao.java similarity index 94% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureDataDao.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureDataDao.java index 2c7c4dd..81be848 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureDataDao.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureDataDao.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.room; +package com.nature.wallpapernature.naturewallpaper.room; import androidx.lifecycle.LiveData; import androidx.room.Dao; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureList.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureList.java similarity index 90% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureList.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureList.java index 5e13b9f..f36ac35 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureList.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureList.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.room; +package com.nature.wallpapernature.naturewallpaper.room; import java.util.List; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/util/ItemDecoration.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/ItemDecoration.java similarity index 95% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/util/ItemDecoration.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/ItemDecoration.java index 2a3031e..6493878 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/util/ItemDecoration.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/ItemDecoration.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.util; +package com.nature.wallpapernature.naturewallpaper.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.nature.wallpaper.naturewallpaper.MyApplication; +import com.nature.wallpapernature.naturewallpaper.MyApplication; public class ItemDecoration extends RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/util/JsonParse.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/JsonParse.java similarity index 91% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/util/JsonParse.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/JsonParse.java index f4fe3ec..ed57be3 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/util/JsonParse.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/JsonParse.java @@ -1,8 +1,8 @@ -package com.nature.wallpaper.naturewallpaper.util; +package com.nature.wallpapernature.naturewallpaper.util; -import com.nature.wallpaper.naturewallpaper.MyApplication; -import com.nature.wallpaper.naturewallpaper.room.NatureData; -import com.nature.wallpaper.naturewallpaper.room.NatureList; +import com.nature.wallpapernature.naturewallpaper.MyApplication; +import com.nature.wallpapernature.naturewallpaper.room.NatureData; +import com.nature.wallpapernature.naturewallpaper.room.NatureList; import org.json.JSONArray; import org.json.JSONObject; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/util/RoomUtils.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/RoomUtils.java similarity index 79% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/util/RoomUtils.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/RoomUtils.java index 4d9491b..8dda512 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/util/RoomUtils.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/RoomUtils.java @@ -1,13 +1,13 @@ -package com.nature.wallpaper.naturewallpaper.util; +package com.nature.wallpapernature.naturewallpaper.util; import android.content.Context; import androidx.lifecycle.LiveData; -import com.nature.wallpaper.naturewallpaper.room.AppDatabase; -import com.nature.wallpaper.naturewallpaper.room.NatureData; -import com.nature.wallpaper.naturewallpaper.room.NatureDataDao; -import com.nature.wallpaper.naturewallpaper.room.NatureList; +import com.nature.wallpapernature.naturewallpaper.room.AppDatabase; +import com.nature.wallpapernature.naturewallpaper.room.NatureData; +import com.nature.wallpapernature.naturewallpaper.room.NatureDataDao; +import com.nature.wallpapernature.naturewallpaper.room.NatureList; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/nature/wallpaper/naturewallpaper/util/SetDownloadUtil.java b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/SetDownloadUtil.java similarity index 99% rename from app/src/main/java/com/nature/wallpaper/naturewallpaper/util/SetDownloadUtil.java rename to app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/SetDownloadUtil.java index e22319b..add4860 100644 --- a/app/src/main/java/com/nature/wallpaper/naturewallpaper/util/SetDownloadUtil.java +++ b/app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/SetDownloadUtil.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper.util; +package com.nature.wallpapernature.naturewallpaper.util; import android.Manifest; import android.app.Activity; diff --git a/app/src/test/java/com/nature/wallpaper/naturewallpaper/ExampleUnitTest.java b/app/src/test/java/com/nature/wallpapernature/naturewallpaper/ExampleUnitTest.java similarity index 87% rename from app/src/test/java/com/nature/wallpaper/naturewallpaper/ExampleUnitTest.java rename to app/src/test/java/com/nature/wallpapernature/naturewallpaper/ExampleUnitTest.java index af60edc..9b090e4 100644 --- a/app/src/test/java/com/nature/wallpaper/naturewallpaper/ExampleUnitTest.java +++ b/app/src/test/java/com/nature/wallpapernature/naturewallpaper/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.nature.wallpaper.naturewallpaper; +package com.nature.wallpapernature.naturewallpaper; import org.junit.Test;