Merge pull request #1234 from Bnyro/master

fixes and improvements
libre-tube · Sep 8, 2022 · edb81c3 · edb81c3
2 parents a4b7221 + 6ea46b8
commit edb81c3
Show file tree

Hide file tree

Showing 51 changed files with 123 additions and 114 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'com.github.libretube'
         minSdk 21
         targetSdk 33
-        versionCode 17
-        versionName '0.5.0'
+        versionCode 18
+        versionName '0.5.1'
         multiDexEnabled true
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         resValue "string", "app_name", "LibreTube"

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,61 +11,61 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
+      "versionCode": 18,
+      "versionName": "0.5.1",
       "outputFile": "app-universal-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "x86_64"
         }
       ],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
-      "outputFile": "app-armeabi-v7a-release.apk"
+      "versionCode": 18,
+      "versionName": "0.5.1",
+      "outputFile": "app-x86_64-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86"
+          "value": "armeabi-v7a"
         }
       ],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
-      "outputFile": "app-x86-release.apk"
+      "versionCode": 18,
+      "versionName": "0.5.1",
+      "outputFile": "app-armeabi-v7a-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "x86"
         }
       ],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
-      "outputFile": "app-arm64-v8a-release.apk"
+      "versionCode": 18,
+      "versionName": "0.5.1",
+      "outputFile": "app-x86-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86_64"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 17,
-      "versionName": "0.5.0",
-      "outputFile": "app-x86_64-release.apk"
+      "versionCode": 18,
+      "versionName": "0.5.1",
+      "outputFile": "app-arm64-v8a-release.apk"
     }
   ],
   "elementType": "File"

diff --git a/app/src/main/java/com/github/libretube/MyApp.kt b/app/src/main/java/com/github/libretube/MyApp.kt
@@ -13,14 +13,14 @@ import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.github.libretube.api.CronetHelper
 import com.github.libretube.api.RetrofitInstance
+import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.WatchHistoryItem
 import com.github.libretube.db.obj.WatchPosition
-import com.github.libretube.preferences.PreferenceHelper
-import com.github.libretube.preferences.PreferenceKeys
 import com.github.libretube.util.ExceptionHandler
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NotificationHelper
+import com.github.libretube.util.PreferenceHelper
 
 class MyApp : Application() {
     override fun onCreate() {

diff --git a/app/src/main/java/com/github/libretube/activities/AboutActivity.kt b/app/src/main/java/com/github/libretube/activities/AboutActivity.kt
@@ -8,13 +8,13 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.text.Html
-import com.github.libretube.DONATE_URL
-import com.github.libretube.GITHUB_URL
-import com.github.libretube.LICENSE_URL
-import com.github.libretube.PIPED_GITHUB_URL
 import com.github.libretube.R
-import com.github.libretube.WEBLATE_URL
-import com.github.libretube.WEBSITE_URL
+import com.github.libretube.constants.DONATE_URL
+import com.github.libretube.constants.GITHUB_URL
+import com.github.libretube.constants.LICENSE_URL
+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

diff --git a/app/src/main/java/com/github/libretube/activities/CommunityActivity.kt b/app/src/main/java/com/github/libretube/activities/CommunityActivity.kt
@@ -3,11 +3,11 @@ package com.github.libretube.activities
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import com.github.libretube.DISCORD_URL
-import com.github.libretube.MATRIX_URL
-import com.github.libretube.REDDIT_URL
-import com.github.libretube.TELEGRAM_URL
-import com.github.libretube.TWITTER_URL
+import com.github.libretube.constants.DISCORD_URL
+import com.github.libretube.constants.MATRIX_URL
+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
 

diff --git a/app/src/main/java/com/github/libretube/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
@@ -27,17 +27,17 @@ import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
 import com.github.libretube.R
+import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.ActivityMainBinding
 import com.github.libretube.dialogs.ErrorDialog
 import com.github.libretube.extensions.BaseActivity
 import com.github.libretube.extensions.TAG
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.models.PlayerViewModel
 import com.github.libretube.models.SearchViewModel
-import com.github.libretube.preferences.PreferenceHelper
-import com.github.libretube.preferences.PreferenceKeys
 import com.github.libretube.services.ClosingService
 import com.github.libretube.util.NetworkHelper
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.elevation.SurfaceColors
@@ -167,15 +167,13 @@ class MainActivity : BaseActivity() {
                 if (binding.mainMotionLayout.progress == 0F) {
                     try {
                         minimizePlayer()
+                        return
                     } catch (e: Exception) {
-                        if (navController.currentDestination?.id == startFragmentId) {
-                            // close app
-                            moveTaskToBack(true)
-                        } else {
-                            navController.popBackStack()
-                        }
+                        // current fragment isn't the player fragment
                     }
-                } else if (navController.currentDestination?.id == startFragmentId) {
+                }
+
+                if (navController.currentDestination?.id == startFragmentId) {
                     moveTaskToBack(true)
                 } else {
                     navController.popBackStack()

diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt
@@ -16,9 +16,9 @@ import com.github.libretube.extensions.setWatchProgressLength
 import com.github.libretube.extensions.toID
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.obj.StreamItem
-import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
+import com.github.libretube.util.PreferenceHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
@@ -13,9 +13,9 @@ import com.github.libretube.dialogs.PlaylistOptionsDialog
 import com.github.libretube.extensions.TAG
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.obj.Playlists
-import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

diff --git a/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt b/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt
@@ -6,7 +6,7 @@ import com.github.libretube.db.obj.LocalSubscription
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.await
 import com.github.libretube.obj.Subscribe
-import com.github.libretube.preferences.PreferenceHelper
+import com.github.libretube.util.PreferenceHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

diff --git a/...in/java/com/github/libretube/Constants.kt → ...m/github/libretube/constants/Constants.kt b/...in/java/com/github/libretube/Constants.kt → ...m/github/libretube/constants/Constants.kt
@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.constants
 
 /**
  * API link for the update checker

diff --git a/...b/libretube/preferences/PreferenceKeys.kt → ...hub/libretube/constants/PreferenceKeys.kt b/...b/libretube/preferences/PreferenceKeys.kt → ...hub/libretube/constants/PreferenceKeys.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.preferences
+package com.github.libretube.constants
 
 /**
  * keys for the shared preferences

diff --git a/...libretube/preferences/PreferenceRanges.kt → ...b/libretube/constants/PreferenceRanges.kt b/...libretube/preferences/PreferenceRanges.kt → ...b/libretube/constants/PreferenceRanges.kt
@@ -1,4 +1,4 @@
-package com.github.libretube.preferences
+package com.github.libretube.constants
 
 import com.github.libretube.obj.SliderRange
 

diff --git a/app/src/main/java/com/github/libretube/db/DatabaseHelper.kt b/app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
@@ -1,12 +1,12 @@
 package com.github.libretube.db
 
+import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.obj.SearchHistoryItem
 import com.github.libretube.db.obj.WatchHistoryItem
 import com.github.libretube.db.obj.WatchPosition
 import com.github.libretube.extensions.toID
 import com.github.libretube.obj.Streams
-import com.github.libretube.preferences.PreferenceHelper
-import com.github.libretube.preferences.PreferenceKeys
+import com.github.libretube.util.PreferenceHelper
 
 object DatabaseHelper {
     fun addToWatchHistory(videoId: String, streams: Streams) {

diff --git a/app/src/main/java/com/github/libretube/db/DatabaseHolder.kt b/app/src/main/java/com/github/libretube/db/DatabaseHolder.kt
@@ -2,7 +2,7 @@ package com.github.libretube.db
 
 import android.content.Context
 import androidx.room.Room
-import com.github.libretube.DATABASE_NAME
+import com.github.libretube.constants.DATABASE_NAME
 
 object DatabaseHolder {
     lateinit var db: AppDatabase

diff --git a/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt
@@ -15,7 +15,7 @@ import com.github.libretube.databinding.DialogAddtoplaylistBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.models.PlaylistViewModel
 import com.github.libretube.obj.PlaylistId
-import com.github.libretube.preferences.PreferenceHelper
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import retrofit2.HttpException

diff --git a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
@@ -12,7 +12,7 @@ import com.github.libretube.databinding.DialogCreatePlaylistBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.fragments.LibraryFragment
 import com.github.libretube.obj.Playlists
-import com.github.libretube.preferences.PreferenceHelper
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import retrofit2.HttpException

diff --git 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 com.github.libretube.api.RetrofitInstance
 import com.github.libretube.databinding.DialogDeleteAccountBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.obj.DeleteUserRequest
-import com.github.libretube.preferences.PreferenceHelper
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 

diff --git a/app/src/main/java/com/github/libretube/dialogs/ErrorDialog.kt b/app/src/main/java/com/github/libretube/dialogs/ErrorDialog.kt
@@ -8,7 +8,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
-import com.github.libretube.preferences.PreferenceHelper
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class ErrorDialog : DialogFragment() {

diff --git a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt
@@ -11,7 +11,7 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.databinding.DialogLoginBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.obj.Login
-import com.github.libretube.preferences.PreferenceHelper
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import retrofit2.HttpException

diff --git a/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt
@@ -6,7 +6,7 @@ import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogLogoutBinding
-import com.github.libretube.preferences.PreferenceHelper
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 

diff --git a/app/src/main/java/com/github/libretube/dialogs/PlaylistOptionsDialog.kt b/app/src/main/java/com/github/libretube/dialogs/PlaylistOptionsDialog.kt
@@ -11,8 +11,8 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
 import com.github.libretube.obj.PlaylistId
-import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.BackgroundHelper
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

diff --git a/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt b/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt
@@ -4,15 +4,15 @@ import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import com.github.libretube.PIPED_FRONTEND_URL
 import com.github.libretube.R
-import com.github.libretube.YOUTUBE_FRONTEND_URL
+import com.github.libretube.constants.PIPED_FRONTEND_URL
+import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.constants.YOUTUBE_FRONTEND_URL
 import com.github.libretube.databinding.DialogShareBinding
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.CustomInstance
 import com.github.libretube.extensions.await
-import com.github.libretube.preferences.PreferenceHelper
-import com.github.libretube.preferences.PreferenceKeys
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class ShareDialog(

diff --git a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
@@ -8,10 +8,10 @@ import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.Globals
-import com.github.libretube.PLAYER_NOTIFICATION_ID
 import com.github.libretube.R
-import com.github.libretube.preferences.PreferenceHelper
+import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
 import com.github.libretube.util.BackgroundHelper
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 /**

diff --git a/app/src/main/java/com/github/libretube/extensions/SliderPreference.kt b/app/src/main/java/com/github/libretube/extensions/SliderPreference.kt
@@ -5,10 +5,10 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.preference.Preference
 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.preferences.PreferenceHelper
-import com.github.libretube.preferences.PreferenceKeys
-import com.github.libretube.preferences.PreferenceRanges
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 /**

diff --git a/app/src/main/java/com/github/libretube/fragments/HomeFragment.kt b/app/src/main/java/com/github/libretube/fragments/HomeFragment.kt
@@ -11,12 +11,12 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.github.libretube.R
 import com.github.libretube.adapters.TrendingAdapter
 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.preferences.PreferenceHelper
-import com.github.libretube.preferences.PreferenceKeys
 import com.github.libretube.util.LocaleHelper
+import com.github.libretube.util.PreferenceHelper
 import retrofit2.HttpException
 import java.io.IOException