From 8eadd20968bc3b163455d942d2e1d686eb1326bc Mon Sep 17 00:00:00 2001 From: aayush262 <99584765+aayush2622@users.noreply.github.com> Date: Thu, 18 Jan 2024 15:04:29 +0530 Subject: [PATCH] lil tweaks (#140) --- .../download/anime/OfflineAnimeFragment.kt | 38 ++++++--------- .../download/manga/OfflineMangaFragment.kt | 46 +++++++------------ app/src/main/res/layout/dialog_layout.xml | 19 ++++---- app/src/main/res/values/colors.xml | 16 +++---- 4 files changed, 49 insertions(+), 70 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeFragment.kt b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeFragment.kt index aab1aa5f..fa6fdfa1 100644 --- a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeFragment.kt +++ b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeFragment.kt @@ -69,6 +69,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener { private var downloads: List = listOf() private lateinit var gridView: GridView private lateinit var adapter: OfflineAnimeAdapter + private lateinit var total : TextView private var uiSettings: UserInterfaceSettings = loadData("ui_settings") ?: UserInterfaceSettings() @@ -142,9 +143,6 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener { ?.putInt("offline_view", style!!)?.apply() gridView.visibility = View.GONE gridView = view.findViewById(R.id.gridView) - gridView.adapter = adapter - gridView.scheduleLayoutAnimation() - gridView.visibility = View.VISIBLE adapter.notifyNewGrid() grid() } @@ -156,37 +154,30 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener { ?.putInt("offline_view", style!!)?.apply() gridView.visibility = View.GONE gridView = view.findViewById(R.id.gridView1) - gridView.adapter = adapter - gridView.scheduleLayoutAnimation() - gridView.visibility = View.VISIBLE adapter.notifyNewGrid() grid() } - gridView = - if (style == 0) view.findViewById(R.id.gridView) else view.findViewById(R.id.gridView1) - gridView.visibility = View.VISIBLE - getDownloads() - val fadeIn = AlphaAnimation(0f, 1f) - fadeIn.duration = 200 // animations pog - val animation = LayoutAnimationController(fadeIn) - gridView.layoutAnimation = animation - adapter = OfflineAnimeAdapter(requireContext(), downloads, this) - gridView.adapter = adapter - gridView.scheduleLayoutAnimation() + gridView = if (style == 0) view.findViewById(R.id.gridView) else view.findViewById(R.id.gridView1) + total = view.findViewById(R.id.total) grid() - val total = view.findViewById(R.id.total) - total.text = if (gridView.count > 0) "Anime (${gridView.count})" else "Empty List" - return view } @OptIn(UnstableApi::class) private fun grid() { - gridView.setOnItemClickListener { parent, view, position, id -> + gridView.visibility = View.VISIBLE + getDownloads() + val fadeIn = AlphaAnimation(0f, 1f) + fadeIn.duration = 300 // animations pog + gridView.layoutAnimation = LayoutAnimationController(fadeIn) + adapter = OfflineAnimeAdapter(requireContext(), downloads, this) + gridView.adapter = adapter + gridView.scheduleLayoutAnimation() + total.text = if (gridView.count > 0) "Anime (${gridView.count})" else "Empty List" + gridView.setOnItemClickListener { _, _, position, _ -> // Get the OfflineAnimeModel that was clicked val item = adapter.getItem(position) as OfflineAnimeModel - val downloads = downloadManager.animeDownloadedTypes val media = downloadManager.animeDownloadedTypes.firstOrNull { it.title == item.title } media?.let { @@ -204,7 +195,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener { snackString("no media found") } } - gridView.setOnItemLongClickListener { parent, view, position, id -> + gridView.setOnItemLongClickListener { _, _, position, _ -> // Get the OfflineAnimeModel that was clicked val item = adapter.getItem(position) as OfflineAnimeModel val type: DownloadedType.Type = @@ -231,6 +222,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener { } getDownloads() adapter.setItems(downloads) + total.text = if (gridView.count > 0) "Anime (${gridView.count})" else "Empty List" } builder.setNegativeButton("No") { _, _ -> // Do nothing diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt index ba3a3a1d..3c06adbb 100644 --- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt +++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt @@ -62,6 +62,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener { private var downloads: List = listOf() private lateinit var gridView: GridView private lateinit var adapter: OfflineMangaAdapter + private lateinit var total : TextView private var uiSettings: UserInterfaceSettings = loadData("ui_settings") ?: UserInterfaceSettings() @@ -131,13 +132,9 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener { layoutList.setOnClickListener { selected(it as ImageView) style = 0 - context?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)?.edit() - ?.putInt("offline_view", style!!)?.apply() + requireContext().getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putInt("offline_view", style!!).apply() gridView.visibility = View.GONE gridView = view.findViewById(R.id.gridView) - gridView.adapter = adapter - gridView.scheduleLayoutAnimation() - gridView.visibility = View.VISIBLE adapter.notifyNewGrid() grid() @@ -146,39 +143,29 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener { layoutcompact.setOnClickListener { selected(it as ImageView) style = 1 - context?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)?.edit() - ?.putInt("offline_view", style!!)?.apply() + requireContext().getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putInt("offline_view", style!!).apply() gridView.visibility = View.GONE gridView = view.findViewById(R.id.gridView1) - gridView.adapter = adapter - gridView.scheduleLayoutAnimation() - gridView.visibility = View.VISIBLE adapter.notifyNewGrid() grid() } - gridView = - if (style == 0) view.findViewById(R.id.gridView) else view.findViewById(R.id.gridView1) - gridView.visibility = View.VISIBLE - getDownloads() - - val fadeIn = AlphaAnimation(0f, 1f) - fadeIn.duration = 200 // animations pog - val animation = LayoutAnimationController(fadeIn) - - gridView.layoutAnimation = animation - adapter = OfflineMangaAdapter(requireContext(), downloads, this) - gridView.adapter = adapter - gridView.scheduleLayoutAnimation() + gridView = if (style == 0) view.findViewById(R.id.gridView) else view.findViewById(R.id.gridView1) + total = view.findViewById(R.id.total) grid() - val total = view.findViewById(R.id.total) - total.text = - if (gridView.count > 0) "Manga and Novels (${gridView.count})" else "Empty List" - return view } private fun grid() { - gridView.setOnItemClickListener { parent, view, position, id -> + gridView.visibility = View.VISIBLE + getDownloads() + val fadeIn = AlphaAnimation(0f, 1f) + fadeIn.duration = 300 // animations pog + gridView.layoutAnimation = LayoutAnimationController(fadeIn) + adapter = OfflineMangaAdapter(requireContext(), downloads, this) + gridView.adapter = adapter + gridView.scheduleLayoutAnimation() + total.text = if (gridView.count > 0) "Manga and Novels (${gridView.count})" else "Empty List" + gridView.setOnItemClickListener { _, _, position, _ -> // Get the OfflineMangaModel that was clicked val item = adapter.getItem(position) as OfflineMangaModel val media = @@ -195,7 +182,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener { } } - gridView.setOnItemLongClickListener { parent, view, position, id -> + gridView.setOnItemLongClickListener { _, _, position, _ -> // Get the OfflineMangaModel that was clicked val item = adapter.getItem(position) as OfflineMangaModel val type: DownloadedType.Type = @@ -213,6 +200,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener { downloadManager.removeMedia(item.title, type) getDownloads() adapter.setItems(downloads) + total.text = if (gridView.count > 0) "Manga and Novels (${gridView.count})" else "Empty List" } builder.setNegativeButton("No") { _, _ -> // Do nothing diff --git a/app/src/main/res/layout/dialog_layout.xml b/app/src/main/res/layout/dialog_layout.xml index e90ac449..06f9469b 100644 --- a/app/src/main/res/layout/dialog_layout.xml +++ b/app/src/main/res/layout/dialog_layout.xml @@ -275,22 +275,21 @@ - + - - + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ab98deb3..8b384ed8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -304,10 +304,10 @@ #00FF00 #00FF00 #00FF00 - #00FF00 - #00FF00 - #00FF00 - #00FF00 + #BA1A1A + #FFDAD6 + #FFFFFF + #410002 #EEEEEE #000000 #EEEEEE @@ -338,10 +338,10 @@ #00FF00 #00FF00 #00FF00 - #00FF00 - #00FF00 - #00FF00 - #00FF00 + #FFB4AB + #93000A + #690005 + #FFDAD6 #1C1B1E #EEEEEE #1C1B20