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 25f8ff3..0000000 Binary files a/app/src/main/res/drawable/apply.png and /dev/null differ 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 11c600b..0000000 Binary files a/app/src/main/res/drawable/donwload.png and /dev/null differ diff --git a/app/src/main/res/drawable/donwload.xml b/app/src/main/res/drawable/donwload.xml new file mode 100644 index 0000000..30d4a92 --- /dev/null +++ b/app/src/main/res/drawable/donwload.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/like.png b/app/src/main/res/drawable/like.png deleted file mode 100644 index a414b96..0000000 Binary files a/app/src/main/res/drawable/like.png and /dev/null differ 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 eb84dbd..0000000 Binary files a/app/src/main/res/drawable/likede_ic.png and /dev/null differ 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 34c5cab..0000000 Binary files a/app/src/main/res/drawable/share.png and /dev/null differ diff --git a/app/src/main/res/drawable/share.xml b/app/src/main/res/drawable/share.xml new file mode 100644 index 0000000..76b602e --- /dev/null +++ b/app/src/main/res/drawable/share.xml @@ -0,0 +1,9 @@ + + + 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 @@ - - - - - -