feat:添加了 SmartRefreshLayout 的顶部边距,并更新了壁纸。同时,创建了新的详情活动页面。
This commit is contained in:
parent
9f5c9e4d17
commit
d60b36f51e
@ -2,7 +2,6 @@ package com.timber.soft.mylivewallpaper.data
|
|||||||
|
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
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.AppTools.parseJsonFile
|
||||||
import com.timber.soft.mylivewallpaper.tools.MyApplication
|
import com.timber.soft.mylivewallpaper.tools.MyApplication
|
||||||
import java.util.concurrent.atomic.AtomicBoolean
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
@ -27,7 +26,7 @@ class WallpaperViewModel : ViewModel() {
|
|||||||
wallpaperDataList.clear()
|
wallpaperDataList.clear()
|
||||||
wallpaperPoolsList.clear()
|
wallpaperPoolsList.clear()
|
||||||
wallpaperPoolsList.addAll(getDataList())
|
wallpaperPoolsList.addAll(getDataList())
|
||||||
val list = wallpaperPoolsList.subList(0, 40)
|
val list = wallpaperPoolsList.subList(0, 40).map { it }
|
||||||
wallpaperDataList.addAll(list)
|
wallpaperDataList.addAll(list)
|
||||||
wallpaperPoolsList.removeAll(list)
|
wallpaperPoolsList.removeAll(list)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
@ -44,7 +43,7 @@ class WallpaperViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
isLoading.set(true)
|
isLoading.set(true)
|
||||||
val list = wallpaperPoolsList.subList(0, 20)
|
val list = wallpaperPoolsList.subList(0, 20).map { it }
|
||||||
wallpaperDataList.addAll(list)
|
wallpaperDataList.addAll(list)
|
||||||
wallpaperPoolsList.removeAll(list)
|
wallpaperPoolsList.removeAll(list)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
|
|||||||
@ -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()
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -62,6 +62,7 @@ class HomeFragment : BaseFragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun initRecyclerView() {
|
private fun initRecyclerView() {
|
||||||
|
wallpaperViewModel.updateWallpaper()
|
||||||
homeItemAdapter =
|
homeItemAdapter =
|
||||||
HomeItemAdapter(requireContext(), wallpaperDataList, object : OnHomeItemClickListener {
|
HomeItemAdapter(requireContext(), wallpaperDataList, object : OnHomeItemClickListener {
|
||||||
override fun onItemClick(position: Int, wallpaperData: WallpaperData) {
|
override fun onItemClick(position: Int, wallpaperData: WallpaperData) {
|
||||||
|
|||||||
6
app/src/main/res/layout/activity_details.xml
Normal file
6
app/src/main/res/layout/activity_details.xml
Normal file
@ -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>
|
||||||
@ -10,7 +10,8 @@
|
|||||||
<com.scwang.smart.refresh.layout.SmartRefreshLayout
|
<com.scwang.smart.refresh.layout.SmartRefreshLayout
|
||||||
android:id="@+id/home_refreshLayout"
|
android:id="@+id/home_refreshLayout"
|
||||||
android:layout_width="match_parent"
|
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
|
<com.scwang.smart.refresh.header.MaterialHeader
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -21,7 +22,6 @@
|
|||||||
android:id="@+id/home_recyclerview"
|
android:id="@+id/home_recyclerview"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginTop="40dp"
|
|
||||||
android:paddingEnd="14dp" />
|
android:paddingEnd="14dp" />
|
||||||
|
|
||||||
<com.scwang.smart.refresh.footer.ClassicsFooter
|
<com.scwang.smart.refresh.footer.ClassicsFooter
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user