From 2bed1c2629f93087d58850c67b65337bc4285c90 Mon Sep 17 00:00:00 2001 From: lihongwei Date: Fri, 18 Apr 2025 15:58:56 +0800 Subject: [PATCH] =?UTF-8?q?V1.0.0=EF=BC=881=EF=BC=89=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/DynamicWallpaper.jks | Bin 0 -> 2580 bytes app/proguard-rules.pro | 15 ++++++++++++++- .../{data => }/repository/DynamicRepository.java | 6 +++--- .../{data => room}/dao/DynamicDataDao.java | 4 ++-- .../{data => room}/database/AppDatabase.java | 6 +++--- .../{data => room}/entity/DynamicData.java | 2 +- .../ui/activity/DynamicActivity.java | 4 ++-- .../ui/adapter/DynamicAdapter.java | 4 ++-- .../ui/fragment/MainFragment.java | 2 +- .../live/dynamicwallpaper/util/InitDatabase.java | 8 ++++---- .../live/dynamicwallpaper/util/JsonParse.java | 2 +- .../{ui => }/viewmodel/DynamicViewModel.java | 10 +++++----- ...bar_color.xml => progress_bar_tint_color.xml} | 4 ++-- .../res/drawable/rounded_background_gray.xml | 2 +- .../res/drawable/rounded_rectangle_gradient.xml | 4 ++-- app/src/main/res/layout/activity_dynamic.xml | 7 ++++--- app/src/main/res/layout/activity_splash.xml | 2 +- keystore.properties | 6 ++++++ 18 files changed, 54 insertions(+), 34 deletions(-) create mode 100644 app/DynamicWallpaper.jks rename app/src/main/java/com/live/dynamicwallpaper/{data => }/repository/DynamicRepository.java (88%) rename app/src/main/java/com/live/dynamicwallpaper/{data => room}/dao/DynamicDataDao.java (90%) rename app/src/main/java/com/live/dynamicwallpaper/{data => room}/database/AppDatabase.java (84%) rename app/src/main/java/com/live/dynamicwallpaper/{data => room}/entity/DynamicData.java (98%) rename app/src/main/java/com/live/dynamicwallpaper/{ui => }/viewmodel/DynamicViewModel.java (81%) rename app/src/main/res/drawable/{progress_bar_color.xml => progress_bar_tint_color.xml} (89%) create mode 100644 keystore.properties diff --git a/app/DynamicWallpaper.jks b/app/DynamicWallpaper.jks new file mode 100644 index 0000000000000000000000000000000000000000..72f107e439ef2e33c343baf3d9ba92b1734581b5 GIT binary patch literal 2580 zcma)8cQhO98qX4mRkKQhw6!TAMruXHE+18Ctfoed5Q@(%$`>sSK6`ZFQ@d)_sGy~^ zD8;q+E{YmeRinan&%LMLxqsbzp7V_N_dLJny#Ktv^P;INoFE_=O@%i=;nGotQG4t_ zW?&8#{sKaU7oEa+Xev|Jf3=tzAylTiQ@HxnE1<0ZVX?6QK{-?=?Nd+#?edGk#E!N` zWB)#~p=BVvUFox)>??dPK3()9TX&8{E;&4cfIt$bH$kDv0-=;Kn0yu^karF=?r0)a3dH)?=I>{`fkgimwDOG(ERAyWguXlxh z*EJ-jOMI|;Gd70jH`kxsN0}s{G{i^BqI{+Q)y2!tw$vjA`cr2qZDQW~aq(P#hL$uw zq&}DVq#{ck*xv0Tmzq~TemFKHgr7>}!`I;2r#SpI5lB_@9|7)5_M+9l={Z~GqR>kP z$k)CJ!m-Xxo^0jt`zRakb~7$nckRJ@m{okrOSu2? zx@$M;dG6{1o&I|t|J+VXq@zZE+REAxalG(`Yurb%?p%%%e)2*dg075EyI5GylYl2T zGElm57Y$keDsKWyj{CT|s@NaLpBs(ajldk%150;XZcxk^f#A<)H1&N+dCM&;^RLA2 z4kx)U1wM1)=I$L#8czuCME+FR+spLN4t?>Vg+q0ZH;D!e7l$^>#M5?o`{5n2xLj z)`M4haq+&QYL*M~nv0Z?yEGO-K?j2KO#WO^?d=S+*WMxil0v;)59GsP2Dxd&XY7|0 zW^6roER!UVZ;MZ~GeIDvMws^E03jdMZMpAXZiXhq5;oUISEa2b%Rgh%*4Lx&(|b?_ zliN_7n^Fd27&TyRW*{zLI#wRBEeW^`fritcQd~!|{qvtV=>umYJUNyOVceH&c<{8^53*rCk_mPP~Iux%bAWdl62`C>lcdVWJa*(S(q7>n>R6rCirlWVo zWE-{#K2CcG@^t(AY>P0v8j0$2<2pF-?ebtMYs697X+>&WW$trND(dJW6FN56y3@us1f(Vw`o@ zJKtwn1YJ|GL#zIhOE|BBw6G-LHXs<_1#kd(0>}U-K;UUbIW_Oo>`0R=td-g8P3BF++2x;MP;92?PY3rnwqHbEs+n!#IE~*;MXscTRvVMg8=fA0pj-*V_6I>8( z3mM95(uW76FJ%m!fp;*{tNC@9xCln&=!r?0O}^BH&OYcHUEF3y@AqyWxg*qW+~UA6 zSb9W;5~cr?0iZb47B*jdy~%n~68u;1QA{QygSIMK+3%nQ4z232YA*S>v4*bV-SU z!R?7$5~o~57`gpMJWZl}$8)ZZAv%}{-X~s%V!t}zMDN!ZNuiS(T+TC5(+(n zP5!8gE)LgZPZWDUHH_P{X}$K{hf*uZBsLyfm65-^nW7>3L2~b2s~UslhZpnu&+Dc$ z(_HPA;yh4^$cmKFE>IO^!8ylW(-NGryz;PJXr#8bBHXdJMnv}|SHa+Q)<>Fz!%*Xr zk}>XN87I*-XFB?`M|*Y-Ms8nZa_nI3DPK#}4w90*iiOzN3p7MT06WmOW3S^`v#s1) z1%lbs4xU)*@4Q27Pyg5y_j8vvcd_tgtUGNe^)(vrmP&C`{QE^DEfn#@`Z)o+5^X0I zmB~coIDqW!G+ANgieTg4->6tl#~L$lbFfMcs;)53=F~0sd^gGKd)yLdg1L9yqezCd znW|RWx@3SGVxvPhr6z^ROkpIw_(-6-)yr%_?=wi>6+6dV$?vqxvX!I#ka2;~qN^ru zmA%ngN%Mn$YS(dZ1Yx}fuXdF)Up>~RUtY-u7bP3X0Y%uFQ><)9f~*ztkg{5_%3<#C zH+O71Neh`pI_I;AU1pt=$M*gQSmr2QQW!reGyT|=B}PRy=|W7_axb6j+wLtpa+z4m zy18#KrR73a$W!&GVk_!){UrVk^E2f76|HL`dS=Mu&8z;eAJq)8X(Wfb(+uzQKI?!T zTs&vMH{sW1Xjv1ttk%bw-oO{>rSk{n{uQ_PYQ272fsGPxZ}!cE@E*?X9a0JOlPm;# z)(M*f_VDCKcwum(w3*Jy=7QlfDC6c$-POlIXb=rFC;a7LS=70~Rzeo7!9 z699q&MK=1)8(s4Fda~Xhp)o!~G5H!vZ1a{927~T?ngex1ct2cd$cQrzzhdtd_G1{a NJg50hsq9}*_@Ag9mU93A literal 0 HcmV?d00001 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..16795db 100644 --- a/app/proguard-rules.pro +++ b/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 \ No newline at end of file +#-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 ; +} + +-keep class com.live.dynamicwallpaper.room.database.AppDatabase { *; } +-keep class com.live.dynamicwallpaper.room.entity.DynamicData { *; } +-keep class com.live.dynamicwallpaper.room.dao.DynamicDataDao { *; } \ No newline at end of file diff --git a/app/src/main/java/com/live/dynamicwallpaper/data/repository/DynamicRepository.java b/app/src/main/java/com/live/dynamicwallpaper/repository/DynamicRepository.java similarity index 88% rename from app/src/main/java/com/live/dynamicwallpaper/data/repository/DynamicRepository.java rename to app/src/main/java/com/live/dynamicwallpaper/repository/DynamicRepository.java index 9698845..68d1970 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/data/repository/DynamicRepository.java +++ b/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.data.entity.DynamicData; +import com.live.dynamicwallpaper.room.dao.DynamicDataDao; +import com.live.dynamicwallpaper.room.entity.DynamicData; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/com/live/dynamicwallpaper/data/dao/DynamicDataDao.java b/app/src/main/java/com/live/dynamicwallpaper/room/dao/DynamicDataDao.java similarity index 90% rename from app/src/main/java/com/live/dynamicwallpaper/data/dao/DynamicDataDao.java rename to app/src/main/java/com/live/dynamicwallpaper/room/dao/DynamicDataDao.java index a72e09a..50f08a4 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/data/dao/DynamicDataDao.java +++ b/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; diff --git a/app/src/main/java/com/live/dynamicwallpaper/data/database/AppDatabase.java b/app/src/main/java/com/live/dynamicwallpaper/room/database/AppDatabase.java similarity index 84% rename from app/src/main/java/com/live/dynamicwallpaper/data/database/AppDatabase.java rename to app/src/main/java/com/live/dynamicwallpaper/room/database/AppDatabase.java index fe74990..fc41a65 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/data/database/AppDatabase.java +++ b/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.data.entity.DynamicData; +import com.live.dynamicwallpaper.room.dao.DynamicDataDao; +import com.live.dynamicwallpaper.room.entity.DynamicData; @Database(entities = {DynamicData.class}, version = MyApplication.DB_VERSION, exportSchema = false) public abstract class AppDatabase extends RoomDatabase { diff --git a/app/src/main/java/com/live/dynamicwallpaper/data/entity/DynamicData.java b/app/src/main/java/com/live/dynamicwallpaper/room/entity/DynamicData.java similarity index 98% rename from app/src/main/java/com/live/dynamicwallpaper/data/entity/DynamicData.java rename to app/src/main/java/com/live/dynamicwallpaper/room/entity/DynamicData.java index 1c1901c..ec983f1 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/data/entity/DynamicData.java +++ b/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; diff --git a/app/src/main/java/com/live/dynamicwallpaper/ui/activity/DynamicActivity.java b/app/src/main/java/com/live/dynamicwallpaper/ui/activity/DynamicActivity.java index 309ec66..cce5d13 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/ui/activity/DynamicActivity.java +++ b/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; diff --git a/app/src/main/java/com/live/dynamicwallpaper/ui/adapter/DynamicAdapter.java b/app/src/main/java/com/live/dynamicwallpaper/ui/adapter/DynamicAdapter.java index 0f30238..e38b0a7 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/ui/adapter/DynamicAdapter.java +++ b/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; diff --git a/app/src/main/java/com/live/dynamicwallpaper/ui/fragment/MainFragment.java b/app/src/main/java/com/live/dynamicwallpaper/ui/fragment/MainFragment.java index eaec2c2..5991e2b 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/ui/fragment/MainFragment.java +++ b/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; diff --git a/app/src/main/java/com/live/dynamicwallpaper/util/InitDatabase.java b/app/src/main/java/com/live/dynamicwallpaper/util/InitDatabase.java index 3dd073c..1310440 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/util/InitDatabase.java +++ b/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.data.database.AppDatabase; -import com.live.dynamicwallpaper.data.entity.DynamicData; -import com.live.dynamicwallpaper.data.repository.DynamicRepository; +import com.live.dynamicwallpaper.room.dao.DynamicDataDao; +import com.live.dynamicwallpaper.room.database.AppDatabase; +import com.live.dynamicwallpaper.room.entity.DynamicData; +import com.live.dynamicwallpaper.repository.DynamicRepository; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/live/dynamicwallpaper/util/JsonParse.java b/app/src/main/java/com/live/dynamicwallpaper/util/JsonParse.java index 60a2ebc..2d7da88 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/util/JsonParse.java +++ b/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; diff --git a/app/src/main/java/com/live/dynamicwallpaper/ui/viewmodel/DynamicViewModel.java b/app/src/main/java/com/live/dynamicwallpaper/viewmodel/DynamicViewModel.java similarity index 81% rename from app/src/main/java/com/live/dynamicwallpaper/ui/viewmodel/DynamicViewModel.java rename to app/src/main/java/com/live/dynamicwallpaper/viewmodel/DynamicViewModel.java index 06b69da..de355b3 100644 --- a/app/src/main/java/com/live/dynamicwallpaper/ui/viewmodel/DynamicViewModel.java +++ b/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.data.database.AppDatabase; -import com.live.dynamicwallpaper.data.entity.DynamicData; -import com.live.dynamicwallpaper.data.repository.DynamicRepository; +import com.live.dynamicwallpaper.room.dao.DynamicDataDao; +import com.live.dynamicwallpaper.room.database.AppDatabase; +import com.live.dynamicwallpaper.room.entity.DynamicData; +import com.live.dynamicwallpaper.repository.DynamicRepository; import java.util.List; diff --git a/app/src/main/res/drawable/progress_bar_color.xml b/app/src/main/res/drawable/progress_bar_tint_color.xml similarity index 89% rename from app/src/main/res/drawable/progress_bar_color.xml rename to app/src/main/res/drawable/progress_bar_tint_color.xml index dc730d9..c834f47 100644 --- a/app/src/main/res/drawable/progress_bar_color.xml +++ b/app/src/main/res/drawable/progress_bar_tint_color.xml @@ -21,8 +21,8 @@ diff --git a/app/src/main/res/drawable/rounded_background_gray.xml b/app/src/main/res/drawable/rounded_background_gray.xml index 9bc056d..63f2ba9 100644 --- a/app/src/main/res/drawable/rounded_background_gray.xml +++ b/app/src/main/res/drawable/rounded_background_gray.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/rounded_rectangle_gradient.xml b/app/src/main/res/drawable/rounded_rectangle_gradient.xml index 53f6958..a29e47c 100644 --- a/app/src/main/res/drawable/rounded_rectangle_gradient.xml +++ b/app/src/main/res/drawable/rounded_rectangle_gradient.xml @@ -1,8 +1,8 @@ diff --git a/app/src/main/res/layout/activity_dynamic.xml b/app/src/main/res/layout/activity_dynamic.xml index 74df860..a0f1532 100644 --- a/app/src/main/res/layout/activity_dynamic.xml +++ b/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" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index df994c4..df15744 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/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" /> diff --git a/keystore.properties b/keystore.properties new file mode 100644 index 0000000..dbe31a6 --- /dev/null +++ b/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 \ No newline at end of file