From a08a14758bf560787dd588e5ddae9aa372a0dc7c Mon Sep 17 00:00:00 2001 From: Bnyro Date: Fri, 1 Jul 2022 16:54:20 +0200 Subject: [PATCH] structure --- app/src/main/AndroidManifest.xml | 22 +++++++++---------- .../{ => activities}/MainActivity.kt | 4 ++-- .../{ => activities}/NoInternetActivity.kt | 2 +- .../{ => activities}/RouterActivity.kt | 3 ++- .../{ => activities}/SettingsActivity.kt | 3 ++- .../libretube/adapters/CommentsAdapter.kt | 2 +- .../libretube/adapters/PlaylistsAdapter.kt | 2 +- .../libretube/adapters/RepliesAdapter.kt | 2 +- .../libretube/adapters/SearchAdapter.kt | 2 +- .../libretube/adapters/SubscriptionAdapter.kt | 2 +- .../adapters/SubscriptionChannelAdapter.kt | 2 +- .../libretube/adapters/TrendingAdapter.kt | 2 +- .../libretube/dialogs/DeleteAccountDialog.kt | 2 +- .../libretube/dialogs/DownloadDialog.kt | 2 +- .../libretube/dialogs/VideoOptionsDialog.kt | 2 +- .../libretube/fragments/PlayerFragment.kt | 4 ++-- .../libretube/fragments/SearchFragment.kt | 2 +- .../libretube/preferences/AboutFragment.kt | 12 +++++----- .../libretube/preferences/AdvancedSettings.kt | 4 ++-- .../preferences/AppearanceSettings.kt | 4 ++-- .../libretube/preferences/InstanceSettings.kt | 4 ++-- .../libretube/preferences/MainSettings.kt | 4 ++-- .../libretube/preferences/PlayerSettings.kt | 2 +- .../preferences/SponsorBlockSettings.kt | 2 +- .../libretube/{ => util}/BackgroundMode.kt | 5 +---- .../github/libretube/{ => util}/Constants.kt | 2 +- .../libretube/util/DescriptionAdapter.kt | 2 +- .../github/libretube/util/UpdateChecker.kt | 1 - 28 files changed, 50 insertions(+), 52 deletions(-) rename app/src/main/java/com/github/libretube/{ => activities}/MainActivity.kt (99%) rename app/src/main/java/com/github/libretube/{ => activities}/NoInternetActivity.kt (96%) rename app/src/main/java/com/github/libretube/{ => activities}/RouterActivity.kt (96%) rename app/src/main/java/com/github/libretube/{ => activities}/SettingsActivity.kt (97%) rename app/src/main/java/com/github/libretube/{ => util}/BackgroundMode.kt (97%) rename app/src/main/java/com/github/libretube/{ => util}/Constants.kt (92%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e9662a30f..3081a7847 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,13 +26,13 @@ android:configChanges="orientation|screenSize" android:exported="false" /> + android:targetActivity=".activities.MainActivity"> @@ -72,7 +72,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_fire_round" android:supportsPictureInPicture="true" - android:targetActivity=".MainActivity"> + android:targetActivity=".activities.MainActivity"> @@ -89,7 +89,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_flame_round" android:supportsPictureInPicture="true" - android:targetActivity=".MainActivity"> + android:targetActivity=".activities.MainActivity"> @@ -106,7 +106,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_shaped_round" android:supportsPictureInPicture="true" - android:targetActivity=".MainActivity"> + android:targetActivity=".activities.MainActivity"> @@ -123,7 +123,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_torch_round" android:supportsPictureInPicture="true" - android:targetActivity=".MainActivity"> + android:targetActivity=".activities.MainActivity"> @@ -140,7 +140,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_legacy_round" android:supportsPictureInPicture="true" - android:targetActivity=".MainActivity"> + android:targetActivity=".activities.MainActivity"> @@ -157,7 +157,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_bird_round" android:supportsPictureInPicture="true" - android:targetActivity=".MainActivity"> + android:targetActivity=".activities.MainActivity"> @@ -165,7 +165,7 @@ diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/activities/MainActivity.kt similarity index 99% rename from app/src/main/java/com/github/libretube/MainActivity.kt rename to app/src/main/java/com/github/libretube/activities/MainActivity.kt index e4c3dff78..e47cc3605 100644 --- a/app/src/main/java/com/github/libretube/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.github.libretube +package com.github.libretube.activities import android.app.Activity import android.content.Context @@ -21,7 +21,6 @@ import android.view.WindowManager import android.view.inputmethod.InputMethodManager import android.widget.LinearLayout import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.widget.Toolbar import androidx.constraintlayout.motion.widget.MotionLayout import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.os.bundleOf @@ -30,6 +29,7 @@ import androidx.fragment.app.Fragment import androidx.navigation.NavController import androidx.navigation.findNavController import androidx.navigation.ui.setupWithNavController +import com.github.libretube.R import com.github.libretube.databinding.ActivityMainBinding import com.github.libretube.fragments.PlayerFragment import com.github.libretube.fragments.isFullScreen diff --git a/app/src/main/java/com/github/libretube/NoInternetActivity.kt b/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt similarity index 96% rename from app/src/main/java/com/github/libretube/NoInternetActivity.kt rename to app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt index 98deda07f..7841790ad 100644 --- a/app/src/main/java/com/github/libretube/NoInternetActivity.kt +++ b/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt @@ -1,4 +1,4 @@ -package com.github.libretube +package com.github.libretube.activities import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/com/github/libretube/RouterActivity.kt b/app/src/main/java/com/github/libretube/activities/RouterActivity.kt similarity index 96% rename from app/src/main/java/com/github/libretube/RouterActivity.kt rename to app/src/main/java/com/github/libretube/activities/RouterActivity.kt index 3033fcfbb..a90e218da 100644 --- a/app/src/main/java/com/github/libretube/RouterActivity.kt +++ b/app/src/main/java/com/github/libretube/activities/RouterActivity.kt @@ -1,4 +1,4 @@ -package com.github.libretube +package com.github.libretube.activities import android.content.Intent import android.content.pm.PackageManager @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Bundle import android.util.Log import androidx.appcompat.app.AppCompatActivity +import com.github.libretube.R import com.github.libretube.util.ThemeHelper class RouterActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/github/libretube/SettingsActivity.kt b/app/src/main/java/com/github/libretube/activities/SettingsActivity.kt similarity index 97% rename from app/src/main/java/com/github/libretube/SettingsActivity.kt rename to app/src/main/java/com/github/libretube/activities/SettingsActivity.kt index d091b6d20..db89c7dd7 100644 --- a/app/src/main/java/com/github/libretube/SettingsActivity.kt +++ b/app/src/main/java/com/github/libretube/activities/SettingsActivity.kt @@ -1,10 +1,11 @@ -package com.github.libretube +package com.github.libretube.activities import android.app.NotificationManager import android.os.Build import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat +import com.github.libretube.R import com.github.libretube.databinding.ActivitySettingsBinding import com.github.libretube.preferences.MainSettings import com.github.libretube.util.ThemeHelper diff --git a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt index 200aae14c..b66c0a207 100644 --- a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt @@ -9,8 +9,8 @@ import androidx.constraintlayout.motion.widget.MotionLayout import androidx.core.os.bundleOf import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.github.libretube.MainActivity import com.github.libretube.R +import com.github.libretube.activities.MainActivity import com.github.libretube.databinding.CommentsRowBinding import com.github.libretube.obj.Comment import com.github.libretube.obj.CommentsPage diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt index 49a2fa274..94a9dea29 100644 --- a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt @@ -7,8 +7,8 @@ import android.view.View import android.view.ViewGroup import androidx.core.os.bundleOf import androidx.recyclerview.widget.RecyclerView -import com.github.libretube.MainActivity import com.github.libretube.R +import com.github.libretube.activities.MainActivity import com.github.libretube.databinding.PlaylistsRowBinding import com.github.libretube.obj.PlaylistId import com.github.libretube.obj.Playlists diff --git a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt index edbdca36a..d43f55c16 100644 --- a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt @@ -6,7 +6,7 @@ import android.view.ViewGroup import androidx.constraintlayout.motion.widget.MotionLayout import androidx.core.os.bundleOf import androidx.recyclerview.widget.RecyclerView -import com.github.libretube.MainActivity +import com.github.libretube.activities.MainActivity import com.github.libretube.R import com.github.libretube.databinding.RepliesRowBinding import com.github.libretube.obj.Comment diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt index 5247725c7..a15dca33c 100644 --- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt @@ -11,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.github.libretube.MainActivity +import com.github.libretube.activities.MainActivity import com.github.libretube.R import com.github.libretube.databinding.ChannelSearchRowBinding import com.github.libretube.databinding.PlaylistSearchRowBinding diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt index 7462b580f..dd87d49da 100644 --- a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt @@ -10,7 +10,7 @@ import androidx.constraintlayout.motion.widget.MotionLayout import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.github.libretube.MainActivity +import com.github.libretube.activities.MainActivity import com.github.libretube.R import com.github.libretube.databinding.TrendingRowBinding import com.github.libretube.dialogs.VideoOptionsDialog diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt index 6a4586ff6..32808082a 100644 --- a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt @@ -7,7 +7,7 @@ import android.view.View import android.view.ViewGroup import androidx.core.os.bundleOf import androidx.recyclerview.widget.RecyclerView -import com.github.libretube.MainActivity +import com.github.libretube.activities.MainActivity import com.github.libretube.R import com.github.libretube.databinding.ChannelSubscriptionRowBinding import com.github.libretube.obj.Subscribe diff --git a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt index f79a21cce..85ab32a70 100644 --- a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt @@ -10,7 +10,7 @@ import androidx.constraintlayout.motion.widget.MotionLayout import androidx.core.os.bundleOf import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.github.libretube.MainActivity +import com.github.libretube.activities.MainActivity import com.github.libretube.R import com.github.libretube.databinding.TrendingRowBinding import com.github.libretube.dialogs.VideoOptionsDialog diff --git a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt index d815c490d..92a2f8631 100644 --- a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt @@ -11,7 +11,7 @@ import androidx.lifecycle.lifecycleScope import com.github.libretube.R import com.github.libretube.databinding.DialogDeleteAccountBinding import com.github.libretube.obj.DeleteUserRequest -import com.github.libretube.requireMainActivityRestart +import com.github.libretube.activities.requireMainActivityRestart import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt index 3c5cc2677..7aa16def2 100644 --- a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt @@ -13,7 +13,7 @@ import android.widget.ArrayAdapter import androidx.core.app.ActivityCompat import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment -import com.github.libretube.MainActivity +import com.github.libretube.activities.MainActivity import com.github.libretube.R import com.github.libretube.databinding.DialogDownloadBinding import com.github.libretube.obj.Streams diff --git a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt index da87f5551..1cd3630a8 100644 --- a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt @@ -6,7 +6,7 @@ import android.os.Bundle import android.widget.ArrayAdapter import android.widget.Toast import androidx.fragment.app.DialogFragment -import com.github.libretube.BackgroundMode +import com.github.libretube.util.BackgroundMode import com.github.libretube.R import com.github.libretube.util.PreferenceHelper import com.google.android.material.dialog.MaterialAlertDialogBuilder 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 4681913f9..2766e7b2f 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -33,7 +33,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import com.github.libretube.MainActivity +import com.github.libretube.activities.MainActivity import com.github.libretube.R import com.github.libretube.adapters.ChaptersAdapter import com.github.libretube.adapters.CommentsAdapter @@ -42,7 +42,7 @@ import com.github.libretube.databinding.FragmentPlayerBinding import com.github.libretube.dialogs.AddtoPlaylistDialog import com.github.libretube.dialogs.DownloadDialog import com.github.libretube.dialogs.ShareDialog -import com.github.libretube.hideKeyboard +import com.github.libretube.activities.hideKeyboard import com.github.libretube.obj.ChapterSegment import com.github.libretube.obj.PipedStream import com.github.libretube.obj.Playlist diff --git a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt index e6a9fd737..8bc3ea09f 100644 --- a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt @@ -24,7 +24,7 @@ import com.github.libretube.adapters.SearchAdapter import com.github.libretube.adapters.SearchHistoryAdapter import com.github.libretube.adapters.SearchSuggestionsAdapter import com.github.libretube.databinding.FragmentSearchBinding -import com.github.libretube.hideKeyboard +import com.github.libretube.activities.hideKeyboard import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt index cfd62721b..0e5a471fa 100644 --- a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt +++ b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt @@ -9,13 +9,13 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.github.libretube.AUTHORS_URL -import com.github.libretube.CONTRIBUTING_URL -import com.github.libretube.DONATE_URL -import com.github.libretube.PIPED_GITHUB_URL +import com.github.libretube.util.AUTHORS_URL +import com.github.libretube.util.CONTRIBUTING_URL +import com.github.libretube.util.DONATE_URL +import com.github.libretube.util.PIPED_GITHUB_URL import com.github.libretube.R -import com.github.libretube.SettingsActivity -import com.github.libretube.WEBSITE_URL +import com.github.libretube.activities.SettingsActivity +import com.github.libretube.util.WEBSITE_URL import com.github.libretube.databinding.FragmentAboutBinding import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt b/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt index 0f03b9736..3fb39c7e8 100644 --- a/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt @@ -4,8 +4,8 @@ import android.os.Bundle import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import com.github.libretube.R -import com.github.libretube.SettingsActivity -import com.github.libretube.requireMainActivityRestart +import com.github.libretube.activities.SettingsActivity +import com.github.libretube.activities.requireMainActivityRestart import com.github.libretube.util.PreferenceHelper import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt index 380424bd4..a43d17d86 100644 --- a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt @@ -6,8 +6,8 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference import com.github.libretube.R -import com.github.libretube.SettingsActivity -import com.github.libretube.requireMainActivityRestart +import com.github.libretube.activities.SettingsActivity +import com.github.libretube.activities.requireMainActivityRestart import com.github.libretube.util.ThemeHelper class AppearanceSettings : PreferenceFragmentCompat() { diff --git a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt index 728beed24..d7281ff92 100644 --- a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt @@ -18,12 +18,12 @@ import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import com.github.libretube.R -import com.github.libretube.SettingsActivity +import com.github.libretube.activities.SettingsActivity import com.github.libretube.dialogs.CustomInstanceDialog import com.github.libretube.dialogs.DeleteAccountDialog import com.github.libretube.dialogs.LoginDialog import com.github.libretube.dialogs.LogoutDialog -import com.github.libretube.requireMainActivityRestart +import com.github.libretube.activities.requireMainActivityRestart import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.RetrofitInstance import org.json.JSONObject diff --git a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt index a8ceef736..075b35643 100644 --- a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt @@ -8,8 +8,8 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import com.github.libretube.BuildConfig import com.github.libretube.R -import com.github.libretube.isCurrentViewMainSettings -import com.github.libretube.requireMainActivityRestart +import com.github.libretube.activities.isCurrentViewMainSettings +import com.github.libretube.activities.requireMainActivityRestart import com.github.libretube.util.ThemeHelper import com.github.libretube.util.checkUpdate diff --git a/app/src/main/java/com/github/libretube/preferences/PlayerSettings.kt b/app/src/main/java/com/github/libretube/preferences/PlayerSettings.kt index 16fd72aa7..5fbcae5a9 100644 --- a/app/src/main/java/com/github/libretube/preferences/PlayerSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/PlayerSettings.kt @@ -3,7 +3,7 @@ package com.github.libretube.preferences import android.os.Bundle import androidx.preference.PreferenceFragmentCompat import com.github.libretube.R -import com.github.libretube.SettingsActivity +import com.github.libretube.activities.SettingsActivity class PlayerSettings : PreferenceFragmentCompat() { val TAG = "PlayerSettings" diff --git a/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt b/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt index 02c4479c7..51cb7f77b 100644 --- a/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt @@ -3,7 +3,7 @@ package com.github.libretube.preferences import android.os.Bundle import androidx.preference.PreferenceFragmentCompat import com.github.libretube.R -import com.github.libretube.SettingsActivity +import com.github.libretube.activities.SettingsActivity class SponsorBlockSettings : PreferenceFragmentCompat() { private val TAG = "SponsorBlockSettings" diff --git a/app/src/main/java/com/github/libretube/BackgroundMode.kt b/app/src/main/java/com/github/libretube/util/BackgroundMode.kt similarity index 97% rename from app/src/main/java/com/github/libretube/BackgroundMode.kt rename to app/src/main/java/com/github/libretube/util/BackgroundMode.kt index a95a8801d..617cafa4d 100644 --- a/app/src/main/java/com/github/libretube/BackgroundMode.kt +++ b/app/src/main/java/com/github/libretube/util/BackgroundMode.kt @@ -1,12 +1,9 @@ -package com.github.libretube +package com.github.libretube.util import android.app.NotificationManager import android.content.Context import android.support.v4.media.session.MediaSessionCompat import com.github.libretube.obj.Streams -import com.github.libretube.util.DescriptionAdapter -import com.github.libretube.util.PreferenceHelper -import com.github.libretube.util.RetrofitInstance import com.google.android.exoplayer2.C import com.google.android.exoplayer2.ExoPlayer import com.google.android.exoplayer2.MediaItem diff --git a/app/src/main/java/com/github/libretube/Constants.kt b/app/src/main/java/com/github/libretube/util/Constants.kt similarity index 92% rename from app/src/main/java/com/github/libretube/Constants.kt rename to app/src/main/java/com/github/libretube/util/Constants.kt index 52a5d0ef3..90a13a619 100644 --- a/app/src/main/java/com/github/libretube/Constants.kt +++ b/app/src/main/java/com/github/libretube/util/Constants.kt @@ -1,4 +1,4 @@ -package com.github.libretube +package com.github.libretube.util const val GITHUB_API_URL = "https://api.github.com/repos/libre-tube/LibreTube/releases/latest" const val WEBSITE_URL = "https://libre-tube.github.io/" diff --git a/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt b/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt index a7c9c1ec9..6bc27bf40 100644 --- a/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt +++ b/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.graphics.Bitmap import android.graphics.BitmapFactory -import com.github.libretube.MainActivity +import com.github.libretube.activities.MainActivity import com.google.android.exoplayer2.Player import com.google.android.exoplayer2.ui.PlayerNotificationManager import java.net.URL diff --git a/app/src/main/java/com/github/libretube/util/UpdateChecker.kt b/app/src/main/java/com/github/libretube/util/UpdateChecker.kt index 3513a636d..4fa20c45e 100644 --- a/app/src/main/java/com/github/libretube/util/UpdateChecker.kt +++ b/app/src/main/java/com/github/libretube/util/UpdateChecker.kt @@ -3,7 +3,6 @@ package com.github.libretube.util import android.util.Log import androidx.fragment.app.FragmentManager import com.github.libretube.BuildConfig -import com.github.libretube.GITHUB_API_URL import com.github.libretube.dialogs.NoUpdateAvailableDialog import com.github.libretube.dialogs.UpdateAvailableDialog import com.github.libretube.obj.UpdateInfo