diff --git a/app/HDWallpaper.jks b/app/HDWallpaper.jks new file mode 100644 index 0000000..f31bf10 Binary files /dev/null and b/app/HDWallpaper.jks differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ae3e5aa..0e94240 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,11 +11,11 @@ plugins { } val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { - namespace = "com.hd.phone.fresh.walls" + namespace = "com.hd.wallpaper.free.walls" compileSdk = 34 defaultConfig { - applicationId = "com.hd.phone.mico.test" + applicationId = "com.hd.wallpaper.free" minSdk = 23 targetSdk = 34 versionCode = 1 @@ -56,7 +56,7 @@ dependencies { implementation ("jp.wasabeef:glide-transformations:4.3.0") // Glide Transformations implementation("com.squareup.okhttp3:okhttp:4.12.0") - implementation ("com.squareup.leakcanary:leakcanary-android:2.9.1") +// implementation ("com.squareup.leakcanary:leakcanary-android:2.9.1") diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5570670..3377c02 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -19,136 +19,7 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile --keep class com.hd.phone.fresh.walls.json.** { *; } +-keep class com.hd.wallpaper.free.walls.json.** { *; } -keep class com.google.gson.** { *; } -keepattributes Signature -keepattributes AnnotationDefault,RuntimeVisibleAnnotations - - - -#---------------------------------------------Topon - -keep class com.startapp.** { - *; - } - - -keep class com.truenet.** { - *; - } - - -keepattributes Exceptions, InnerClasses, Signature, Deprecated, SourceFile, - LineNumberTable, *Annotation*, EnclosingMethod - -dontwarn android.webkit.JavascriptInterface - -dontwarn com.startapp.** - - -dontwarn org.jetbrains.annotations.** - -keep class com.appnext.** { *; } - -dontwarn com.appnext.** - # Vungle - -dontwarn com.vungle.ads.** - -keepclassmembers class com.vungle.ads.** { - *; - } - -keep class com.vungle.ads.** - - - - # Google - -keep class com.google.android.gms.** { *; } - -dontwarn com.google.android.gms.** - - - - - # START OkHttp + Okio - # JSR 305 annotations are for embedding nullability information. - -dontwarn javax.annotation.** - - - # A resource is loaded with a relative path so the package of this class must be preserved. - -adaptresourcefilenames okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz - - - # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. - -dontwarn org.codehaus.mojo.animal_sniffer.* - - - # OkHttp platform used only on JVM and when Conscrypt and other security providers are available. - -dontwarn okhttp3.internal.platform.** - -dontwarn org.conscrypt.** - -dontwarn org.bouncycastle.** - -dontwarn org.openjsse.** - - - # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. - -dontwarn org.codehaus.mojo.animal_sniffer.* - - - # END OkHttp + Okio - - - # START Protobuf - -dontwarn com.google.protobuf.** - -keepclassmembers class com.google.protobuf.** { - *; - } - -keep class * extends com.google.protobuf.GeneratedMessageLite { *; } - - - # END Protobuf - -keepclassmembers class com.ironsource.sdk.controller.IronSourceWebView$JSInterface { - public *; - } - -keepclassmembers class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; - } - -keep public class com.google.android.gms.ads.** { - public *; - } - -keep class com.ironsource.adapters.** { *; - } - -dontwarn com.ironsource.mediationsdk.** - -dontwarn com.ironsource.adapters.** - -keepattributes JavascriptInterface - -keepclassmembers class * { - @android.webkit.JavascriptInterface ; - } - -keep class com.bytedance.sdk.** { *; } - -keep class com.inmobi.** { *; } - -keep public class com.google.android.gms.** - -dontwarn com.google.android.gms.** - -dontwarn com.squareup.picasso.** - -keep class com.google.android.gms.ads.identifier.AdvertisingIdClient{ - public *; - } - -keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info{ - public *; - } - # skip the Picasso library classes - -keep class com.squareup.picasso.** {*;} - -dontwarn com.squareup.okhttp.** - # skip Moat classes - -keep class com.moat.** {*;} - -dontwarn com.moat.** - # skip IAB classes - -keep class com.iab.** {*;} - -dontwarn com.iab.** - -keepattributes Signature - -keepattributes *Annotation* - -keep class com.mbridge.** {*; } - -keep interface com.mbridge.** {*; } - -keep class android.support.v4.** { *; } - -dontwarn com.mbridge.** - -keep class **.R$* { public static final int mbridge*; } - -keep public class com.mbridge.* extends androidx.** { *; } - -keep public class androidx.viewpager.widget.PagerAdapter{ *; } - -keep public class androidx.viewpager.widget.ViewPager.OnPageChangeListener{ *; } - -keep interface androidx.annotation.IntDef{ *; } - -keep interface androidx.annotation.Nullable{ *; } - -keep interface androidx.annotation.CheckResult{ *; } - -keep interface androidx.annotation.NonNull{ *; } - -keep public class androidx.fragment.app.Fragment{ *; } - -keep public class androidx.core.content.FileProvider{ *; } - -keep public class androidx.core.app.NotificationCompat{ *; } - -keep public class androidx.appcompat.widget.AppCompatImageView { *; } - -keep public class androidx.recyclerview.*{ *; } - -keep class com.chartboost.** { *; } \ No newline at end of file diff --git a/app/src/androidTest/java/com/hd/phone/fresh/walls/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/hd/wallpaper/free/walls/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/hd/phone/fresh/walls/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/hd/wallpaper/free/walls/ExampleInstrumentedTest.java index 3ba60a9..73e2b4f 100644 --- a/app/src/androidTest/java/com/hd/phone/fresh/walls/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/hd/wallpaper/free/walls/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls; +package com.hd.wallpaper.free.walls; import android.content.Context; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/ItemClickListener.java b/app/src/main/java/com/hd/phone/fresh/walls/mylistener/ItemClickListener.java deleted file mode 100644 index 9e45997..0000000 --- a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/ItemClickListener.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.hd.phone.fresh.walls.mylistener; - -import com.hd.phone.fresh.walls.json.Data; - -public interface ItemClickListener { - - public void onItemClickAction(Data info); -} diff --git a/app/src/main/java/com/hd/phone/fresh/walls/MyWallpaper.java b/app/src/main/java/com/hd/wallpaper/free/walls/MyWallpaper.java similarity index 92% rename from app/src/main/java/com/hd/phone/fresh/walls/MyWallpaper.java rename to app/src/main/java/com/hd/wallpaper/free/walls/MyWallpaper.java index 459b6c1..61e84bc 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/MyWallpaper.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/MyWallpaper.java @@ -1,15 +1,15 @@ -package com.hd.phone.fresh.walls; +package com.hd.wallpaper.free.walls; import android.app.Application; import android.content.Context; import android.graphics.Typeface; import android.util.Log; -import com.hd.phone.fresh.walls.json.Category; -import com.hd.phone.fresh.walls.utils.CommonUtils; -import com.hd.phone.fresh.walls.utils.CommonKt; -import com.hd.phone.fresh.walls.db.DbManager; -import com.hd.phone.fresh.walls.json.Data; +import com.hd.wallpaper.free.walls.json.Category; +import com.hd.wallpaper.free.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.utils.CommonKt; +import com.hd.wallpaper.free.walls.db.DbManager; +import com.hd.wallpaper.free.walls.json.Data; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/adapter/AdapterFavorite.java b/app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterFavorite.java similarity index 89% rename from app/src/main/java/com/hd/phone/fresh/walls/adapter/AdapterFavorite.java rename to app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterFavorite.java index 7e86016..5c5e2f9 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/adapter/AdapterFavorite.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterFavorite.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.adapter; +package com.hd.wallpaper.free.walls.adapter; import android.content.Context; import android.graphics.Bitmap; @@ -14,12 +14,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.MultiTransformation; import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.R; -import com.hd.phone.fresh.walls.mylistener.ItemClickListener; -import com.hd.phone.fresh.walls.utils.CommonUtils; -import com.hd.phone.fresh.walls.db.DbManager; -import com.hd.phone.fresh.walls.json.Data; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.R; +import com.hd.wallpaper.free.walls.mylistener.ItemClickListener; +import com.hd.wallpaper.free.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.db.DbManager; +import com.hd.wallpaper.free.walls.json.Data; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/adapter/AdapterPreView.java b/app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterPreView.java similarity index 94% rename from app/src/main/java/com/hd/phone/fresh/walls/adapter/AdapterPreView.java rename to app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterPreView.java index d7bd38c..be8a69f 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/adapter/AdapterPreView.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterPreView.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.adapter; +package com.hd.wallpaper.free.walls.adapter; import android.content.Context; import android.graphics.Bitmap; @@ -25,13 +25,12 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.R; -import com.hd.phone.fresh.walls.mylistener.ItemClickListener; -import com.hd.phone.fresh.walls.ui.ActivitySet; -import com.hd.phone.fresh.walls.utils.CommonUtils; -import com.hd.phone.fresh.walls.db.DbManager; -import com.hd.phone.fresh.walls.json.Data; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.R; +import com.hd.wallpaper.free.walls.mylistener.ItemClickListener; +import com.hd.wallpaper.free.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.db.DbManager; +import com.hd.wallpaper.free.walls.json.Data; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -111,7 +110,7 @@ public class AdapterPreView extends RecyclerView.Adapter { .skipMemoryCache(true) .apply(options) .diskCacheStrategy(DiskCacheStrategy.ALL) - .load(previewUrl200) + .load(previewUrl400) .listener(new RequestListener() { @Override public boolean onLoadFailed(@Nullable GlideException e, @Nullable Object model, @NonNull Target target, boolean isFirstResource) { diff --git a/app/src/main/java/com/hd/phone/fresh/walls/adapter/MyViewHolder.java b/app/src/main/java/com/hd/wallpaper/free/walls/adapter/MyViewHolder.java similarity index 90% rename from app/src/main/java/com/hd/phone/fresh/walls/adapter/MyViewHolder.java rename to app/src/main/java/com/hd/wallpaper/free/walls/adapter/MyViewHolder.java index 684e250..1ea9f82 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/adapter/MyViewHolder.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/adapter/MyViewHolder.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.adapter; +package com.hd.wallpaper.free.walls.adapter; import android.view.View; import android.widget.ImageView; @@ -7,7 +7,7 @@ import android.widget.RelativeLayout; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.hd.phone.fresh.walls.R; +import com.hd.wallpaper.free.walls.R; public class MyViewHolder extends RecyclerView.ViewHolder{ diff --git a/app/src/main/java/com/hd/phone/fresh/walls/db/DbManager.java b/app/src/main/java/com/hd/wallpaper/free/walls/db/DbManager.java similarity index 93% rename from app/src/main/java/com/hd/phone/fresh/walls/db/DbManager.java rename to app/src/main/java/com/hd/wallpaper/free/walls/db/DbManager.java index 176c389..798e720 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/db/DbManager.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/db/DbManager.java @@ -1,19 +1,18 @@ -package com.hd.phone.fresh.walls.db; +package com.hd.wallpaper.free.walls.db; import android.content.Context; import android.util.Log; import androidx.annotation.NonNull; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.mylistener.OnAddListener; -import com.hd.phone.fresh.walls.mylistener.OnDownloadListener; -import com.hd.phone.fresh.walls.mylistener.OnLikeListener; -import com.hd.phone.fresh.walls.json.Data; -import com.hd.phone.fresh.walls.json.Data_; -import com.hd.phone.fresh.walls.json.MyObjectBox; -import com.hd.phone.fresh.walls.utils.CommonKt; -import com.hd.phone.fresh.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.mylistener.OnAddListener; +import com.hd.wallpaper.free.walls.mylistener.OnDownloadListener; +import com.hd.wallpaper.free.walls.mylistener.OnLikeListener; +import com.hd.wallpaper.free.walls.json.Data; +import com.hd.wallpaper.free.walls.json.Data_; +import com.hd.wallpaper.free.walls.json.MyObjectBox; +import com.hd.wallpaper.free.walls.utils.CommonKt; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/json/Category.java b/app/src/main/java/com/hd/wallpaper/free/walls/json/Category.java similarity index 91% rename from app/src/main/java/com/hd/phone/fresh/walls/json/Category.java rename to app/src/main/java/com/hd/wallpaper/free/walls/json/Category.java index 7f1b8ef..3234d6a 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/json/Category.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/json/Category.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.json; +package com.hd.wallpaper.free.walls.json; import java.util.List; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/json/Data.java b/app/src/main/java/com/hd/wallpaper/free/walls/json/Data.java similarity index 98% rename from app/src/main/java/com/hd/phone/fresh/walls/json/Data.java rename to app/src/main/java/com/hd/wallpaper/free/walls/json/Data.java index aae27a8..c4c4864 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/json/Data.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/json/Data.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.json; +package com.hd.wallpaper.free.walls.json; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/ItemClickListener.java b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/ItemClickListener.java new file mode 100644 index 0000000..aac5168 --- /dev/null +++ b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/ItemClickListener.java @@ -0,0 +1,8 @@ +package com.hd.wallpaper.free.walls.mylistener; + +import com.hd.wallpaper.free.walls.json.Data; + +public interface ItemClickListener { + + public void onItemClickAction(Data info); +} diff --git a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnAddListener.java b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnAddListener.java similarity index 50% rename from app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnAddListener.java rename to app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnAddListener.java index ca016c9..835ced3 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnAddListener.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnAddListener.java @@ -1,6 +1,6 @@ -package com.hd.phone.fresh.walls.mylistener; +package com.hd.wallpaper.free.walls.mylistener; -import com.hd.phone.fresh.walls.json.Data; +import com.hd.wallpaper.free.walls.json.Data; public interface OnAddListener { void onAdd(Data data); diff --git a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnDownloadListener.java b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnDownloadListener.java similarity index 54% rename from app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnDownloadListener.java rename to app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnDownloadListener.java index 6c07e6e..14be423 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnDownloadListener.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnDownloadListener.java @@ -1,6 +1,6 @@ -package com.hd.phone.fresh.walls.mylistener; +package com.hd.wallpaper.free.walls.mylistener; -import com.hd.phone.fresh.walls.json.Data; +import com.hd.wallpaper.free.walls.json.Data; import java.util.List; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnLikeListener.java b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnLikeListener.java similarity index 52% rename from app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnLikeListener.java rename to app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnLikeListener.java index f240553..4d56aab 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/OnLikeListener.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/OnLikeListener.java @@ -1,6 +1,6 @@ -package com.hd.phone.fresh.walls.mylistener; +package com.hd.wallpaper.free.walls.mylistener; -import com.hd.phone.fresh.walls.json.Data; +import com.hd.wallpaper.free.walls.json.Data; import java.util.List; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/TypeListener.java b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/TypeListener.java similarity index 58% rename from app/src/main/java/com/hd/phone/fresh/walls/mylistener/TypeListener.java rename to app/src/main/java/com/hd/wallpaper/free/walls/mylistener/TypeListener.java index 76eb95b..f5568da 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/mylistener/TypeListener.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/mylistener/TypeListener.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.mylistener; +package com.hd.wallpaper.free.walls.mylistener; public interface TypeListener { diff --git a/app/src/main/java/com/hd/phone/fresh/walls/ui/ActivityMain.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityMain.java similarity index 92% rename from app/src/main/java/com/hd/phone/fresh/walls/ui/ActivityMain.java rename to app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityMain.java index 807f67e..44d3511 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/ui/ActivityMain.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityMain.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.ui; +package com.hd.wallpaper.free.walls.ui; import android.os.Bundle; import android.view.View; @@ -10,10 +10,10 @@ import androidx.fragment.app.Fragment; import androidx.viewpager2.adapter.FragmentStateAdapter; import com.google.android.material.tabs.TabLayout; -import com.hd.phone.fresh.walls.R; -import com.hd.phone.fresh.walls.databinding.ActivityMainBinding; -import com.hd.phone.fresh.walls.databinding.TabCustomViewBinding; -import com.hd.phone.fresh.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.R; +import com.hd.wallpaper.free.walls.databinding.ActivityMainBinding; +import com.hd.wallpaper.free.walls.databinding.TabCustomViewBinding; +import com.hd.wallpaper.free.walls.utils.CommonUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/ui/ActivitySet.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivitySet.java similarity index 96% rename from app/src/main/java/com/hd/phone/fresh/walls/ui/ActivitySet.java rename to app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivitySet.java index 8d7d55b..510df79 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/ui/ActivitySet.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivitySet.java @@ -1,10 +1,7 @@ -package com.hd.phone.fresh.walls.ui; +package com.hd.wallpaper.free.walls.ui; import android.app.WallpaperManager; import android.content.pm.PackageManager; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; @@ -26,14 +23,14 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.R; -import com.hd.phone.fresh.walls.databinding.ActivitySetBinding; -import com.hd.phone.fresh.walls.db.DbManager; -import com.hd.phone.fresh.walls.json.Data; -import com.hd.phone.fresh.walls.mylistener.TypeListener; -import com.hd.phone.fresh.walls.utils.CommonKt; -import com.hd.phone.fresh.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.R; +import com.hd.wallpaper.free.walls.databinding.ActivitySetBinding; +import com.hd.wallpaper.free.walls.db.DbManager; +import com.hd.wallpaper.free.walls.json.Data; +import com.hd.wallpaper.free.walls.mylistener.TypeListener; +import com.hd.wallpaper.free.walls.utils.CommonKt; +import com.hd.wallpaper.free.walls.utils.CommonUtils; import java.io.File; import java.io.FileInputStream; @@ -118,7 +115,7 @@ public class ActivitySet extends AppCompatActivity implements TypeListener { .thumbnail( Glide.with(ActivitySet.this) .asDrawable() - .load(previewUrl200) + .load(previewUrl400) .apply(options) .placeholder(R.mipmap.im_placeholder) // .override(screenWidthHeight[0], screenWidthHeight[1]) diff --git a/app/src/main/java/com/hd/phone/fresh/walls/ui/ActivityWelcome.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityWelcome.java similarity index 93% rename from app/src/main/java/com/hd/phone/fresh/walls/ui/ActivityWelcome.java rename to app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityWelcome.java index 99d4ac3..8769c1d 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/ui/ActivityWelcome.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityWelcome.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.ui; +package com.hd.wallpaper.free.walls.ui; import android.annotation.SuppressLint; import android.content.Intent; @@ -8,8 +8,8 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; -import com.hd.phone.fresh.walls.databinding.ActivityWelcomeBinding; -import com.hd.phone.fresh.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.databinding.ActivityWelcomeBinding; +import com.hd.wallpaper.free.walls.utils.CommonUtils; public class ActivityWelcome extends AppCompatActivity { private TextView textViewWallpaper; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/ui/DialogSetType.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/DialogSetType.java similarity index 93% rename from app/src/main/java/com/hd/phone/fresh/walls/ui/DialogSetType.java rename to app/src/main/java/com/hd/wallpaper/free/walls/ui/DialogSetType.java index 6986c92..c2c7131 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/ui/DialogSetType.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/DialogSetType.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.ui; +package com.hd.wallpaper.free.walls.ui; import android.app.Dialog; import android.graphics.Color; @@ -13,8 +13,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; -import com.hd.phone.fresh.walls.databinding.DialogTypeBinding; -import com.hd.phone.fresh.walls.mylistener.TypeListener; +import com.hd.wallpaper.free.walls.databinding.DialogTypeBinding; +import com.hd.wallpaper.free.walls.mylistener.TypeListener; public class DialogSetType extends DialogFragment { diff --git a/app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentChild.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentChild.java similarity index 84% rename from app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentChild.java rename to app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentChild.java index 617c69f..c9ed3df 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentChild.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentChild.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.ui; +package com.hd.wallpaper.free.walls.ui; import android.content.Intent; import android.os.Bundle; @@ -9,18 +9,15 @@ import android.view.ViewGroup; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; import com.bumptech.glide.Glide; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.adapter.AdapterPreView; -import com.hd.phone.fresh.walls.databinding.FragmentChildBinding; -import com.hd.phone.fresh.walls.db.DbManager; -import com.hd.phone.fresh.walls.json.Data; -import com.hd.phone.fresh.walls.mylistener.ItemClickListener; -import com.hd.phone.fresh.walls.mylistener.OnAddListener; -import com.hd.phone.fresh.walls.utils.CommonUtils; -import com.hd.phone.fresh.walls.utils.ItemSpace; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.adapter.AdapterPreView; +import com.hd.wallpaper.free.walls.databinding.FragmentChildBinding; +import com.hd.wallpaper.free.walls.json.Data; +import com.hd.wallpaper.free.walls.mylistener.ItemClickListener; +import com.hd.wallpaper.free.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.utils.ItemSpace; import java.util.List; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentDownload.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentDownload.java similarity index 80% rename from app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentDownload.java rename to app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentDownload.java index 3624b91..22bb2fd 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentDownload.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentDownload.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.ui; +package com.hd.wallpaper.free.walls.ui; import android.content.Intent; import android.os.Bundle; @@ -10,23 +10,18 @@ import android.view.ViewGroup; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.R; -import com.hd.phone.fresh.walls.adapter.AdapterFavorite; -import com.hd.phone.fresh.walls.adapter.AdapterPreView; -import com.hd.phone.fresh.walls.databinding.FragmentLikeBinding; -import com.hd.phone.fresh.walls.db.DbManager; -import com.hd.phone.fresh.walls.json.Data; -import com.hd.phone.fresh.walls.mylistener.ItemClickListener; -import com.hd.phone.fresh.walls.mylistener.OnDownloadListener; -import com.hd.phone.fresh.walls.mylistener.OnLikeListener; -import com.hd.phone.fresh.walls.utils.CommonKt; -import com.hd.phone.fresh.walls.utils.CommonUtils; -import com.hd.phone.fresh.walls.utils.ItemSpace; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.R; +import com.hd.wallpaper.free.walls.adapter.AdapterPreView; +import com.hd.wallpaper.free.walls.databinding.FragmentLikeBinding; +import com.hd.wallpaper.free.walls.db.DbManager; +import com.hd.wallpaper.free.walls.json.Data; +import com.hd.wallpaper.free.walls.mylistener.ItemClickListener; +import com.hd.wallpaper.free.walls.mylistener.OnDownloadListener; +import com.hd.wallpaper.free.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.utils.ItemSpace; -import java.io.File; import java.util.List; -import java.util.Objects; import io.objectbox.reactive.DataSubscription; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentHome.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentHome.java similarity index 88% rename from app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentHome.java rename to app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentHome.java index 193a3b0..15cfc38 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentHome.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentHome.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.ui; +package com.hd.wallpaper.free.walls.ui; import android.content.Intent; import android.os.Bundle; @@ -12,15 +12,15 @@ import androidx.fragment.app.Fragment; import androidx.viewpager2.adapter.FragmentStateAdapter; import com.google.android.material.tabs.TabLayout; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.R; -import com.hd.phone.fresh.walls.databinding.ClassTabViewBinding; -import com.hd.phone.fresh.walls.databinding.FragmentMainBinding; -import com.hd.phone.fresh.walls.json.Category; -import com.hd.phone.fresh.walls.json.Data; -import com.hd.phone.fresh.walls.mylistener.ItemClickListener; -import com.hd.phone.fresh.walls.utils.CommonUtils; -import com.hd.phone.fresh.walls.utils.CustomerTv; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.R; +import com.hd.wallpaper.free.walls.databinding.ClassTabViewBinding; +import com.hd.wallpaper.free.walls.databinding.FragmentMainBinding; +import com.hd.wallpaper.free.walls.json.Category; +import com.hd.wallpaper.free.walls.json.Data; +import com.hd.wallpaper.free.walls.mylistener.ItemClickListener; +import com.hd.wallpaper.free.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.utils.CustomerTv; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentLike.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentLike.java similarity index 82% rename from app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentLike.java rename to app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentLike.java index be95d41..a039832 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/ui/FragmentLike.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentLike.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.ui; +package com.hd.wallpaper.free.walls.ui; import android.content.Intent; import android.os.Bundle; @@ -10,16 +10,16 @@ import android.view.ViewGroup; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.R; -import com.hd.phone.fresh.walls.adapter.AdapterFavorite; -import com.hd.phone.fresh.walls.databinding.FragmentLikeBinding; -import com.hd.phone.fresh.walls.db.DbManager; -import com.hd.phone.fresh.walls.json.Data; -import com.hd.phone.fresh.walls.mylistener.ItemClickListener; -import com.hd.phone.fresh.walls.mylistener.OnLikeListener; -import com.hd.phone.fresh.walls.utils.CommonUtils; -import com.hd.phone.fresh.walls.utils.ItemSpace; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.R; +import com.hd.wallpaper.free.walls.adapter.AdapterFavorite; +import com.hd.wallpaper.free.walls.databinding.FragmentLikeBinding; +import com.hd.wallpaper.free.walls.db.DbManager; +import com.hd.wallpaper.free.walls.json.Data; +import com.hd.wallpaper.free.walls.mylistener.ItemClickListener; +import com.hd.wallpaper.free.walls.mylistener.OnLikeListener; +import com.hd.wallpaper.free.walls.utils.CommonUtils; +import com.hd.wallpaper.free.walls.utils.ItemSpace; import java.util.List; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/utils/CommonKt.kt b/app/src/main/java/com/hd/wallpaper/free/walls/utils/CommonKt.kt similarity index 98% rename from app/src/main/java/com/hd/phone/fresh/walls/utils/CommonKt.kt rename to app/src/main/java/com/hd/wallpaper/free/walls/utils/CommonKt.kt index 07eea54..79696b5 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/utils/CommonKt.kt +++ b/app/src/main/java/com/hd/wallpaper/free/walls/utils/CommonKt.kt @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.utils +package com.hd.wallpaper.free.walls.utils import android.Manifest import android.app.Activity @@ -12,8 +12,8 @@ import android.os.Build import android.provider.MediaStore import android.util.Log import androidx.core.app.ActivityCompat -import com.hd.phone.fresh.walls.MyWallpaper -import com.hd.phone.fresh.walls.json.Data +import com.hd.wallpaper.free.walls.MyWallpaper +import com.hd.wallpaper.free.walls.json.Data import okhttp3.Call import okhttp3.Callback import okhttp3.OkHttpClient diff --git a/app/src/main/java/com/hd/phone/fresh/walls/utils/CommonUtils.java b/app/src/main/java/com/hd/wallpaper/free/walls/utils/CommonUtils.java similarity index 97% rename from app/src/main/java/com/hd/phone/fresh/walls/utils/CommonUtils.java rename to app/src/main/java/com/hd/wallpaper/free/walls/utils/CommonUtils.java index 4137a7a..644bad3 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/utils/CommonUtils.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/utils/CommonUtils.java @@ -1,10 +1,9 @@ -package com.hd.phone.fresh.walls.utils; +package com.hd.wallpaper.free.walls.utils; import android.app.Activity; import android.app.ActivityManager; import android.content.Context; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; @@ -15,7 +14,7 @@ import android.view.View; import android.view.Window; import android.view.WindowManager; -import com.hd.phone.fresh.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.MyWallpaper; import java.io.BufferedReader; import java.io.File; diff --git a/app/src/main/java/com/hd/phone/fresh/walls/utils/CustomerTv.java b/app/src/main/java/com/hd/wallpaper/free/walls/utils/CustomerTv.java similarity index 85% rename from app/src/main/java/com/hd/phone/fresh/walls/utils/CustomerTv.java rename to app/src/main/java/com/hd/wallpaper/free/walls/utils/CustomerTv.java index e802869..ae6c062 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/utils/CustomerTv.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/utils/CustomerTv.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.utils; +package com.hd.wallpaper.free.walls.utils; import android.content.Context; import android.content.res.TypedArray; @@ -6,8 +6,8 @@ import android.util.AttributeSet; import androidx.annotation.Nullable; -import com.hd.phone.fresh.walls.MyWallpaper; -import com.hd.phone.fresh.walls.R; +import com.hd.wallpaper.free.walls.MyWallpaper; +import com.hd.wallpaper.free.walls.R; public class CustomerTv extends androidx.appcompat.widget.AppCompatTextView { diff --git a/app/src/main/java/com/hd/phone/fresh/walls/utils/ItemSpace.java b/app/src/main/java/com/hd/wallpaper/free/walls/utils/ItemSpace.java similarity index 97% rename from app/src/main/java/com/hd/phone/fresh/walls/utils/ItemSpace.java rename to app/src/main/java/com/hd/wallpaper/free/walls/utils/ItemSpace.java index a29952e..4b3e8f2 100644 --- a/app/src/main/java/com/hd/phone/fresh/walls/utils/ItemSpace.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/utils/ItemSpace.java @@ -1,4 +1,4 @@ -package com.hd.phone.fresh.walls.utils; +package com.hd.wallpaper.free.walls.utils; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 42ac648..e0b7354 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -9,7 +9,7 @@ android:paddingTop="30dp" tools:context=".ui.ActivityMain"> - - - -