2-group-adbrush-android/Nature_Wallpaper
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V1.0.1（2）修改包名为com.nature.wallpapernature.naturewallpaper

Browse Source
This commit is contained in:
lihongwei 2025-04-03 10:29:08 +08:00
parent 55b2e6d5fc
commit 6f4a18d66b
21 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle.kts
View File

@ -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"
}

10
app/proguard-rules.pro vendored
View File

@ -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 <methods>;
}
-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 { *; }
-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 { *; }

2
app/src/androidTest/java/com/nature/wallpaper/naturewallpaper/ExampleInstrumentedTest.java → app/src/androidTest/java/com/nature/wallpapernature/naturewallpaper/ExampleInstrumentedTest.java
View File

@ -1,4 +1,4 @@
package com.nature.wallpaper.naturewallpaper;
package com.nature.wallpapernature.naturewallpaper;
import android.content.Context;

8
app/src/main/java/com/nature/wallpaper/naturewallpaper/MyApplication.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/MyApplication.java
View File

@ -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;

10
app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/MainActivity.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/MainActivity.java
View File

@ -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;

14
app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/NatureListActivity.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/NatureListActivity.java
View File

@ -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;

6
app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/StartActivity.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/StartActivity.java
View File

@ -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;

12
app/src/main/java/com/nature/wallpaper/naturewallpaper/activity/WallpaperActivity.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/activity/WallpaperActivity.java
View File

@ -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;

6
app/src/main/java/com/nature/wallpaper/naturewallpaper/adapter/MainAdapter.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/adapter/MainAdapter.java
View File

@ -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;

12
app/src/main/java/com/nature/wallpaper/naturewallpaper/adapter/WallpaperAdapter.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/adapter/WallpaperAdapter.java
View File

@ -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;

12
app/src/main/java/com/nature/wallpaper/naturewallpaper/fragment/FavoriteFragment.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/fragment/FavoriteFragment.java
View File

@ -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;

12
app/src/main/java/com/nature/wallpaper/naturewallpaper/fragment/NatureFragment.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/fragment/NatureFragment.java
View File

@ -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;

4
app/src/main/java/com/nature/wallpaper/naturewallpaper/room/AppDatabase.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/AppDatabase.java
View File

@ -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 {

2
app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureData.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureData.java
View File

@ -1,4 +1,4 @@
package com.nature.wallpaper.naturewallpaper.room;
package com.nature.wallpapernature.naturewallpaper.room;
import androidx.room.Entity;
import androidx.room.PrimaryKey;

2
app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureDataDao.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureDataDao.java
View File

@ -1,4 +1,4 @@
package com.nature.wallpaper.naturewallpaper.room;
package com.nature.wallpapernature.naturewallpaper.room;
import androidx.lifecycle.LiveData;
import androidx.room.Dao;

2
app/src/main/java/com/nature/wallpaper/naturewallpaper/room/NatureList.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/room/NatureList.java
View File

@ -1,4 +1,4 @@
package com.nature.wallpaper.naturewallpaper.room;
package com.nature.wallpapernature.naturewallpaper.room;
import java.util.List;

4
app/src/main/java/com/nature/wallpaper/naturewallpaper/util/ItemDecoration.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/ItemDecoration.java
View File

@ -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 {

8
app/src/main/java/com/nature/wallpaper/naturewallpaper/util/JsonParse.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/JsonParse.java
View File

@ -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;

10
app/src/main/java/com/nature/wallpaper/naturewallpaper/util/RoomUtils.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/RoomUtils.java
View File

@ -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;

2
app/src/main/java/com/nature/wallpaper/naturewallpaper/util/SetDownloadUtil.java → app/src/main/java/com/nature/wallpapernature/naturewallpaper/util/SetDownloadUtil.java
View File

@ -1,4 +1,4 @@
package com.nature.wallpaper.naturewallpaper.util;
package com.nature.wallpapernature.naturewallpaper.util;
import android.Manifest;
import android.app.Activity;

2
app/src/test/java/com/nature/wallpaper/naturewallpaper/ExampleUnitTest.java → app/src/test/java/com/nature/wallpapernature/naturewallpaper/ExampleUnitTest.java
View File

@ -1,4 +1,4 @@
package com.nature.wallpaper.naturewallpaper;
package com.nature.wallpapernature.naturewallpaper;
import org.junit.Test;