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 @@ + + + + \ 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 @@ + android:layout_height="match_parent" + android:layout_marginTop="40dp">