From d60b36f51e9b0b11cc0937a60fc8419e3e27c8e4 Mon Sep 17 00:00:00 2001
From: LUX-Timber <timberkitowang@gmail.com>
Date: Mon, 22 Apr 2024 18:08:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E4=BA=86=20SmartRefresh?=
 =?UTF-8?q?Layout=20=E7=9A=84=E9=A1=B6=E9=83=A8=E8=BE=B9=E8=B7=9D=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E4=BA=86=E5=A3=81=E7=BA=B8=E3=80=82?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=EF=BC=8C=E5=88=9B=E5=BB=BA=E4=BA=86=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E8=AF=A6=E6=83=85=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mylivewallpaper/data/WallpaperViewModel.kt |  5 ++---
 .../ui/activity/DetailActivity.kt              | 18 ++++++++++++++++++
 .../ui/fragment/HomeFragment.kt                |  1 +
 app/src/main/res/layout/activity_details.xml   |  6 ++++++
 app/src/main/res/layout/fragment_home.xml      |  4 ++--
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/DetailActivity.kt
 create mode 100644 app/src/main/res/layout/activity_details.xml

diff --git a/app/src/main/java/com/timber/soft/mylivewallpaper/data/WallpaperViewModel.kt b/app/src/main/java/com/timber/soft/mylivewallpaper/data/WallpaperViewModel.kt
index 740cd0f..ef767be 100644
--- a/app/src/main/java/com/timber/soft/mylivewallpaper/data/WallpaperViewModel.kt
+++ b/app/src/main/java/com/timber/soft/mylivewallpaper/data/WallpaperViewModel.kt
@@ -2,7 +2,6 @@ package com.timber.soft.mylivewallpaper.data
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.timber.soft.mylivewallpaper.tools.AppTools
 import com.timber.soft.mylivewallpaper.tools.AppTools.parseJsonFile
 import com.timber.soft.mylivewallpaper.tools.MyApplication
 import java.util.concurrent.atomic.AtomicBoolean
@@ -27,7 +26,7 @@ class WallpaperViewModel : ViewModel() {
             wallpaperDataList.clear()
             wallpaperPoolsList.clear()
             wallpaperPoolsList.addAll(getDataList())
-            val list = wallpaperPoolsList.subList(0, 40)
+            val list = wallpaperPoolsList.subList(0, 40).map { it }
             wallpaperDataList.addAll(list)
             wallpaperPoolsList.removeAll(list)
         } catch (e: Exception) {
@@ -44,7 +43,7 @@ class WallpaperViewModel : ViewModel() {
         }
         try {
             isLoading.set(true)
-            val list = wallpaperPoolsList.subList(0, 20)
+            val list = wallpaperPoolsList.subList(0, 20).map { it }
             wallpaperDataList.addAll(list)
             wallpaperPoolsList.removeAll(list)
         } catch (e: Exception) {
diff --git a/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/DetailActivity.kt b/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/DetailActivity.kt
new file mode 100644
index 0000000..d591c0f
--- /dev/null
+++ b/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/DetailActivity.kt
@@ -0,0 +1,18 @@
+package com.timber.soft.mylivewallpaper.ui.activity
+
+import android.view.View
+import com.timber.soft.mylivewallpaper.databinding.ActivityDetailsBinding
+
+class DetailActivity : BaseActivity() {
+
+    private lateinit var binding: ActivityDetailsBinding
+    override fun getActivityContentView(): View {
+        binding = ActivityDetailsBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun initViews() {
+        super.initViews()
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/timber/soft/mylivewallpaper/ui/fragment/HomeFragment.kt b/app/src/main/java/com/timber/soft/mylivewallpaper/ui/fragment/HomeFragment.kt
index 2bd8899..0e1798a 100644
--- a/app/src/main/java/com/timber/soft/mylivewallpaper/ui/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/timber/soft/mylivewallpaper/ui/fragment/HomeFragment.kt
@@ -62,6 +62,7 @@ class HomeFragment : BaseFragment() {
     }
 
     private fun initRecyclerView() {
+        wallpaperViewModel.updateWallpaper()
         homeItemAdapter =
             HomeItemAdapter(requireContext(), wallpaperDataList, object : OnHomeItemClickListener {
                 override fun onItemClick(position: Int, wallpaperData: WallpaperData) {
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/activity_details.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4b44d8b..fdf44a3 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -10,7 +10,8 @@
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
         android:id="@+id/home_refreshLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginTop="40dp">
 
         <com.scwang.smart.refresh.header.MaterialHeader
             android:layout_width="match_parent"
@@ -21,7 +22,6 @@
             android:id="@+id/home_recyclerview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="40dp"
             android:paddingEnd="14dp" />
 
         <com.scwang.smart.refresh.footer.ClassicsFooter