From 3604fa40c9c0146b7806276a2f434ee6e7955305 Mon Sep 17 00:00:00 2001 From: litingting Date: Thu, 1 Aug 2024 16:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=A8=A1=E7=B3=8A=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 8 ++-- .../com/app/wallpaper/myact/ViewActivity.java | 10 ++--- app/src/main/res/drawable/apply.png | Bin 371 -> 0 bytes app/src/main/res/drawable/apply.xml | 9 +++++ app/src/main/res/drawable/donwload.png | Bin 264 -> 0 bytes app/src/main/res/drawable/donwload.xml | 9 +++++ app/src/main/res/drawable/like.png | Bin 306 -> 0 bytes app/src/main/res/drawable/likede_ic.png | Bin 474 -> 0 bytes app/src/main/res/drawable/love.xml | 9 +++++ app/src/main/res/drawable/love_red.xml | 9 +++++ app/src/main/res/drawable/share.png | Bin 381 -> 0 bytes app/src/main/res/drawable/share.xml | 9 +++++ app/src/main/res/layout/activity_login.xml | 33 ---------------- app/src/main/res/layout/activity_view.xml | 2 +- app/src/main/res/layout/content_login.xml | 19 --------- app/src/main/res/layout/fragment_first.xml | 35 ----------------- app/src/main/res/layout/fragment_second.xml | 35 ----------------- app/src/main/res/navigation/nav_graph.xml | 28 ------------- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/strings.xml | 37 +----------------- 20 files changed, 57 insertions(+), 196 deletions(-) delete mode 100644 app/src/main/res/drawable/apply.png create mode 100644 app/src/main/res/drawable/apply.xml delete mode 100644 app/src/main/res/drawable/donwload.png create mode 100644 app/src/main/res/drawable/donwload.xml delete mode 100644 app/src/main/res/drawable/like.png delete mode 100644 app/src/main/res/drawable/likede_ic.png create mode 100644 app/src/main/res/drawable/love.xml create mode 100644 app/src/main/res/drawable/love_red.xml delete mode 100644 app/src/main/res/drawable/share.png create mode 100644 app/src/main/res/drawable/share.xml delete mode 100644 app/src/main/res/layout/activity_login.xml delete mode 100644 app/src/main/res/layout/content_login.xml delete mode 100644 app/src/main/res/layout/fragment_first.xml delete mode 100644 app/src/main/res/layout/fragment_second.xml delete mode 100644 app/src/main/res/navigation/nav_graph.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 84a8b54..20fd412 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,12 +15,14 @@ android { compileSdk = 34 defaultConfig { - applicationId = "com.wallpapers.gallery" + //com.wallpapers.gallery + applicationId = "com.wallpapers.gallery.test" minSdk = 23 targetSdk = 34 versionCode = 2 versionName = "1.0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + setProperty("archivesBaseName", "Wallpapers Gallery_V" + versionName + "(${versionCode})_$timestamp") } buildTypes { @@ -39,9 +41,7 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - defaultConfig { - setProperty("archivesBaseName", "Wallpapers Gallery_V" + versionName + "(${versionCode})_$timestamp") - } + buildFeatures { viewBinding = true diff --git a/app/src/main/java/com/app/wallpaper/myact/ViewActivity.java b/app/src/main/java/com/app/wallpaper/myact/ViewActivity.java index dfb6e1e..895e006 100644 --- a/app/src/main/java/com/app/wallpaper/myact/ViewActivity.java +++ b/app/src/main/java/com/app/wallpaper/myact/ViewActivity.java @@ -95,12 +95,12 @@ public class ViewActivity extends AppCompatActivity { if (myEntitys != null) { MyEntity myEntity = interfaceDao.getImageSou(myEntitys.imageSou); if (myEntity != null) { - binding.likeImg.setBackgroundResource(R.drawable.likede_ic); + binding.likeImg.setBackgroundResource(R.drawable.love_red); } } else { MyEntity myEntity = interfaceDao.getImageSou(sourUrl); if (myEntity != null) { - binding.likeImg.setBackgroundResource(R.drawable.likede_ic); + binding.likeImg.setBackgroundResource(R.drawable.love_red); } } } @@ -150,7 +150,7 @@ public class ViewActivity extends AppCompatActivity { runOnUiThread(new Runnable() { @Override public void run() { - binding.likeImg.setBackgroundResource(R.drawable.likede_ic); + binding.likeImg.setBackgroundResource(R.drawable.love_red); Toast.makeText(ViewActivity.this, "Added successfully", Toast.LENGTH_SHORT).show(); } }); @@ -159,7 +159,7 @@ public class ViewActivity extends AppCompatActivity { runOnUiThread(new Runnable() { @Override public void run() { - binding.likeImg.setBackgroundResource(R.drawable.like); + binding.likeImg.setBackgroundResource(R.drawable.love); Toast.makeText(ViewActivity.this, "Cancel successfully", Toast.LENGTH_SHORT).show(); } }); @@ -171,7 +171,7 @@ public class ViewActivity extends AppCompatActivity { runOnUiThread(new Runnable() { @Override public void run() { - binding.likeImg.setBackgroundResource(R.drawable.like); + binding.likeImg.setBackgroundResource(R.drawable.love); Toast.makeText(ViewActivity.this, "Cancel successfully", Toast.LENGTH_SHORT).show(); } }); diff --git a/app/src/main/res/drawable/apply.png b/app/src/main/res/drawable/apply.png deleted file mode 100644 index 25f8ff32ade9ae0b4e04424d278868489ce8be99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O(A9G)(YAr*{QLvQmQGTnhEn!Mt zfSH32gR%jW^aZ~QIRRz{eNVWwRr!NNSE|nyvb=7wEtoywWxzT{L2oIq6U~8MwoP0` z1&3>56b+kn1BJ7bTyt!nZ@gvv(P>XHiyPN9<$f>IH!Bi?UvtkkIlSd#W|)C-kW5Yj zlM^3L|L=xnC0kxD_>14-=$0IM5~AAiW7ggf1Pr+^i9hnp^W)zAg;G M)78&qol`;+0Q5(T*Z=?k diff --git a/app/src/main/res/drawable/apply.xml b/app/src/main/res/drawable/apply.xml new file mode 100644 index 0000000..353ab6e --- /dev/null +++ b/app/src/main/res/drawable/apply.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/donwload.png b/app/src/main/res/drawable/donwload.png deleted file mode 100644 index 11c600bf64edeb850021696fd10624eea0718761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#xt=bLAr*{oryS&MP~dU3KgK9?P!NoKOO)LU zSj~axz$6c+0FI1K_6kq_fM4Dj+yM_cQIi{!~(umdY}f6AF&9MIBL_Ya`^H zI+$f9JkWW6=0OWfxO2@xX^nz_XCF+fCcRZRKG$<^z03VekKe~UnjXJ#R<)z+wSYi# zmrwq)i^@9YI(+}iqSmr=2iJ{9($cpXo*m@8T3=zYTu6{1-oD!M + + diff --git a/app/src/main/res/drawable/like.png b/app/src/main/res/drawable/like.png deleted file mode 100644 index a414b96f69f08dd3c5becc2f76cce9b182758803..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)##Ar*{or#$3sG7xB8@7Ew*B4RdK@P@

M%a#510 z?qrEev)W|d^~zmyPWGL?-TB9n+q%X~EYUgpj!wB8t68D>P^$R>nf_aCn`?h y(_S0So##$$4c~9A^wQ{4pN``V;l8Vv+C=%AAO4E`YMT!7FN3G6pUXO@geCx{34DV9 diff --git a/app/src/main/res/drawable/likede_ic.png b/app/src/main/res/drawable/likede_ic.png deleted file mode 100644 index eb84dbdcd95ba513b4cc2bc6ec2eeb84a1cbe60e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmV<00VV#4P)PEMd4!4s$_z#9lh-~`GIya7E1u4n=Y?rdUAnoxMoGqe_L zq1d`Heo2$gdo%yvnZ9|zpJrlfTb^Bc?17RN9o4Gc72}2oT4Ky_m4c%d==;9!S+z=! zpsr2Ej`D;@6<~P!GImo9<|i#3lrRc~w-F&CvP0pdytPCpZbDhbvmz$JyWehlt|wy^ zCKhG%@`?+hVb!X4;W#p&6)sQ^1nzDaOw92V@%1qad#+nLGWboRpFFFdy{1*i;jmYq zJs-;?L|?(Ys3rQ}3>ves!{7mO!pwujizZC8w#z|fWWwk80Zeck z({VE%+o+w2Ytu4Ez(MAldfbhhJ^H2Je_lug^+M^c$zW}AX=XpH)o-P&@lO$a0Gp|hj-^LV Q+yDRo07*qoM6N<$f|qQ}0ssI2 diff --git a/app/src/main/res/drawable/love.xml b/app/src/main/res/drawable/love.xml new file mode 100644 index 0000000..4d3da79 --- /dev/null +++ b/app/src/main/res/drawable/love.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/love_red.xml b/app/src/main/res/drawable/love_red.xml new file mode 100644 index 0000000..1be99ab --- /dev/null +++ b/app/src/main/res/drawable/love_red.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/share.png b/app/src/main/res/drawable/share.png deleted file mode 100644 index 34c5cabe0cdf55cde69ae688ae3e5df5f0d0fa1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPRCP)K~#7F)sz7Z z!Y~j;uPB&=NtlG8013c z?BtY*5IBTDJLAzLI>6jNovXg2PzS;gx|v{^%pL&L26dVGAu3Sz| + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml deleted file mode 100644 index 80d6e1d..0000000 --- a/app/src/main/res/layout/activity_login.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view.xml b/app/src/main/res/layout/activity_view.xml index 40a2f5d..29a0e6e 100644 --- a/app/src/main/res/layout/activity_view.xml +++ b/app/src/main/res/layout/activity_view.xml @@ -149,7 +149,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center" - android:background="@drawable/like" /> + android:background="@drawable/love" /> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml deleted file mode 100644 index 44baecd..0000000 --- a/app/src/main/res/layout/fragment_first.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - -