From 5b4102ec57662f43ddece9d2fd63d65a8e37ed72 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sat, 24 Sep 2022 12:34:53 +0200 Subject: [PATCH] move the base views to the UI package --- .../java/com/github/libretube/ui/activities/AboutActivity.kt | 2 +- .../com/github/libretube/ui/activities/CommunityActivity.kt | 2 +- .../java/com/github/libretube/ui/activities/MainActivity.kt | 2 +- .../com/github/libretube/ui/activities/NoInternetActivity.kt | 2 +- .../github/libretube/ui/activities/OfflinePlayerActivity.kt | 2 +- .../java/com/github/libretube/ui/activities/RouterActivity.kt | 2 +- .../com/github/libretube/ui/activities/SettingsActivity.kt | 2 +- .../github/libretube/{extensions => ui/base}/BaseActivity.kt | 2 +- .../github/libretube/{extensions => ui/base}/BaseFragment.kt | 2 +- .../BasePreferenceFragment.kt} | 4 ++-- .../java/com/github/libretube/ui/fragments/ChannelFragment.kt | 2 +- .../com/github/libretube/ui/fragments/DownloadsFragment.kt | 2 +- .../java/com/github/libretube/ui/fragments/HomeFragment.kt | 2 +- .../java/com/github/libretube/ui/fragments/LibraryFragment.kt | 2 +- .../java/com/github/libretube/ui/fragments/PlayerFragment.kt | 2 +- .../com/github/libretube/ui/fragments/PlaylistFragment.kt | 2 +- .../java/com/github/libretube/ui/fragments/SearchFragment.kt | 2 +- .../com/github/libretube/ui/fragments/SearchResultFragment.kt | 2 +- .../github/libretube/ui/fragments/SubscriptionsFragment.kt | 2 +- .../com/github/libretube/ui/fragments/WatchHistoryFragment.kt | 2 +- .../com/github/libretube/ui/preferences/AdvancedSettings.kt | 4 ++-- .../com/github/libretube/ui/preferences/AppearanceSettings.kt | 4 ++-- .../com/github/libretube/ui/preferences/AudioVideoSettings.kt | 4 ++-- .../com/github/libretube/ui/preferences/GeneralSettings.kt | 4 ++-- .../com/github/libretube/ui/preferences/HistorySettings.kt | 4 ++-- .../com/github/libretube/ui/preferences/InstanceSettings.kt | 4 ++-- .../java/com/github/libretube/ui/preferences/MainSettings.kt | 4 ++-- .../github/libretube/ui/preferences/NotificationSettings.kt | 4 ++-- .../com/github/libretube/ui/preferences/PlayerSettings.kt | 4 ++-- .../github/libretube/ui/preferences/SponsorBlockSettings.kt | 4 ++-- .../libretube/{extensions => ui/views}/SliderPreference.kt | 3 ++- app/src/main/res/xml/audio_video_settings.xml | 2 +- app/src/main/res/xml/player_settings.xml | 2 +- 33 files changed, 45 insertions(+), 44 deletions(-) rename app/src/main/java/com/github/libretube/{extensions => ui/base}/BaseActivity.kt (93%) rename app/src/main/java/com/github/libretube/{extensions => ui/base}/BaseFragment.kt (85%) rename app/src/main/java/com/github/libretube/ui/{views/MaterialPreferenceFragment.kt => base/BasePreferenceFragment.kt} (96%) rename app/src/main/java/com/github/libretube/{extensions => ui/views}/SliderPreference.kt (94%) diff --git a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt index 3ec3a12b7..ebd4e9198 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt @@ -16,8 +16,8 @@ import com.github.libretube.constants.PIPED_GITHUB_URL import com.github.libretube.constants.WEBLATE_URL import com.github.libretube.constants.WEBSITE_URL import com.github.libretube.databinding.ActivityAboutBinding -import com.github.libretube.extensions.BaseActivity import com.github.libretube.extensions.getStyledSnackBar +import com.github.libretube.ui.base.BaseActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar diff --git a/app/src/main/java/com/github/libretube/ui/activities/CommunityActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/CommunityActivity.kt index f6d89650c..52a9d3d85 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/CommunityActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/CommunityActivity.kt @@ -9,7 +9,7 @@ import com.github.libretube.constants.REDDIT_URL import com.github.libretube.constants.TELEGRAM_URL import com.github.libretube.constants.TWITTER_URL import com.github.libretube.databinding.ActivityCommunityBinding -import com.github.libretube.extensions.BaseActivity +import com.github.libretube.ui.base.BaseActivity class CommunityActivity : BaseActivity() { private lateinit var binding: ActivityCommunityBinding diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt index 694316171..99a7f3af2 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt @@ -25,12 +25,12 @@ import com.github.libretube.R import com.github.libretube.constants.IntentData import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.ActivityMainBinding -import com.github.libretube.extensions.BaseActivity import com.github.libretube.extensions.toID import com.github.libretube.models.PlayerViewModel import com.github.libretube.models.SearchViewModel import com.github.libretube.models.SubscriptionsViewModel import com.github.libretube.services.ClosingService +import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.dialogs.ErrorDialog import com.github.libretube.ui.fragments.PlayerFragment import com.github.libretube.util.NavBarHelper diff --git a/app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt index c76a0b1f9..95233f2b6 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt @@ -5,8 +5,8 @@ import android.os.Bundle import androidx.activity.OnBackPressedCallback import com.github.libretube.R import com.github.libretube.databinding.ActivityNointernetBinding -import com.github.libretube.extensions.BaseActivity import com.github.libretube.extensions.getStyledSnackBar +import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.fragments.DownloadsFragment import com.github.libretube.util.NetworkHelper import com.github.libretube.util.ThemeHelper diff --git a/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt index ab148e5f9..fb4205e73 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt @@ -12,7 +12,7 @@ import androidx.core.view.WindowInsetsControllerCompat import com.github.libretube.constants.IntentData import com.github.libretube.databinding.ActivityOfflinePlayerBinding import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding -import com.github.libretube.extensions.BaseActivity +import com.github.libretube.ui.base.BaseActivity import com.github.libretube.util.DownloadHelper import com.google.android.exoplayer2.ExoPlayer import com.google.android.exoplayer2.MediaItem diff --git a/app/src/main/java/com/github/libretube/ui/activities/RouterActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/RouterActivity.kt index 8d0319a75..46ff87634 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/RouterActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/RouterActivity.kt @@ -7,8 +7,8 @@ import android.os.Bundle import android.util.Log import com.github.libretube.R import com.github.libretube.constants.IntentData -import com.github.libretube.extensions.BaseActivity import com.github.libretube.extensions.TAG +import com.github.libretube.ui.base.BaseActivity import com.github.libretube.util.ThemeHelper class RouterActivity : BaseActivity() { diff --git a/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt index 690bdac09..e957f72af 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt @@ -4,7 +4,7 @@ import android.os.Bundle import androidx.activity.OnBackPressedCallback import com.github.libretube.R import com.github.libretube.databinding.ActivitySettingsBinding -import com.github.libretube.extensions.BaseActivity +import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.preferences.MainSettings class SettingsActivity : BaseActivity() { diff --git a/app/src/main/java/com/github/libretube/extensions/BaseActivity.kt b/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt similarity index 93% rename from app/src/main/java/com/github/libretube/extensions/BaseActivity.kt rename to app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt index da84ae45a..189aad047 100644 --- a/app/src/main/java/com/github/libretube/extensions/BaseActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt @@ -1,4 +1,4 @@ -package com.github.libretube.extensions +package com.github.libretube.ui.base import android.os.Bundle import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/com/github/libretube/extensions/BaseFragment.kt b/app/src/main/java/com/github/libretube/ui/base/BaseFragment.kt similarity index 85% rename from app/src/main/java/com/github/libretube/extensions/BaseFragment.kt rename to app/src/main/java/com/github/libretube/ui/base/BaseFragment.kt index ded091322..092f88f89 100644 --- a/app/src/main/java/com/github/libretube/extensions/BaseFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/base/BaseFragment.kt @@ -1,4 +1,4 @@ -package com.github.libretube.extensions +package com.github.libretube.ui.base import androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/github/libretube/ui/views/MaterialPreferenceFragment.kt b/app/src/main/java/com/github/libretube/ui/base/BasePreferenceFragment.kt similarity index 96% rename from app/src/main/java/com/github/libretube/ui/views/MaterialPreferenceFragment.kt rename to app/src/main/java/com/github/libretube/ui/base/BasePreferenceFragment.kt index 8964b4570..6ac596c4d 100644 --- a/app/src/main/java/com/github/libretube/ui/views/MaterialPreferenceFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/base/BasePreferenceFragment.kt @@ -1,4 +1,4 @@ -package com.github.libretube.ui.views +package com.github.libretube.ui.base import android.os.Bundle import androidx.preference.EditTextPreference @@ -13,7 +13,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder /** * PreferenceFragmentCompat using the [MaterialAlertDialogBuilder] instead of the old dialog builder */ -open class MaterialPreferenceFragment : PreferenceFragmentCompat() { +open class BasePreferenceFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {} override fun onDisplayPreferenceDialog(preference: Preference) { diff --git a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt index b88f03142..e3c9c67bb 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt @@ -12,11 +12,11 @@ import com.github.libretube.api.RetrofitInstance import com.github.libretube.api.SubscriptionHelper import com.github.libretube.constants.IntentData import com.github.libretube.databinding.FragmentChannelBinding -import com.github.libretube.extensions.BaseFragment import com.github.libretube.extensions.TAG import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.toID import com.github.libretube.ui.adapters.ChannelAdapter +import com.github.libretube.ui.base.BaseFragment import com.github.libretube.util.ImageHelper import retrofit2.HttpException import java.io.IOException diff --git a/app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt index c19d552dc..fd96ff270 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt @@ -8,8 +8,8 @@ import androidx.core.view.size import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.github.libretube.databinding.FragmentDownloadsBinding -import com.github.libretube.extensions.BaseFragment import com.github.libretube.ui.adapters.DownloadsAdapter +import com.github.libretube.ui.base.BaseFragment import com.github.libretube.util.DownloadHelper class DownloadsFragment : BaseFragment() { diff --git a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt index aea4f99e1..244a912c1 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt @@ -13,10 +13,10 @@ import com.github.libretube.R import com.github.libretube.api.RetrofitInstance import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.FragmentHomeBinding -import com.github.libretube.extensions.BaseFragment import com.github.libretube.extensions.TAG import com.github.libretube.ui.adapters.ChannelAdapter import com.github.libretube.ui.adapters.TrendingAdapter +import com.github.libretube.ui.base.BaseFragment import com.github.libretube.util.LocaleHelper import com.github.libretube.util.PreferenceHelper import retrofit2.HttpException diff --git a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt index b4eb72b19..f0cc9b98a 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt @@ -15,10 +15,10 @@ import com.github.libretube.R import com.github.libretube.api.RetrofitInstance import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.FragmentLibraryBinding -import com.github.libretube.extensions.BaseFragment import com.github.libretube.extensions.TAG import com.github.libretube.models.PlayerViewModel import com.github.libretube.ui.adapters.PlaylistsAdapter +import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.dialogs.CreatePlaylistDialog import com.github.libretube.util.PreferenceHelper import retrofit2.HttpException diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt index b6011c043..5f9dc91ed 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt @@ -45,7 +45,6 @@ import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding import com.github.libretube.databinding.FragmentPlayerBinding import com.github.libretube.db.DatabaseHelper import com.github.libretube.db.DatabaseHolder.Companion.Database -import com.github.libretube.extensions.BaseFragment import com.github.libretube.extensions.TAG import com.github.libretube.extensions.awaitQuery import com.github.libretube.extensions.formatShort @@ -60,6 +59,7 @@ import com.github.libretube.ui.activities.MainActivity import com.github.libretube.ui.adapters.ChaptersAdapter import com.github.libretube.ui.adapters.CommentsAdapter import com.github.libretube.ui.adapters.TrendingAdapter +import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.dialogs.AddToPlaylistDialog import com.github.libretube.ui.dialogs.DownloadDialog import com.github.libretube.ui.dialogs.ShareDialog diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt index daac0ed01..6adb2cc3e 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt @@ -13,11 +13,11 @@ import com.github.libretube.R import com.github.libretube.api.RetrofitInstance import com.github.libretube.constants.IntentData import com.github.libretube.databinding.FragmentPlaylistBinding -import com.github.libretube.extensions.BaseFragment import com.github.libretube.extensions.TAG import com.github.libretube.extensions.toID import com.github.libretube.sheets.PlaylistOptionsBottomSheet import com.github.libretube.ui.adapters.PlaylistAdapter +import com.github.libretube.ui.base.BaseFragment import retrofit2.HttpException import java.io.IOException diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt index 1e096e471..b690af088 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt @@ -13,13 +13,13 @@ import com.github.libretube.R import com.github.libretube.api.RetrofitInstance import com.github.libretube.databinding.FragmentSearchBinding import com.github.libretube.db.DatabaseHolder.Companion.Database -import com.github.libretube.extensions.BaseFragment import com.github.libretube.extensions.TAG import com.github.libretube.extensions.awaitQuery import com.github.libretube.models.SearchViewModel import com.github.libretube.ui.activities.MainActivity import com.github.libretube.ui.adapters.SearchHistoryAdapter import com.github.libretube.ui.adapters.SearchSuggestionsAdapter +import com.github.libretube.ui.base.BaseFragment import retrofit2.HttpException import java.io.IOException diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt index 413eef6e8..0fcbb0da2 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt @@ -14,11 +14,11 @@ import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.FragmentSearchResultBinding import com.github.libretube.db.DatabaseHelper import com.github.libretube.db.obj.SearchHistoryItem -import com.github.libretube.extensions.BaseFragment import com.github.libretube.extensions.TAG import com.github.libretube.extensions.hideKeyboard import com.github.libretube.ui.activities.MainActivity import com.github.libretube.ui.adapters.SearchAdapter +import com.github.libretube.ui.base.BaseFragment import com.github.libretube.util.PreferenceHelper import retrofit2.HttpException import java.io.IOException diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt index 6eaef2abd..7043a1a08 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt @@ -12,11 +12,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.github.libretube.R import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.FragmentSubscriptionsBinding -import com.github.libretube.extensions.BaseFragment import com.github.libretube.models.SubscriptionsViewModel import com.github.libretube.ui.adapters.LegacySubscriptionAdapter import com.github.libretube.ui.adapters.SubscriptionChannelAdapter import com.github.libretube.ui.adapters.TrendingAdapter +import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.views.BottomSheet import com.github.libretube.util.PreferenceHelper diff --git a/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt index 55145e4dc..2a291b0da 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt @@ -9,9 +9,9 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.github.libretube.databinding.FragmentWatchHistoryBinding import com.github.libretube.db.DatabaseHolder.Companion.Database -import com.github.libretube.extensions.BaseFragment import com.github.libretube.extensions.awaitQuery import com.github.libretube.ui.adapters.WatchHistoryAdapter +import com.github.libretube.ui.base.BaseFragment class WatchHistoryFragment : BaseFragment() { private lateinit var binding: FragmentWatchHistoryBinding diff --git a/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt index 55f34d94f..3480a7f25 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt @@ -11,14 +11,14 @@ import com.github.libretube.R import com.github.libretube.constants.PreferenceKeys import com.github.libretube.obj.BackupFile import com.github.libretube.ui.activities.SettingsActivity +import com.github.libretube.ui.base.BasePreferenceFragment import com.github.libretube.ui.dialogs.BackupDialog -import com.github.libretube.ui.views.MaterialPreferenceFragment import com.github.libretube.util.BackupHelper import com.github.libretube.util.ImageHelper import com.github.libretube.util.PreferenceHelper import com.google.android.material.dialog.MaterialAlertDialogBuilder -class AdvancedSettings : MaterialPreferenceFragment() { +class AdvancedSettings : BasePreferenceFragment() { // backup and restore database private lateinit var getBackupFile: ActivityResultLauncher diff --git a/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt index 16219cc42..7be32162a 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt @@ -11,13 +11,13 @@ import androidx.preference.SwitchPreferenceCompat import com.github.libretube.R import com.github.libretube.constants.PreferenceKeys import com.github.libretube.ui.activities.SettingsActivity +import com.github.libretube.ui.base.BasePreferenceFragment import com.github.libretube.ui.dialogs.RequireRestartDialog -import com.github.libretube.ui.views.MaterialPreferenceFragment import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.ThemeHelper import com.google.android.material.color.DynamicColors -class AppearanceSettings : MaterialPreferenceFragment() { +class AppearanceSettings : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.appearance_settings, rootKey) diff --git a/app/src/main/java/com/github/libretube/ui/preferences/AudioVideoSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/AudioVideoSettings.kt index 3c92ca802..7c9d34b9c 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/AudioVideoSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/AudioVideoSettings.kt @@ -3,9 +3,9 @@ package com.github.libretube.ui.preferences import android.os.Bundle import com.github.libretube.R import com.github.libretube.ui.activities.SettingsActivity -import com.github.libretube.ui.views.MaterialPreferenceFragment +import com.github.libretube.ui.base.BasePreferenceFragment -class AudioVideoSettings : MaterialPreferenceFragment() { +class AudioVideoSettings : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.audio_video_settings, rootKey) diff --git a/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt index 75ddf94ce..4b2f8e0e1 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt @@ -8,12 +8,12 @@ import androidx.preference.SwitchPreferenceCompat import com.github.libretube.R import com.github.libretube.constants.PreferenceKeys import com.github.libretube.ui.activities.SettingsActivity +import com.github.libretube.ui.base.BasePreferenceFragment import com.github.libretube.ui.dialogs.NavBarOptionsDialog import com.github.libretube.ui.dialogs.RequireRestartDialog -import com.github.libretube.ui.views.MaterialPreferenceFragment import com.github.libretube.util.PreferenceHelper -class GeneralSettings : MaterialPreferenceFragment() { +class GeneralSettings : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.general_settings, rootKey) diff --git a/app/src/main/java/com/github/libretube/ui/preferences/HistorySettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/HistorySettings.kt index 76cf62482..af4be7d11 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/HistorySettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/HistorySettings.kt @@ -7,10 +7,10 @@ import com.github.libretube.constants.PreferenceKeys import com.github.libretube.db.DatabaseHolder.Companion.Database import com.github.libretube.extensions.query import com.github.libretube.ui.activities.SettingsActivity -import com.github.libretube.ui.views.MaterialPreferenceFragment +import com.github.libretube.ui.base.BasePreferenceFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -class HistorySettings : MaterialPreferenceFragment() { +class HistorySettings : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.history_settings, rootKey) diff --git a/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt index 967708d20..7696e8fe1 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/InstanceSettings.kt @@ -17,15 +17,15 @@ import com.github.libretube.constants.PreferenceKeys import com.github.libretube.db.DatabaseHolder.Companion.Database import com.github.libretube.extensions.awaitQuery import com.github.libretube.ui.activities.SettingsActivity +import com.github.libretube.ui.base.BasePreferenceFragment import com.github.libretube.ui.dialogs.CustomInstanceDialog import com.github.libretube.ui.dialogs.DeleteAccountDialog import com.github.libretube.ui.dialogs.LoginDialog import com.github.libretube.ui.dialogs.LogoutDialog -import com.github.libretube.ui.views.MaterialPreferenceFragment import com.github.libretube.util.ImportHelper import com.github.libretube.util.PreferenceHelper -class InstanceSettings : MaterialPreferenceFragment() { +class InstanceSettings : BasePreferenceFragment() { /** * result listeners for importing and exporting subscriptions diff --git a/app/src/main/java/com/github/libretube/ui/preferences/MainSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/MainSettings.kt index 34502f460..141fc5999 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/MainSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/MainSettings.kt @@ -8,14 +8,14 @@ import com.github.libretube.R import com.github.libretube.api.RetrofitInstance import com.github.libretube.extensions.getStyledSnackBar import com.github.libretube.ui.activities.SettingsActivity +import com.github.libretube.ui.base.BasePreferenceFragment import com.github.libretube.ui.dialogs.UpdateDialog -import com.github.libretube.ui.views.MaterialPreferenceFragment import com.github.libretube.util.NetworkHelper import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -class MainSettings : MaterialPreferenceFragment() { +class MainSettings : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.settings, rootKey) diff --git a/app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt index 8e87f58de..80b87bb87 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt @@ -7,10 +7,10 @@ import androidx.work.ExistingPeriodicWorkPolicy import com.github.libretube.R import com.github.libretube.constants.PreferenceKeys import com.github.libretube.ui.activities.SettingsActivity -import com.github.libretube.ui.views.MaterialPreferenceFragment +import com.github.libretube.ui.base.BasePreferenceFragment import com.github.libretube.util.NotificationHelper -class NotificationSettings : MaterialPreferenceFragment() { +class NotificationSettings : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.notification_settings, rootKey) diff --git a/app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt index cba39cd54..6816c50cc 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt @@ -7,11 +7,11 @@ import androidx.preference.SwitchPreferenceCompat import com.github.libretube.R import com.github.libretube.constants.PreferenceKeys import com.github.libretube.ui.activities.SettingsActivity -import com.github.libretube.ui.views.MaterialPreferenceFragment +import com.github.libretube.ui.base.BasePreferenceFragment import com.github.libretube.util.PreferenceHelper import java.util.* -class PlayerSettings : MaterialPreferenceFragment() { +class PlayerSettings : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.player_settings, rootKey) diff --git a/app/src/main/java/com/github/libretube/ui/preferences/SponsorBlockSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/SponsorBlockSettings.kt index eccd7a290..3732140fb 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/SponsorBlockSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/SponsorBlockSettings.kt @@ -3,9 +3,9 @@ package com.github.libretube.ui.preferences import android.os.Bundle import com.github.libretube.R import com.github.libretube.ui.activities.SettingsActivity -import com.github.libretube.ui.views.MaterialPreferenceFragment +import com.github.libretube.ui.base.BasePreferenceFragment -class SponsorBlockSettings : MaterialPreferenceFragment() { +class SponsorBlockSettings : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.sponsorblock_settings, rootKey) diff --git a/app/src/main/java/com/github/libretube/extensions/SliderPreference.kt b/app/src/main/java/com/github/libretube/ui/views/SliderPreference.kt similarity index 94% rename from app/src/main/java/com/github/libretube/extensions/SliderPreference.kt rename to app/src/main/java/com/github/libretube/ui/views/SliderPreference.kt index 324a1f9de..bf932ec51 100644 --- a/app/src/main/java/com/github/libretube/extensions/SliderPreference.kt +++ b/app/src/main/java/com/github/libretube/ui/views/SliderPreference.kt @@ -1,4 +1,4 @@ -package com.github.libretube.extensions +package com.github.libretube.ui.views import android.content.Context import android.util.AttributeSet @@ -8,6 +8,7 @@ import com.github.libretube.R import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceRanges import com.github.libretube.databinding.DialogSliderBinding +import com.github.libretube.extensions.setSliderRangeAndValue import com.github.libretube.util.PreferenceHelper import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/res/xml/audio_video_settings.xml b/app/src/main/res/xml/audio_video_settings.xml index 75e58ab7c..28de14c7d 100644 --- a/app/src/main/res/xml/audio_video_settings.xml +++ b/app/src/main/res/xml/audio_video_settings.xml @@ -70,7 +70,7 @@ - -