V1.0.0（1）完成版

app/proguard-rules.pro

@@ -18,4 +18,17 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keepclassmembers class com.live.dynamicwallpaper.MyApplication {
+    public static final java.lang.String DB_NAME;
+    public static final int DB_VERSION;
+}
+
+-keepclassmembers class * {
+    @androidx.room.Query <methods>;
+}
+
+-keep class com.live.dynamicwallpaper.room.database.AppDatabase { *; }
+-keep  class com.live.dynamicwallpaper.room.entity.DynamicData { *; }
+-keep  class com.live.dynamicwallpaper.room.dao.DynamicDataDao { *; }

app/src/main/java/com/live/dynamicwallpaper/repository/DynamicRepository.java

@@ -1,10 +1,10 @@
 
-package com.live.dynamicwallpaper.data.repository;
+package com.live.dynamicwallpaper.repository;
 
 import androidx.lifecycle.LiveData;
 
-import com.live.dynamicwallpaper.data.dao.DynamicDataDao;
+import com.live.dynamicwallpaper.room.dao.DynamicDataDao;
-import com.live.dynamicwallpaper.data.entity.DynamicData;
+import com.live.dynamicwallpaper.room.entity.DynamicData;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;

app/src/main/java/com/live/dynamicwallpaper/room/dao/DynamicDataDao.java

@@ -1,4 +1,4 @@
-package com.live.dynamicwallpaper.data.dao;
+package com.live.dynamicwallpaper.room.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.live.dynamicwallpaper.data.entity.DynamicData;
+import com.live.dynamicwallpaper.room.entity.DynamicData;
 
 import java.util.List;
 

app/src/main/java/com/live/dynamicwallpaper/room/database/AppDatabase.java

@@ -1,4 +1,4 @@
-package com.live.dynamicwallpaper.data.database;
+package com.live.dynamicwallpaper.room.database;
 
 import android.content.Context;
 
@@ -7,8 +7,8 @@ import androidx.room.Room;
 import androidx.room.RoomDatabase;
 
 import com.live.dynamicwallpaper.MyApplication;
-import com.live.dynamicwallpaper.data.dao.DynamicDataDao;
+import com.live.dynamicwallpaper.room.dao.DynamicDataDao;
-import com.live.dynamicwallpaper.data.entity.DynamicData;
+import com.live.dynamicwallpaper.room.entity.DynamicData;
 
 @Database(entities = {DynamicData.class}, version = MyApplication.DB_VERSION, exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {

app/src/main/java/com/live/dynamicwallpaper/room/entity/DynamicData.java

@@ -1,4 +1,4 @@
-package com.live.dynamicwallpaper.data.entity;
+package com.live.dynamicwallpaper.room.entity;
 
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;

app/src/main/java/com/live/dynamicwallpaper/ui/activity/DynamicActivity.java

@@ -16,10 +16,10 @@ import androidx.lifecycle.ViewModelProvider;
 
 import com.live.dynamicwallpaper.R;
 import com.live.dynamicwallpaper.callback.OnDownloadCallback;
-import com.live.dynamicwallpaper.data.entity.DynamicData;
+import com.live.dynamicwallpaper.room.entity.DynamicData;
 import com.live.dynamicwallpaper.databinding.ActivityDynamicBinding;
 import com.live.dynamicwallpaper.service.LiveWallpaperService;
-import com.live.dynamicwallpaper.ui.viewmodel.DynamicViewModel;
+import com.live.dynamicwallpaper.viewmodel.DynamicViewModel;
 import com.live.dynamicwallpaper.util.MediaFetcher;
 
 import java.io.File;

app/src/main/java/com/live/dynamicwallpaper/ui/adapter/DynamicAdapter.java

@@ -18,9 +18,9 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.live.dynamicwallpaper.R;
-import com.live.dynamicwallpaper.data.entity.DynamicData;
+import com.live.dynamicwallpaper.room.entity.DynamicData;
 import com.live.dynamicwallpaper.ui.activity.DynamicActivity;
-import com.live.dynamicwallpaper.ui.viewmodel.DynamicViewModel;
+import com.live.dynamicwallpaper.viewmodel.DynamicViewModel;
 
 import java.util.List;
 

app/src/main/java/com/live/dynamicwallpaper/ui/fragment/MainFragment.java

@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.live.dynamicwallpaper.databinding.FragmentMainBinding;
 import com.live.dynamicwallpaper.ui.adapter.DynamicAdapter;
-import com.live.dynamicwallpaper.ui.viewmodel.DynamicViewModel;
+import com.live.dynamicwallpaper.viewmodel.DynamicViewModel;
 import com.live.dynamicwallpaper.util.ItemDecoration;
 
 import java.util.ArrayList;

app/src/main/java/com/live/dynamicwallpaper/util/InitDatabase.java

@@ -1,10 +1,10 @@
 package com.live.dynamicwallpaper.util;
 
 import com.live.dynamicwallpaper.MyApplication;
-import com.live.dynamicwallpaper.data.dao.DynamicDataDao;
+import com.live.dynamicwallpaper.room.dao.DynamicDataDao;
-import com.live.dynamicwallpaper.data.database.AppDatabase;
+import com.live.dynamicwallpaper.room.database.AppDatabase;
-import com.live.dynamicwallpaper.data.entity.DynamicData;
+import com.live.dynamicwallpaper.room.entity.DynamicData;
-import com.live.dynamicwallpaper.data.repository.DynamicRepository;
+import com.live.dynamicwallpaper.repository.DynamicRepository;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/live/dynamicwallpaper/util/JsonParse.java

@@ -2,7 +2,7 @@ package com.live.dynamicwallpaper.util;
 
 import android.content.Context;
 
-import com.live.dynamicwallpaper.data.entity.DynamicData;
+import com.live.dynamicwallpaper.room.entity.DynamicData;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

app/src/main/java/com/live/dynamicwallpaper/viewmodel/DynamicViewModel.java

@@ -1,4 +1,4 @@
-package com.live.dynamicwallpaper.ui.viewmodel;
+package com.live.dynamicwallpaper.viewmodel;
 
 import android.app.Application;
 
@@ -6,10 +6,10 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
-import com.live.dynamicwallpaper.data.dao.DynamicDataDao;
+import com.live.dynamicwallpaper.room.dao.DynamicDataDao;
-import com.live.dynamicwallpaper.data.database.AppDatabase;
+import com.live.dynamicwallpaper.room.database.AppDatabase;
-import com.live.dynamicwallpaper.data.entity.DynamicData;
+import com.live.dynamicwallpaper.room.entity.DynamicData;
-import com.live.dynamicwallpaper.data.repository.DynamicRepository;
+import com.live.dynamicwallpaper.repository.DynamicRepository;
 
 import java.util.List;
 

app/src/main/res/drawable/progress_bar_tint_color.xml

@@ -21,8 +21,8 @@
             <shape>
                 <corners android:radius="5dp" />
                 <gradient
-                    android:startColor="#4891FF"
+                    android:startColor="#FFDEE9"
-                    android:endColor="#6CE89E"
+                    android:endColor="#B5FFFC"
                     android:angle="0" />
             </shape>
         </clip>

app/src/main/res/drawable/rounded_background_gray.xml

@@ -1,4 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#66000000" />
+    <solid android:color="@color/gray" />
     <corners android:radius="16dp" />
 </shape>

app/src/main/res/drawable/rounded_rectangle_gradient.xml

@@ -1,8 +1,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="45"
-        android:startColor="#80CBC4"
+        android:startColor="#FFDEE9"
-        android:endColor="#0288D1"
+        android:endColor="#B5FFFC"
         android:type="linear"
         android:useLevel="false" />
     <corners android:radius="16dp" />

app/src/main/res/layout/activity_dynamic.xml

@@ -51,8 +51,8 @@
         android:id="@+id/like"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="32dp"
         android:layout_marginTop="32dp"
+        android:layout_marginEnd="32dp"
         android:src="@drawable/dis_like"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -115,10 +115,11 @@
         android:elevation="4dp"
         android:max="100"
         android:progress="0"
-        android:progressDrawable="@drawable/progress_bar_color"
+        android:progressDrawable="@drawable/progress_bar_tint_color"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_splash.xml

@@ -40,7 +40,7 @@
         android:layout_marginBottom="80dp"
         android:max="100"
         android:progress="0"
-        android:progressDrawable="@drawable/progress_bar_color"
+        android:progressDrawable="@drawable/progress_bar_tint_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

keystore.properties

@@ -0,0 +1,6 @@
+app_name=Dynamic Wallpaper
+package_name=com.live.dynamicwallpaper
+keystoreFile=app/DynamicWallpaper.jks
+key_alias=DynamicWallpaperkey0
+key_store_password=DynamicWallpaper
+key_password=DynamicWallpaper