From 6914e9500adeca55afedbd7ffa98ed4919ee264c Mon Sep 17 00:00:00 2001 From: Bnyro Date: Mon, 15 Aug 2022 09:59:48 +0200 Subject: [PATCH] layout improvements --- .../java/com/github/libretube/api/ResettableLazy.kt | 2 +- .../github/libretube/dialogs/AddToPlaylistDialog.kt | 3 ++- .../github/libretube/fragments/LibraryFragment.kt | 7 ++++--- .../github/libretube/fragments/PlayerFragment.kt | 2 +- app/src/main/res/layout/channel_row.xml | 6 +----- .../main/res/layout/channel_subscription_row.xml | 8 +++----- app/src/main/res/layout/fragment_search_result.xml | 2 +- app/src/main/res/layout/fragment_watch_history.xml | 1 - app/src/main/res/layout/playlist_row.xml | 7 +------ app/src/main/res/layout/playlist_search_row.xml | 5 +---- app/src/main/res/layout/playlists_row.xml | 6 +----- app/src/main/res/layout/video_row.xml | 6 +----- app/src/main/res/layout/watch_history_row.xml | 6 +----- app/src/main/res/values/style.xml | 13 +++++++++++++ 14 files changed, 31 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/github/libretube/api/ResettableLazy.kt b/app/src/main/java/com/github/libretube/api/ResettableLazy.kt index 129e27de6..432dff009 100644 --- a/app/src/main/java/com/github/libretube/api/ResettableLazy.kt +++ b/app/src/main/java/com/github/libretube/api/ResettableLazy.kt @@ -1,7 +1,7 @@ package com.github.libretube.util -import java.util.* import kotlin.reflect.KProperty +import java.util.* class ResettableLazyManager { // we synchronize to make sure the timing of a reset() call and new inits do not collide diff --git a/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt index 6d840997e..29511a227 100644 --- a/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt @@ -72,7 +72,8 @@ class AddToPlaylistDialog : DialogFragment() { if (viewModel.lastSelectedPlaylistId != null) { var selectionIndex = 0 response.forEachIndexed { index, playlist -> - if (playlist.id == viewModel.lastSelectedPlaylistId) selectionIndex = index + if (playlist.id == viewModel.lastSelectedPlaylistId) selectionIndex = + index } binding.playlistsSpinner.setSelection(selectionIndex) } diff --git a/app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt b/app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt index 8df79aa2f..0db99547b 100644 --- a/app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt @@ -68,8 +68,12 @@ class LibraryFragment : BaseFragment() { } if (token != "") { + binding.boogh.setImageResource(R.drawable.ic_list) + binding.textLike.text = getString(R.string.emptyList) + binding.loginOrRegister.visibility = View.GONE fetchPlaylists() + binding.playlistRefresh.isEnabled = true binding.playlistRefresh.setOnRefreshListener { fetchPlaylists() @@ -123,7 +127,6 @@ class LibraryFragment : BaseFragment() { playlistsAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() { override fun onChanged() { - Log.e(TAG(), playlistsAdapter.itemCount.toString()) if (playlistsAdapter.itemCount == 0) { binding.loginOrRegister.visibility = View.VISIBLE } @@ -135,8 +138,6 @@ class LibraryFragment : BaseFragment() { } else { runOnUiThread { binding.loginOrRegister.visibility = View.VISIBLE - binding.boogh.setImageResource(R.drawable.ic_list) - binding.textLike.text = getString(R.string.emptyList) } } } diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt index 95fdbb90b..bd3dc3f4f 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -95,6 +95,7 @@ import com.google.android.exoplayer2.upstream.DefaultHttpDataSource import com.google.android.exoplayer2.util.RepeatModeUtil import com.google.android.exoplayer2.video.VideoSize import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlin.math.abs import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -102,7 +103,6 @@ import org.chromium.net.CronetEngine import retrofit2.HttpException import java.io.IOException import java.util.concurrent.Executors -import kotlin.math.abs class PlayerFragment : BaseFragment() { diff --git a/app/src/main/res/layout/channel_row.xml b/app/src/main/res/layout/channel_row.xml index 702c892d0..72e496255 100644 --- a/app/src/main/res/layout/channel_row.xml +++ b/app/src/main/res/layout/channel_row.xml @@ -1,11 +1,7 @@ + style="@style/ItemRow"> + android:background="?android:attr/selectableItemBackground" + android:paddingHorizontal="8dp" + android:paddingVertical="4dp"> + android:layout_marginVertical="10dp" /> diff --git a/app/src/main/res/layout/fragment_watch_history.xml b/app/src/main/res/layout/fragment_watch_history.xml index da62ec3cc..8efd89276 100644 --- a/app/src/main/res/layout/fragment_watch_history.xml +++ b/app/src/main/res/layout/fragment_watch_history.xml @@ -30,7 +30,6 @@ android:id="@+id/watchHistoryRecView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" android:nestedScrollingEnabled="false" android:visibility="gone" /> diff --git a/app/src/main/res/layout/playlist_row.xml b/app/src/main/res/layout/playlist_row.xml index 9a69f8594..8b3374adf 100644 --- a/app/src/main/res/layout/playlist_row.xml +++ b/app/src/main/res/layout/playlist_row.xml @@ -2,12 +2,7 @@ + style="@style/ItemRow"> + style="@style/ItemRow"> + style="@style/ItemRow"> + style="@style/ItemRow"> + style="@style/ItemRow"> + + \ No newline at end of file