From ced16b234de28d3763aa52e9908652e86b3d7228 Mon Sep 17 00:00:00 2001 From: deniscerri <64997243+deniscerri@users.noreply.github.com> Date: Mon, 15 May 2023 20:26:31 +0200 Subject: [PATCH] random fixes Fixed tablet ui made it appear on 600dpi and up and other tablet touchups Fixed trending videos showing up when u try to update quick download item Fixed json being unclikckable on old models when trying to restore. Now all files are clickable. U will just get a snackbar showing that it couldn't parse the file if its not correct --- app/src/main/AndroidManifest.xml | 1 - .../java/com/deniscerri/ytdlnis/ui/HomeFragment.kt | 11 ++++++----- .../ytdlnis/ui/downloads/ActiveDownloadsFragment.kt | 12 +----------- .../ui/downloads/CancelledDownloadsFragment.kt | 11 +---------- .../ytdlnis/ui/downloads/ErroredDownloadsFragment.kt | 12 +----------- .../ytdlnis/ui/downloads/HistoryFragment.kt | 12 +----------- .../ytdlnis/ui/downloads/QueuedDownloadsFragment.kt | 12 +----------- .../ytdlnis/ui/more/settings/MainSettingsFragment.kt | 2 +- .../activity_main.xml | 0 .../fragment_home.xml | 0 .../activity_main.xml | 0 .../fragment_home.xml | 0 .../fragment_home.xml | 3 ++- .../res/{values-sw800dp => values-sw600dp}/attrs.xml | 1 + app/src/main/res/values-sw800dp-land/attrs.xml | 4 ++++ app/src/main/res/values-sw950dp-land/attrs.xml | 4 ++++ app/src/main/res/values/attrs.xml | 1 + 17 files changed, 24 insertions(+), 62 deletions(-) rename app/src/main/res/{layout-sw800dp-land => layout-sw600dp-land}/activity_main.xml (100%) rename app/src/main/res/{layout-sw800dp-land => layout-sw600dp-land}/fragment_home.xml (100%) rename app/src/main/res/{layout-sw650dp => layout-sw600dp}/activity_main.xml (100%) rename app/src/main/res/{layout-sw650dp => layout-sw600dp}/fragment_home.xml (100%) rename app/src/main/res/{layout-sw1600dp-land => layout-sw950dp-land}/fragment_home.xml (99%) rename app/src/main/res/{values-sw800dp => values-sw600dp}/attrs.xml (59%) create mode 100644 app/src/main/res/values-sw800dp-land/attrs.xml create mode 100644 app/src/main/res/values-sw950dp-land/attrs.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ac481139..61ff6b25 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -109,7 +109,6 @@ android:parentActivityName=".MainActivity"> - diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt index e5296db2..39cb10c5 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt @@ -141,9 +141,7 @@ class HomeFragment : Fragment(), HomeAdapter.OnItemClickListener, OnClickListene requireActivity() ) recyclerView = view.findViewById(R.id.recyclerViewHome) - if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE && ! resources.getBoolean(R.bool.isTablet)){ - recyclerView?.layoutManager = GridLayoutManager(context, 2) - } + recyclerView?.layoutManager = GridLayoutManager(context, resources.getInteger(R.integer.grid_size)) recyclerView?.adapter = homeAdapter resultViewModel = ViewModelProvider(this)[ResultViewModel::class.java] @@ -195,7 +193,6 @@ class HomeFragment : Fragment(), HomeAdapter.OnItemClickListener, OnClickListene if (arguments?.getString("url") != null){ val url = requireArguments().getString("url") - arguments?.remove("url") if (inputQueries == null) inputQueries = mutableListOf() searchBar?.text = url inputQueries!!.add(url!!) @@ -221,7 +218,11 @@ class HomeFragment : Fragment(), HomeAdapter.OnItemClickListener, OnClickListene override fun onResume() { super.onResume() - resultViewModel.checkTrending() + if(arguments?.getString("url") == null){ + resultViewModel.checkTrending() + }else{ + arguments?.remove("url") + } if (searchView?.currentTransitionState == SearchView.TransitionState.SHOWN){ updateSearchViewItems(searchView?.editText?.text, linkYouCopied) } diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt index 50fb6ee4..faffb54f 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt @@ -67,17 +67,7 @@ class ActiveDownloadsFragment() : Fragment(), ActiveDownloadAdapter.OnItemClickL activeRecyclerView = view.findViewById(R.id.download_recyclerview) activeRecyclerView.adapter = activeDownloads - - val landScape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE - val displayMetrics: DisplayMetrics = requireContext().resources.displayMetrics - val dpWidth: Float = displayMetrics.widthPixels / displayMetrics.density - if (dpWidth >= 1600 && landScape) { - activeRecyclerView.layoutManager = GridLayoutManager(context, 4) - }else if (dpWidth > 1200 && landScape){ - activeRecyclerView.layoutManager = GridLayoutManager(context, 3) - }else if (landScape || dpWidth >= 650){ - activeRecyclerView.layoutManager = GridLayoutManager(context, 2) - } + activeRecyclerView.layoutManager = GridLayoutManager(context, resources.getInteger(R.integer.grid_size)) downloadViewModel.activeDownloads.observe(viewLifecycleOwner) { list = it diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt index c1b93bec..5af60b9f 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt @@ -84,17 +84,8 @@ class CancelledDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClic cancelledRecyclerView.adapter = cancelledDownloads val itemTouchHelper = ItemTouchHelper(simpleCallback) itemTouchHelper.attachToRecyclerView(cancelledRecyclerView) + cancelledRecyclerView.layoutManager = GridLayoutManager(context, resources.getInteger(R.integer.grid_size)) - val landScape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE - val displayMetrics: DisplayMetrics = requireContext().resources.displayMetrics - val dpWidth: Float = displayMetrics.widthPixels / displayMetrics.density - if (dpWidth >= 1600 && landScape) { - cancelledRecyclerView.layoutManager = GridLayoutManager(context, 4) - }else if (dpWidth > 1200 && landScape){ - cancelledRecyclerView.layoutManager = GridLayoutManager(context, 3) - }else if (landScape || dpWidth >= 650){ - cancelledRecyclerView.layoutManager = GridLayoutManager(context, 2) - } downloadViewModel.cancelledDownloads.observe(viewLifecycleOwner) { items = it.toMutableList() diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt index 1772ad85..9227f277 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt @@ -86,17 +86,7 @@ class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickL erroredRecyclerView.adapter = erroredDownloads val itemTouchHelper = ItemTouchHelper(simpleCallback) itemTouchHelper.attachToRecyclerView(erroredRecyclerView) - - val landScape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE - val displayMetrics: DisplayMetrics = requireContext().resources.displayMetrics - val dpWidth: Float = displayMetrics.widthPixels / displayMetrics.density - if (dpWidth >= 1600 && landScape) { - erroredRecyclerView.layoutManager = GridLayoutManager(context, 4) - }else if (dpWidth > 1200 && landScape){ - erroredRecyclerView.layoutManager = GridLayoutManager(context, 3) - }else if (landScape || dpWidth >= 650){ - erroredRecyclerView.layoutManager = GridLayoutManager(context, 2) - } + erroredRecyclerView.layoutManager = GridLayoutManager(context, resources.getInteger(R.integer.grid_size)) downloadViewModel.erroredDownloads.observe(viewLifecycleOwner) { items = it.toMutableList() diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt index fd3a2e6c..6b2785be 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt @@ -131,17 +131,7 @@ class HistoryFragment : Fragment(), HistoryAdapter.OnItemClickListener{ recyclerView?.adapter = historyAdapter val itemTouchHelper = ItemTouchHelper(simpleCallback) itemTouchHelper.attachToRecyclerView(recyclerView) - - val landScape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE - val displayMetrics: DisplayMetrics = requireContext().resources.displayMetrics - val dpWidth: Float = displayMetrics.widthPixels / displayMetrics.density - if (dpWidth >= 1600 && landScape) { - recyclerView?.layoutManager = GridLayoutManager(context, 4) - }else if (dpWidth > 1200 && landScape){ - recyclerView?.layoutManager = GridLayoutManager(context, 3) - }else if (landScape || dpWidth >= 650){ - recyclerView?.layoutManager = GridLayoutManager(context, 2) - } + recyclerView?.layoutManager = GridLayoutManager(context, resources.getInteger(R.integer.grid_size)) noResults?.visibility = GONE diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt index 28fbe473..722eba09 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt @@ -88,17 +88,7 @@ class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLi queuedRecyclerView.adapter = queuedDownloads val itemTouchHelper = ItemTouchHelper(simpleCallback) itemTouchHelper.attachToRecyclerView(queuedRecyclerView) - - val landScape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE - val displayMetrics: DisplayMetrics = requireContext().resources.displayMetrics - val dpWidth: Float = displayMetrics.widthPixels / displayMetrics.density - if (dpWidth >= 1600 && landScape) { - queuedRecyclerView.layoutManager = GridLayoutManager(context, 4) - }else if (dpWidth > 1200 && landScape){ - queuedRecyclerView.layoutManager = GridLayoutManager(context, 3) - }else if (landScape || dpWidth >= 650){ - queuedRecyclerView.layoutManager = GridLayoutManager(context, 2) - } + queuedRecyclerView.layoutManager = GridLayoutManager(context, resources.getInteger(R.integer.grid_size)) downloadViewModel.queuedDownloads.observe(viewLifecycleOwner) { items = it.toMutableList() diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/MainSettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/MainSettingsFragment.kt index 5d5ae5ff..8eda9b0b 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/MainSettingsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/MainSettingsFragment.kt @@ -186,7 +186,7 @@ class MainSettingsFragment : PreferenceFragmentCompat() { Preference.OnPreferenceClickListener { val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply { addCategory(Intent.CATEGORY_OPENABLE) - type = "application/json" + type = "*/*" } appRestoreResultLauncher.launch(intent) true diff --git a/app/src/main/res/layout-sw800dp-land/activity_main.xml b/app/src/main/res/layout-sw600dp-land/activity_main.xml similarity index 100% rename from app/src/main/res/layout-sw800dp-land/activity_main.xml rename to app/src/main/res/layout-sw600dp-land/activity_main.xml diff --git a/app/src/main/res/layout-sw800dp-land/fragment_home.xml b/app/src/main/res/layout-sw600dp-land/fragment_home.xml similarity index 100% rename from app/src/main/res/layout-sw800dp-land/fragment_home.xml rename to app/src/main/res/layout-sw600dp-land/fragment_home.xml diff --git a/app/src/main/res/layout-sw650dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml similarity index 100% rename from app/src/main/res/layout-sw650dp/activity_main.xml rename to app/src/main/res/layout-sw600dp/activity_main.xml diff --git a/app/src/main/res/layout-sw650dp/fragment_home.xml b/app/src/main/res/layout-sw600dp/fragment_home.xml similarity index 100% rename from app/src/main/res/layout-sw650dp/fragment_home.xml rename to app/src/main/res/layout-sw600dp/fragment_home.xml diff --git a/app/src/main/res/layout-sw1600dp-land/fragment_home.xml b/app/src/main/res/layout-sw950dp-land/fragment_home.xml similarity index 99% rename from app/src/main/res/layout-sw1600dp-land/fragment_home.xml rename to app/src/main/res/layout-sw950dp-land/fragment_home.xml index 457e1655..4a7fe720 100644 --- a/app/src/main/res/layout-sw1600dp-land/fragment_home.xml +++ b/app/src/main/res/layout-sw950dp-land/fragment_home.xml @@ -157,7 +157,8 @@ + android:layout_height="200dp" + android:baselineAligned="false"> + 2 true \ No newline at end of file diff --git a/app/src/main/res/values-sw800dp-land/attrs.xml b/app/src/main/res/values-sw800dp-land/attrs.xml new file mode 100644 index 00000000..f34467a7 --- /dev/null +++ b/app/src/main/res/values-sw800dp-land/attrs.xml @@ -0,0 +1,4 @@ + + + 3 + \ No newline at end of file diff --git a/app/src/main/res/values-sw950dp-land/attrs.xml b/app/src/main/res/values-sw950dp-land/attrs.xml new file mode 100644 index 00000000..2ab6eb25 --- /dev/null +++ b/app/src/main/res/values-sw950dp-land/attrs.xml @@ -0,0 +1,4 @@ + + + 4 + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 84edc60e..60abc736 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,4 +1,5 @@ + 1 false false \ No newline at end of file