From 4a18d4bdc63f7c6f8e2e78df3057c47be93e1b0f Mon Sep 17 00:00:00 2001 From: litingting Date: Thu, 15 Aug 2024 11:45:32 +0800 Subject: [PATCH] =?UTF-8?q?V1.0.5(6)=20=20=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 +- app/src/main/AndroidManifest.xml | 14 +- .../VariousWallpapers_PrivacyPolicy.html | 71 +++++++++++ app/src/main/assets/info.json | 2 +- .../com/nature/free/test/AboutActivity.java | 80 ++++++++++++ .../nature/free/test/CategoryFragment.java | 2 + .../com/nature/free/test/MainActivity.java | 19 ++- .../com/nature/free/test/MainFragment.java | 30 ++--- .../java/com/nature/free/test/MyWallpaper.kt | 10 +- .../com/nature/free/test/PrivacyActivity.kt | 24 ++++ .../nature/free/test/WallPaperActivity.java | 58 +++++---- .../com/nature/free/test/max/MaxManager.java | 3 +- .../nature/free/test/max/onShowAction.java | 6 + .../com/nature/free/test/other/MyAdapter.kt | 2 - app/src/main/res/color/tab_textcolor.xml | 6 + app/src/main/res/drawable/back_black.xml | 12 ++ app/src/main/res/drawable/ic_download.xml | 10 +- .../main/res/drawable/ic_set_wallpaper.xml | 13 +- app/src/main/res/drawable/icon_set.xml | 12 ++ app/src/main/res/drawable/love.xml | 13 +- app/src/main/res/drawable/love_red.xml | 13 +- app/src/main/res/layout/activity_about.xml | 120 ++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 14 +- app/src/main/res/layout/activity_privacy.xml | 43 +++++++ app/src/main/res/layout/tab_item_view.xml | 10 ++ app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/strings.xml | 9 ++ app/src/main/res/values/themes.xml | 7 +- 28 files changed, 530 insertions(+), 78 deletions(-) create mode 100644 app/src/main/assets/VariousWallpapers_PrivacyPolicy.html create mode 100644 app/src/main/java/com/nature/free/test/AboutActivity.java create mode 100644 app/src/main/java/com/nature/free/test/PrivacyActivity.kt create mode 100644 app/src/main/java/com/nature/free/test/max/onShowAction.java create mode 100644 app/src/main/res/color/tab_textcolor.xml create mode 100644 app/src/main/res/drawable/back_black.xml create mode 100644 app/src/main/res/drawable/icon_set.xml create mode 100644 app/src/main/res/layout/activity_about.xml create mode 100644 app/src/main/res/layout/activity_privacy.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5260c25..fad449f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -24,8 +24,8 @@ android { applicationId = "com.nature.free.variouswallpaper" minSdk = 23 targetSdk = 34 - versionCode = 5 - versionName = "1.0.4" + versionCode = 6 + versionName = "1.0.5" setProperty( "archivesBaseName", "Various Wallpapers_V" + versionName + "(${versionCode})_$timestamp" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 85ef5a7..be4776a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,8 +18,12 @@ android:supportsRtl="true" android:theme="@style/Theme.MyWallpaper" tools:targetApi="31"> + @@ -31,16 +35,18 @@ android:name=".InfoActivity" android:exported="false" android:screenOrientation="portrait" /> + - - + android:exported="false" + android:launchMode="singleTop"/> \ No newline at end of file diff --git a/app/src/main/assets/VariousWallpapers_PrivacyPolicy.html b/app/src/main/assets/VariousWallpapers_PrivacyPolicy.html new file mode 100644 index 0000000..297569d --- /dev/null +++ b/app/src/main/assets/VariousWallpapers_PrivacyPolicy.html @@ -0,0 +1,71 @@ + + + + + Privacy Policy + + + +

Privacy Policy

+ +

We provides this Privacy Policy to help you understand how we collect, use and disclose information, including what you may provide to us or that we obtain from our products and services. We treat your privacy very seriously. Your privacy is important to us.

+ +

Information Collection and Use

+ +

For a better experience, while using our Service, We may require you to provide us with certain personally identifiable information add whatever else you collect here, e.g. users name, address, location, pictures. The information that We request will be retained on your device and is not collected by us in any way retained by us and used as described in this privacy policy.

+ +

The app does use third-party services that may collect information used to identify you.

+ +

Please refer to the privacy policy of the third-party service provider used by the application:

+
    +
  • Google Play Services
    • +
  • Google Analytics for Firebase
    • +
  • Firebase Crashlytics
    • +
  • Unity
    • +
  • AppLovin
    • +
  • Vungle
    • +
+ +

Log Data

+ +

We want to inform you that whenever you use our Service, in a case of an error in the app We collect data and information (through third-party products) on your phone called Log Data. This Log Data may include information such as your device Internet Protocol (“IP”) address, device name, operating system version, the configuration of the app when utilizing our Service, the time and date of your use of the Service, and other statistics.

+ +

Cookies

+ +

Cookies are files with a small amount of data that are commonly used as anonymous unique identifiers. These are sent to your browser from the websites that you visit and are stored on your device's internal memory. +This Service does not use these “cookies” explicitly. However, the app may use third-party code and libraries that use “cookies” to collect information and improve their services. You have the option to either accept or refuse these cookies and know when a cookie is being sent to your device. If you choose to refuse our cookies, you may not be able to use some portions of this Service.

+ +

Service Providers

+ +

We may employ third-party companies and individuals due to the following reasons:

+ +

To facilitate our Service; +To provide the Service on our behalf;To perform Service-related services; orTo assist us in analyzing how our Service is used. +We want to inform users of this Service that these third parties have access to their Personal Information. The reason is to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose or use the information for any other purpose.

+ +

Security

+ +

We value your trust in providing us your Personal Information, thus we are striving to use commercially acceptable means of protecting it. But remember that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and We cannot guarantee its absolute security.

+ +

Links to Other Sites

+ +

This Service may contain links to other sites. If you click on a third-party link, you will be directed to that site. Note that these external sites are not operated by us. Therefore, We strongly advise you to review the Privacy Policy of these websites. We have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party sites or services.

+ +

Children’s Privacy

+ +

These Services do not address anyone under the age of 13. We do not knowingly collect personally identifiable information from children under 13 years of age. In the case We discover that a child under 13 has provided us with personal information, We immediately delete this from our servers. If you are a parent or guardian and you are aware that your child has provided us with personal information, please contact us so that We will be able to do the necessary actions.

+ +

Changes to This Privacy Policy

+ +

We may update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page.

+ +

PRIVACY QUESTIONS

+ +

We may update Privacy Policy from time to time. When we change the policy in a material way, a notice will be posted on our website along with the updated Privacy Policy.

+ +

If you have any questions or concerns about our Privacy Policy or data processing, please contact us: arbabulfb@gmail.com + + + +.

+ \ No newline at end of file diff --git a/app/src/main/assets/info.json b/app/src/main/assets/info.json index 462ad8c..2a3a596 100644 --- a/app/src/main/assets/info.json +++ b/app/src/main/assets/info.json @@ -7318,7 +7318,7 @@ "source": "https://resource-sg-public.lux-ad.com/wallpaper/0a42a3b35cfb1a570a6fdb97fd20fb47.jpg" } ], - "title": "Editoru0027s Choice" + "title": "Editor‘Choice" }, { "covert": "https://resource-sg-public.lux-ad.com/wallpaper/e65fa87a4a5dcc36b6dd24fe81f1a417.jpg", diff --git a/app/src/main/java/com/nature/free/test/AboutActivity.java b/app/src/main/java/com/nature/free/test/AboutActivity.java new file mode 100644 index 0000000..2ebd22d --- /dev/null +++ b/app/src/main/java/com/nature/free/test/AboutActivity.java @@ -0,0 +1,80 @@ +package com.nature.free.test; + +import android.content.Intent; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.os.Bundle; +import android.view.View; + +import com.nature.free.test.base.BaseActivity; +import com.nature.free.test.databinding.ActivityAboutBinding; +import com.nature.free.test.max.MaxManager; + +public class AboutActivity extends BaseActivity { + + + @Override + protected ActivityAboutBinding getMainBinding() { + return ActivityAboutBinding.inflate(getLayoutInflater()); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + MaxManager.onLoadAd(); + PackageInfo appVersionName = getAppVersionName(); + if (appVersionName != null) { + mainBinding.tvVersion.setText(String.format(getString(R.string.app_version), appVersionName.versionName)); + } else { + mainBinding.tvVersion.setText(String.format(getString(R.string.app_version), "1.0.5")); + } + String format = String.format(getString(R.string.gp), getPackageName()); + mainBinding.back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + mainBinding.tvRate.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse(format)); + startActivity(intent); + + } + }); + + mainBinding.tvPrivacy.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent(AboutActivity.this, PrivacyActivity.class)); + } + }); + mainBinding.tvShare.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + Intent intent = new Intent(Intent.ACTION_SEND); + intent.putExtra(Intent.EXTRA_TEXT, format); + intent.setType("text/plain"); + startActivity(Intent.createChooser(intent, getString(R.string.share_title))); + } + }); + + } + + + private PackageInfo getAppVersionName() { + try { + return getPackageManager().getPackageInfo(getPackageName(), 0); + + } catch (PackageManager.NameNotFoundException exception) { + return null; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nature/free/test/CategoryFragment.java b/app/src/main/java/com/nature/free/test/CategoryFragment.java index eeac02b..48d92c4 100644 --- a/app/src/main/java/com/nature/free/test/CategoryFragment.java +++ b/app/src/main/java/com/nature/free/test/CategoryFragment.java @@ -11,6 +11,7 @@ import com.nature.free.test.data.ClassData_; import com.nature.free.test.data.Wallpaper; import com.nature.free.test.databinding.FragmentCategoryBinding; import com.nature.free.test.databinding.FragmentMainBinding; +import com.nature.free.test.max.MaxManager; import com.nature.free.test.objectbox.ObjectBox; import com.nature.free.test.other.CategoryAdapter; import com.nature.free.test.other.MyAdapter; @@ -52,6 +53,7 @@ public class CategoryFragment extends BaseFragment { mParam1 = getArguments().getString(ARG_PARAM1); mParam2 = getArguments().getString(ARG_PARAM2); } + MaxManager.onLoadAd(); } diff --git a/app/src/main/java/com/nature/free/test/MainActivity.java b/app/src/main/java/com/nature/free/test/MainActivity.java index a21d9bc..e8a9bba 100644 --- a/app/src/main/java/com/nature/free/test/MainActivity.java +++ b/app/src/main/java/com/nature/free/test/MainActivity.java @@ -1,9 +1,11 @@ package com.nature.free.test; +import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; @@ -33,6 +35,14 @@ public class MainActivity extends BaseActivity { initUi(); bindVpTab(); + mainBinding.imSet.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(MainActivity.this, AboutActivity.class); + startActivity(intent); + } + }); + } private void initUi() { @@ -45,11 +55,15 @@ public class MainActivity extends BaseActivity { TabLayout.Tab tab = mainBinding.tab.newTab(); View inflate = LayoutInflater.from(this).inflate(R.layout.tab_item_view, null); ImageView imageViewTab = inflate.findViewById(R.id.tabIm); + TextView textView = inflate.findViewById(R.id.title); if (j == 0) { + textView.setText(getString(R.string.title_recommend)); imageViewTab.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.selector_ichome)); } else if (j == 1) { + textView.setText(getString(R.string.title_category)); imageViewTab.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.selector_iccategory)); } else if (j == 2) { + textView.setText(getString(R.string.title_favorite)); imageViewTab.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.selector_iclove)); } tab.setCustomView(inflate); @@ -72,7 +86,6 @@ public class MainActivity extends BaseActivity { } - private void bindVpTab() { mainBinding.viewP2.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { @Override @@ -87,6 +100,8 @@ public class MainActivity extends BaseActivity { public void onTabSelected(TabLayout.Tab tab) { View customView = tab.getCustomView(); ImageView imageViewTab = customView.findViewById(R.id.tabIm); + TextView textView = customView.findViewById(R.id.title); + textView.setSelected(true); imageViewTab.setSelected(true); int position = tab.getPosition(); mainBinding.viewP2.setCurrentItem(position); @@ -100,6 +115,8 @@ public class MainActivity extends BaseActivity { public void onTabUnselected(TabLayout.Tab tab) { View customView = tab.getCustomView(); ImageView imageViewTab = customView.findViewById(R.id.tabIm); + TextView textView = customView.findViewById(R.id.title); + textView.setSelected(false); imageViewTab.setSelected(false); } diff --git a/app/src/main/java/com/nature/free/test/MainFragment.java b/app/src/main/java/com/nature/free/test/MainFragment.java index 47b1f59..3bf796e 100644 --- a/app/src/main/java/com/nature/free/test/MainFragment.java +++ b/app/src/main/java/com/nature/free/test/MainFragment.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Objects; import io.objectbox.query.Query; +import io.objectbox.relation.ToMany; import kotlin.Unit; import kotlin.jvm.functions.Function0; @@ -67,7 +68,7 @@ public class MainFragment extends BaseFragment { @Override protected void initView() { List info = new ArrayList<>(); - myAdapter = new MyAdapter(requireContext(),love,true); + myAdapter = new MyAdapter(requireContext(), love, true); if (love) { info.addAll(getLoves()); myAdapter.onClickAction(new Function0() { @@ -78,15 +79,10 @@ public class MainFragment extends BaseFragment { } }); } else { - Query newest = ObjectBox.getBoxBeanCategory().query(ClassData_.title.equal("Newest")).build(); - ClassData beans = newest.findFirst(); - newest.close(); - if (beans != null){ - info.addAll(beans.info); - } - + List main = getMain(); + Log.d(MyWallpaper.TAG, "--------main" + main.size()); + info.addAll(main); } - fragmentVb.recycler.setLayoutManager(new GridLayoutManager(requireContext(), 2)); myAdapter.refresh(info); fragmentVb.recycler.setAdapter(myAdapter); @@ -99,20 +95,18 @@ public class MainFragment extends BaseFragment { if (love & myAdapter != null) { myAdapter.refresh(getLoves()); } - if (!love && myAdapter != null) { myAdapter.refresh(getMain()); } } - - private List getMain() { List data = new ArrayList<>(); Query newest = ObjectBox.getBoxBeanCategory().query(ClassData_.title.equal("Newest")).build(); ClassData beans = newest.findFirst(); newest.close(); if (beans != null) { - data.addAll(beans.info); + ToMany list = beans.info; + data.addAll(list.subList(5, 23)); } return data; } @@ -121,20 +115,20 @@ public class MainFragment extends BaseFragment { Query build = ObjectBox.getBoxBean().query(Wallpaper_.love.equal(true)).build(); List wallpapers = build.find(); build.close(); - if(wallpapers.size()>0){ + if (wallpapers.size() > 0) { setEmptyView(true); - }else { + } else { setEmptyView(false); } return wallpapers; } - private void setEmptyView(boolean hasData){ - if(hasData){ + private void setEmptyView(boolean hasData) { + if (hasData) { fragmentVb.emptyTv.setVisibility(View.GONE); fragmentVb.recycler.setVisibility(View.VISIBLE); - }else { + } else { fragmentVb.emptyTv.setVisibility(View.VISIBLE); fragmentVb.recycler.setVisibility(View.GONE); } diff --git a/app/src/main/java/com/nature/free/test/MyWallpaper.kt b/app/src/main/java/com/nature/free/test/MyWallpaper.kt index 137d5e8..60d22c0 100644 --- a/app/src/main/java/com/nature/free/test/MyWallpaper.kt +++ b/app/src/main/java/com/nature/free/test/MyWallpaper.kt @@ -8,6 +8,9 @@ import com.applovin.sdk.AppLovinSdk import com.applovin.sdk.AppLovinSdkInitializationConfiguration import com.nature.free.test.data.ClassData import com.nature.free.test.objectbox.ObjectBox +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch class MyWallpaper : Application() { @@ -48,8 +51,11 @@ class MyWallpaper : Application() { } private fun init() { - val openFile = Utils.openFile(assets.open("info.json")) - data = Utils.getData(openFile) + CoroutineScope(Dispatchers.IO).launch{ + val openFile = Utils.openFile(assets.open("info.json")) + data = Utils.getData(openFile) + } + } diff --git a/app/src/main/java/com/nature/free/test/PrivacyActivity.kt b/app/src/main/java/com/nature/free/test/PrivacyActivity.kt new file mode 100644 index 0000000..5d2f2e8 --- /dev/null +++ b/app/src/main/java/com/nature/free/test/PrivacyActivity.kt @@ -0,0 +1,24 @@ +package com.nature.free.test + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import com.nature.free.test.databinding.ActivityPrivacyBinding +import com.nature.free.test.max.MaxManager + + +class PrivacyActivity : AppCompatActivity() { + + private lateinit var vb: ActivityPrivacyBinding + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + vb = ActivityPrivacyBinding.inflate(layoutInflater) + MaxManager.onLoadAd() + setContentView(vb.root) + vb.webView.loadUrl("file:///android_asset/VariousWallpapers_PrivacyPolicy.html") + vb.back.setOnClickListener { + finish() + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/nature/free/test/WallPaperActivity.java b/app/src/main/java/com/nature/free/test/WallPaperActivity.java index ab54232..ddcc545 100644 --- a/app/src/main/java/com/nature/free/test/WallPaperActivity.java +++ b/app/src/main/java/com/nature/free/test/WallPaperActivity.java @@ -30,6 +30,7 @@ import com.nature.free.test.data.Wallpaper_; import com.nature.free.test.databinding.ActivityWallpaperBinding; import com.nature.free.test.max.MaxManager; import com.nature.free.test.max.onAdStatusListener; +import com.nature.free.test.max.onShowAction; import com.nature.free.test.objectbox.ObjectBox; import com.nature.free.test.other.DialogSet; @@ -135,19 +136,13 @@ public class WallPaperActivity extends BaseActivity im } private void apply(int which) { - MaxManager.ShowAd(WallPaperActivity.this, new onAdStatusListener() { - @Override - public void onAdStatus(int type) { - if (type == MaxManager.type_show_close || type == MaxManager.type_show_fail || type == MaxManager.type_no_cache) { - mainBinding.load.setVisibility(View.VISIBLE); - if (mainBinding.check1.isSelected()) { - setmWallpaper(which, mBitmapPro1); - } else if (mainBinding.check2.isSelected()) { - setmWallpaper(which, mBitmapSource); - } - } - } - }); + + mainBinding.load.setVisibility(View.VISIBLE); + if (mainBinding.check1.isSelected()) { + setmWallpaper(which, mBitmapPro1); + } else if (mainBinding.check2.isSelected()) { + setmWallpaper(which, mBitmapSource); + } } @@ -302,7 +297,12 @@ public class WallPaperActivity extends BaseActivity im public void onClick(View v) { if (v.equals(mainBinding.back)) { if (isMainEnter) { - showMaxAd(); + showMaxAd(new onShowAction() { + @Override + public void doAction() { + finish(); + } + }); } else { finish(); } @@ -316,15 +316,27 @@ public class WallPaperActivity extends BaseActivity im } } else if (v.equals(mainBinding.save)) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - save(); - } else { - permission = new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; - ActivityCompat.requestPermissions(this, permission, 0); - } + showMaxAd(new onShowAction() { + @Override + public void doAction() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + save(); + } else { + permission = new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; + ActivityCompat.requestPermissions(WallPaperActivity.this, permission, 0); + } + } + }); } else if (v.equals(mainBinding.setWallpaper)) { - showDialog(); + + showMaxAd(new onShowAction() { + @Override + public void doAction() { + showDialog(); + } + }); + } else if (v.equals(mainBinding.love)) { mainBinding.love.setSelected(!mainBinding.love.isSelected()); mWallpaper.setLove(mainBinding.love.isSelected()); @@ -369,12 +381,12 @@ public class WallPaperActivity extends BaseActivity im mainBinding.load.setVisibility(View.GONE); } - private void showMaxAd() { + private void showMaxAd(onShowAction action) { MaxManager.ShowAd(WallPaperActivity.this, new onAdStatusListener() { @Override public void onAdStatus(int type) { if (type == MaxManager.type_show_close || type == MaxManager.type_show_fail || type == MaxManager.type_no_cache) { - finish(); + action.doAction(); } } }); diff --git a/app/src/main/java/com/nature/free/test/max/MaxManager.java b/app/src/main/java/com/nature/free/test/max/MaxManager.java index b60c889..f5e83e2 100644 --- a/app/src/main/java/com/nature/free/test/max/MaxManager.java +++ b/app/src/main/java/com/nature/free/test/max/MaxManager.java @@ -124,7 +124,7 @@ public class MaxManager { @Override public void onAdLoadFailed(@NonNull String s, @NonNull MaxError maxError) { - + Log.d(MyWallpaper.TAG, "-------onAdLoadFailed-----s="+s+"---maxError="+maxError.getMessage()); } @Override @@ -162,4 +162,5 @@ public class MaxManager { } + } diff --git a/app/src/main/java/com/nature/free/test/max/onShowAction.java b/app/src/main/java/com/nature/free/test/max/onShowAction.java new file mode 100644 index 0000000..2917a3e --- /dev/null +++ b/app/src/main/java/com/nature/free/test/max/onShowAction.java @@ -0,0 +1,6 @@ +package com.nature.free.test.max; + +public interface onShowAction { + + void doAction(); +} diff --git a/app/src/main/java/com/nature/free/test/other/MyAdapter.kt b/app/src/main/java/com/nature/free/test/other/MyAdapter.kt index 73247ff..f8a9537 100644 --- a/app/src/main/java/com/nature/free/test/other/MyAdapter.kt +++ b/app/src/main/java/com/nature/free/test/other/MyAdapter.kt @@ -66,9 +66,7 @@ class MyAdapter constructor(private var context: Context, private var mLove: Boo holder.vb.loveItem.isVisible = false } - val mD5Hash = Utils.getMD5Hash(wallpaper.preview) - val realUrl = Utils.getRealUrl(wallpaper.preview) var url = wallpaper.preview Glide.with(context).load(url) diff --git a/app/src/main/res/color/tab_textcolor.xml b/app/src/main/res/color/tab_textcolor.xml new file mode 100644 index 0000000..be6254f --- /dev/null +++ b/app/src/main/res/color/tab_textcolor.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/back_black.xml b/app/src/main/res/drawable/back_black.xml new file mode 100644 index 0000000..26dc2bd --- /dev/null +++ b/app/src/main/res/drawable/back_black.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml index a6380c2..4653621 100644 --- a/app/src/main/res/drawable/ic_download.xml +++ b/app/src/main/res/drawable/ic_download.xml @@ -1,9 +1,9 @@ + android:width="32dp" + android:height="32dp" + android:viewportWidth="32" + android:viewportHeight="32"> diff --git a/app/src/main/res/drawable/ic_set_wallpaper.xml b/app/src/main/res/drawable/ic_set_wallpaper.xml index aec682e..505ef93 100644 --- a/app/src/main/res/drawable/ic_set_wallpaper.xml +++ b/app/src/main/res/drawable/ic_set_wallpaper.xml @@ -1,9 +1,12 @@ + android:width="32dp" + android:height="32dp" + android:viewportWidth="32" + android:viewportHeight="32"> + diff --git a/app/src/main/res/drawable/icon_set.xml b/app/src/main/res/drawable/icon_set.xml new file mode 100644 index 0000000..562e3ad --- /dev/null +++ b/app/src/main/res/drawable/icon_set.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/love.xml b/app/src/main/res/drawable/love.xml index e60d1a0..f38f058 100644 --- a/app/src/main/res/drawable/love.xml +++ b/app/src/main/res/drawable/love.xml @@ -1,9 +1,10 @@ + android:width="32dp" + android:height="32dp" + android:viewportWidth="32" + android:viewportHeight="32"> + android:pathData="M11.968,6.144C12.505,6.275 13.027,6.47 13.521,6.727C14.51,7.24 15.36,7.984 16,8.895C16,8.895 16,8.895 16,8.895C15.812,8.627 15.605,8.374 15.382,8.136C14.848,7.566 14.219,7.089 13.521,6.727C13.027,6.47 12.505,6.275 11.968,6.144ZM23.077,6.087C26.24,6.735 28.619,9.533 28.619,12.887C28.619,19.827 20.416,26.137 16,27.604C16,27.604 16,27.604 16,27.604C20.417,26.137 28.619,19.827 28.619,12.887C28.619,9.533 26.24,6.735 23.077,6.087ZM13.957,5.887C14.719,6.282 15.409,6.798 16.001,7.413L10.321,5C11.587,4.999 12.834,5.303 13.957,5.887ZM21.678,5C19.448,5 17.434,5.926 16.001,7.413L10.321,5C5.965,5 2.435,8.531 2.435,12.887C2.435,16.721 4.685,20.26 7.362,22.964C10.048,25.676 13.326,27.713 15.701,28.502C15.895,28.567 16.105,28.567 16.298,28.502C18.674,27.713 21.952,25.676 24.638,22.964C27.315,20.26 29.565,16.721 29.565,12.887C29.565,8.531 26.034,5 21.678,5Z" + android:fillColor="#717171" + android:fillType="evenOdd"/> diff --git a/app/src/main/res/drawable/love_red.xml b/app/src/main/res/drawable/love_red.xml index be9395a..02c6094 100644 --- a/app/src/main/res/drawable/love_red.xml +++ b/app/src/main/res/drawable/love_red.xml @@ -1,9 +1,10 @@ + android:width="32dp" + android:height="32dp" + android:viewportWidth="32" + android:viewportHeight="32"> + android:pathData="M13.842,5.27C14.647,5.688 15.375,6.234 16.001,6.883L10,4.333C11.337,4.332 12.655,4.654 13.842,5.27ZM22,4.333C19.644,4.333 17.515,5.312 16.001,6.883L9.999,4.333C5.397,4.334 1.666,8.065 1.666,12.667C1.666,16.717 4.044,20.458 6.873,23.314C9.711,26.18 13.174,28.332 15.684,29.166C15.889,29.234 16.111,29.234 16.315,29.166C18.825,28.332 22.289,26.18 25.127,23.314C27.955,20.458 30.333,16.717 30.333,12.667C30.333,8.064 26.602,4.333 22,4.333Z" + android:fillColor="#D81E06" + android:fillType="evenOdd"/> diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..1e6ec2a --- /dev/null +++ b/app/src/main/res/layout/activity_about.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f33d036..257484d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,16 +12,28 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" - android:padding="10dp" + android:layout_alignTop="@id/imSet" + android:layout_alignBottom="@id/imSet" + android:gravity="center" android:text="@string/app_name" android:textColor="@color/text_color" android:textSize="17sp" /> + + diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml new file mode 100644 index 0000000..7a26935 --- /dev/null +++ b/app/src/main/res/layout/activity_privacy.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_item_view.xml b/app/src/main/res/layout/tab_item_view.xml index 0b758aa..6079c79 100644 --- a/app/src/main/res/layout/tab_item_view.xml +++ b/app/src/main/res/layout/tab_item_view.xml @@ -2,6 +2,7 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 693e75d..6f0ba2a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,4 +12,5 @@ #babcbd #30a92d #00ffffff + #2C888887 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ccc6c1e..d4a3e08 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,4 +13,13 @@ Failed to save the album, please try again! Loading failed, please try again! Loading, please wait + V%s + Rate Us + Privacy Policy + Share + https://play.google.com/store/apps/details?id=%s + Share To + Category + Recommendation + Favorite \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 020b2fb..bd23243 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -7,7 +7,12 @@ + + \ No newline at end of file