From 7403baac625cd2010bc9bb900a025d86ea5b1d76 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Wed, 8 Jun 2022 11:07:47 +0200 Subject: [PATCH 1/2] minor changes --- app/src/main/AndroidManifest.xml | 2 +- .../libretube/adapters/PlaylistAdapter.kt | 2 +- .../libretube/adapters/PlaylistsAdapter.kt | 2 +- .../github/libretube/adapters/SearchAdapter.kt | 5 ++--- .../libretube/adapters/SubscriptionAdapter.kt | 5 ++--- .../adapters/SubscriptionChannelAdapter.kt | 2 +- .../libretube/adapters/TrendingAdapter.kt | 5 ++--- .../libretube/dialogs/AddtoPlaylistDialog.kt | 2 +- .../libretube/dialogs/CreatePlaylistDialog.kt | 2 +- .../github/libretube/dialogs/LoginDialog.kt | 2 +- .../libretube/fragments/ChannelFragment.kt | 2 +- .../github/libretube/{ => fragments}/Home.kt | 5 +++-- .../libretube/{ => fragments}/Library.kt | 5 +++-- .../libretube/fragments/PlayerFragment.kt | 4 ++-- .../libretube/fragments/PlaylistFragment.kt | 2 +- .../libretube/fragments/SearchFragment.kt | 2 +- .../libretube/{ => fragments}/Subscriptions.kt | 5 +++-- .../libretube/preferences/AboutFragment.kt | 1 + .../libretube/preferences/MainSettings.kt | 6 +++--- .../com/github/libretube/{ => util}/Player.kt | 3 ++- .../com/github/libretube/util/UpdateChecker.kt | 4 ++-- app/src/main/res/drawable/ic_block.xml | 4 ++-- app/src/main/res/drawable/ic_download.xml | 6 +++--- app/src/main/res/drawable/ic_frame.xml | 6 +++--- app/src/main/res/drawable/ic_grid.xml | 6 +++--- app/src/main/res/drawable/ic_hd.xml | 6 +++--- app/src/main/res/drawable/ic_info.xml | 6 +++--- app/src/main/res/drawable/ic_list.xml | 2 +- app/src/main/res/drawable/ic_server.xml | 6 +++--- app/src/main/res/drawable/ic_theme.xml | 6 +++--- app/src/main/res/layout/activity_player.xml | 2 +- app/src/main/res/layout/activity_settings.xml | 18 +++++++++--------- app/src/main/res/layout/fragment_home.xml | 2 +- app/src/main/res/layout/fragment_library.xml | 2 +- .../main/res/layout/fragment_subscriptions.xml | 2 +- app/src/main/res/layout/layout_empty.xml | 6 ------ app/src/main/res/navigation/nav.xml | 6 +++--- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/xml/advanced_settings.xml | 18 +++++++++--------- 39 files changed, 85 insertions(+), 89 deletions(-) rename app/src/main/java/com/github/libretube/{ => fragments}/Home.kt (98%) rename app/src/main/java/com/github/libretube/{ => fragments}/Library.kt (98%) rename app/src/main/java/com/github/libretube/{ => fragments}/Subscriptions.kt (99%) rename app/src/main/java/com/github/libretube/{ => util}/Player.kt (84%) delete mode 100644 app/src/main/res/layout/layout_empty.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 91d1abe55..f24097dde 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ android:largeHeap="true" android:requestLegacyExternalStorage="true"> diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt index 3938ae50d..4397101cb 100644 --- a/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt @@ -20,10 +20,10 @@ import com.github.libretube.obj.PlaylistId import com.github.libretube.obj.StreamItem import com.github.libretube.util.RetrofitInstance import com.squareup.picasso.Picasso -import java.io.IOException import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import retrofit2.HttpException +import java.io.IOException class PlaylistAdapter( private val videoFeed: MutableList, 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 9aa860f27..049e6565b 100644 --- a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt @@ -17,10 +17,10 @@ import com.github.libretube.obj.Playlists import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.squareup.picasso.Picasso -import java.io.IOException import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import retrofit2.HttpException +import java.io.IOException class PlaylistsAdapter( private val playlists: MutableList, 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 37d07bbcf..d1fa29523 100644 --- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt @@ -70,9 +70,8 @@ class SearchViewHolder( val thumbnailImage = v.findViewById(R.id.search_thumbnail) Picasso.get().load(item.thumbnail).fit().centerCrop().into(thumbnailImage) val thumbnailDuration = v.findViewById(R.id.search_thumbnail_duration) - val itemDuration = DateUtils.formatElapsedTime(item.duration!!) - if (itemDuration != "00:-1") { - thumbnailDuration.text = itemDuration + if (item.duration != -1L) { + thumbnailDuration.text = DateUtils.formatElapsedTime(item.duration!!) } else { thumbnailDuration.text = v.context.getString(R.string.live) thumbnailDuration.setBackgroundColor(R.attr.colorPrimaryDark) 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 c54de5961..3e37fd814 100644 --- a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt @@ -54,9 +54,8 @@ class SubscriptionAdapter( DateUtils.getRelativeTimeSpanString(trending.uploaded!!) val thumbnailImage = holder.v.findViewById(R.id.thumbnail) val thumbnailDuration = holder.v.findViewById(R.id.thumbnail_duration) - val itemDuration = DateUtils.formatElapsedTime(trending.duration!!) - if (itemDuration != "00:-1") { - thumbnailDuration.text = itemDuration + if (trending.duration != -1L) { + thumbnailDuration.text = DateUtils.formatElapsedTime(trending.duration!!) } else { thumbnailDuration.text = holder.v.context.getString(R.string.live) thumbnailDuration.setBackgroundColor(R.attr.colorPrimaryDark) 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 ca8c24bef..fb06eda1b 100644 --- a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt @@ -15,11 +15,11 @@ import com.github.libretube.obj.Subscribe import com.github.libretube.obj.Subscription import com.github.libretube.util.RetrofitInstance import com.squareup.picasso.Picasso -import java.io.IOException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import retrofit2.HttpException +import java.io.IOException class SubscriptionChannelAdapter(private val subscriptions: MutableList) : RecyclerView.Adapter() { 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 fca2ef549..376171c9e 100644 --- a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt @@ -43,9 +43,8 @@ class TrendingAdapter( DateUtils.getRelativeTimeSpanString(trending.uploaded!!) val thumbnailImage = holder.v.findViewById(R.id.thumbnail) val thumbnailDuration = holder.v.findViewById(R.id.thumbnail_duration) - val itemDuration = DateUtils.formatElapsedTime(trending.duration!!) - if (itemDuration != "00:-1") { - thumbnailDuration.text = itemDuration + if (trending.duration != -1L) { + thumbnailDuration.text = DateUtils.formatElapsedTime(trending.duration!!) } else { thumbnailDuration.text = holder.v.context.getString(R.string.live) thumbnailDuration.setBackgroundColor(R.attr.colorPrimaryDark) 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 80453c14b..126bdd7e0 100644 --- a/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt @@ -19,8 +19,8 @@ import com.github.libretube.R import com.github.libretube.obj.PlaylistId import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder -import java.io.IOException import retrofit2.HttpException +import java.io.IOException class AddtoPlaylistDialog : DialogFragment() { private val TAG = "AddToPlaylistDialog" diff --git a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt index d33cf90ee..000bf1897 100644 --- a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt @@ -19,8 +19,8 @@ import com.github.libretube.obj.Playlists import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText -import java.io.IOException import retrofit2.HttpException +import java.io.IOException class CreatePlaylistDialog : DialogFragment() { val TAG = "CreatePlaylistDialog" diff --git a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt index ae27c5ca2..8d1cc33f8 100644 --- a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt @@ -17,8 +17,8 @@ import com.github.libretube.R import com.github.libretube.obj.Login import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder -import java.io.IOException import retrofit2.HttpException +import java.io.IOException class LoginDialog : DialogFragment() { private val TAG = "LoginDialog" diff --git a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt index bf33cecf6..61ea05aa1 100644 --- a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt @@ -22,8 +22,8 @@ import com.github.libretube.obj.Subscribe import com.github.libretube.util.RetrofitInstance import com.google.android.material.button.MaterialButton import com.squareup.picasso.Picasso -import java.io.IOException import retrofit2.HttpException +import java.io.IOException class ChannelFragment : Fragment() { diff --git a/app/src/main/java/com/github/libretube/Home.kt b/app/src/main/java/com/github/libretube/fragments/Home.kt similarity index 98% rename from app/src/main/java/com/github/libretube/Home.kt rename to app/src/main/java/com/github/libretube/fragments/Home.kt index aeea5434f..c6972c0be 100644 --- a/app/src/main/java/com/github/libretube/Home.kt +++ b/app/src/main/java/com/github/libretube/fragments/Home.kt @@ -1,4 +1,4 @@ -package com.github.libretube +package com.github.libretube.fragments import android.os.Bundle import android.util.Log @@ -14,10 +14,11 @@ import androidx.preference.PreferenceManager import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import com.github.libretube.R import com.github.libretube.adapters.TrendingAdapter import com.github.libretube.util.RetrofitInstance -import java.io.IOException import retrofit2.HttpException +import java.io.IOException class Home : Fragment() { diff --git a/app/src/main/java/com/github/libretube/Library.kt b/app/src/main/java/com/github/libretube/fragments/Library.kt similarity index 98% rename from app/src/main/java/com/github/libretube/Library.kt rename to app/src/main/java/com/github/libretube/fragments/Library.kt index dd9029832..23bf12b9d 100644 --- a/app/src/main/java/com/github/libretube/Library.kt +++ b/app/src/main/java/com/github/libretube/fragments/Library.kt @@ -1,4 +1,4 @@ -package com.github.libretube +package com.github.libretube.fragments import android.content.Context import android.os.Bundle @@ -14,11 +14,12 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import com.github.libretube.R import com.github.libretube.adapters.PlaylistsAdapter import com.github.libretube.dialogs.CreatePlaylistDialog import com.github.libretube.util.RetrofitInstance -import java.io.IOException import retrofit2.HttpException +import java.io.IOException class Library : Fragment() { 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 16495a5c3..ccef5b6ad 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -82,11 +82,11 @@ import com.google.android.exoplayer2.util.RepeatModeUtil import com.google.android.material.button.MaterialButton import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.squareup.picasso.Picasso +import org.chromium.net.CronetEngine +import retrofit2.HttpException import java.io.IOException import java.util.concurrent.Executors import kotlin.math.abs -import org.chromium.net.CronetEngine -import retrofit2.HttpException var isFullScreen = false diff --git a/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt index d40038aaa..efdebacaf 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt @@ -15,8 +15,8 @@ import androidx.recyclerview.widget.RecyclerView import com.github.libretube.R import com.github.libretube.adapters.PlaylistAdapter import com.github.libretube.util.RetrofitInstance -import java.io.IOException import retrofit2.HttpException +import java.io.IOException class PlaylistFragment : Fragment() { private var playlist_id: String? = null 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 fd7a36619..3c23723ac 100644 --- a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt @@ -30,11 +30,11 @@ import com.github.libretube.adapters.SearchHistoryAdapter import com.github.libretube.hideKeyboard import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder -import java.io.IOException import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch import retrofit2.HttpException +import java.io.IOException class SearchFragment : Fragment() { private val TAG = "SearchFragment" diff --git a/app/src/main/java/com/github/libretube/Subscriptions.kt b/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt similarity index 99% rename from app/src/main/java/com/github/libretube/Subscriptions.kt rename to app/src/main/java/com/github/libretube/fragments/Subscriptions.kt index 56ee74638..1804774ad 100644 --- a/app/src/main/java/com/github/libretube/Subscriptions.kt +++ b/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt @@ -1,4 +1,4 @@ -package com.github.libretube +package com.github.libretube.fragments import android.content.Context import android.os.Bundle @@ -23,11 +23,12 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import com.github.libretube.R import com.github.libretube.adapters.SubscriptionAdapter import com.github.libretube.adapters.SubscriptionChannelAdapter import com.github.libretube.util.RetrofitInstance -import java.io.IOException import retrofit2.HttpException +import java.io.IOException class Subscriptions : Fragment() { val TAG = "SubFragment" 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 97e95c8f1..a07fba74f 100644 --- a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt +++ b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt @@ -32,6 +32,7 @@ class AboutFragment : Fragment() { val appVersion = view?.findViewById(R.id.app_version) appVersion.text = BuildConfig.VERSION_NAME + val website = view?.findViewById(R.id.website) website?.setOnClickListener { openLink("https://libre-tube.github.io/") 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 04bb1d33d..11c88e774 100644 --- a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt @@ -25,13 +25,13 @@ import com.github.libretube.isCurrentViewMainSettings import com.github.libretube.requireMainActivityRestart import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.ThemeHelper +import org.json.JSONObject +import org.json.JSONTokener +import retrofit2.HttpException import java.io.IOException import java.io.InputStream import java.util.zip.ZipEntry import java.util.zip.ZipInputStream -import org.json.JSONObject -import org.json.JSONTokener -import retrofit2.HttpException class MainSettings : PreferenceFragmentCompat() { val TAG = "SettingsFragment" diff --git a/app/src/main/java/com/github/libretube/Player.kt b/app/src/main/java/com/github/libretube/util/Player.kt similarity index 84% rename from app/src/main/java/com/github/libretube/Player.kt rename to app/src/main/java/com/github/libretube/util/Player.kt index d45d02092..fa2da370a 100644 --- a/app/src/main/java/com/github/libretube/Player.kt +++ b/app/src/main/java/com/github/libretube/util/Player.kt @@ -1,7 +1,8 @@ -package com.github.libretube +package com.github.libretube.util import android.app.Activity import android.os.Bundle +import com.github.libretube.R import com.google.android.material.color.DynamicColors class Player : Activity() { 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 7f4db01f3..127e65e3b 100644 --- a/app/src/main/java/com/github/libretube/util/UpdateChecker.kt +++ b/app/src/main/java/com/github/libretube/util/UpdateChecker.kt @@ -4,12 +4,12 @@ import android.util.Log import androidx.fragment.app.FragmentManager import com.github.libretube.BuildConfig import com.github.libretube.dialogs.UpdateAvailableDialog +import org.json.JSONArray +import org.json.JSONObject import java.io.BufferedReader import java.io.InputStreamReader import java.net.URL import javax.net.ssl.HttpsURLConnection -import org.json.JSONArray -import org.json.JSONObject fun checkUpdate(childFragmentManager: FragmentManager) { var updateInfo: UpdateInfo? = UpdateInfo("", "") diff --git a/app/src/main/res/drawable/ic_block.xml b/app/src/main/res/drawable/ic_block.xml index 20a2eb28a..bae4d16c2 100644 --- a/app/src/main/res/drawable/ic_block.xml +++ b/app/src/main/res/drawable/ic_block.xml @@ -6,8 +6,8 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M12,22.7994C11.55,22.7994 11.1,22.7094 10.74,22.4394 4.89,18.8394 1.29,12.6294 1.2,5.7894 1.2,4.8894 1.65,3.9894 2.46,3.5394 8.4,0.3894 15.6,0.3894 21.54,3.6294 22.35,3.9894 22.8,4.8894 22.8,5.7894 22.71,12.6294 19.11,18.8394 13.35,22.4394 12.9,22.7094 12.45,22.7994 12,22.7994ZM12,1.9194c-3.15,0 -6.3,0.81 -9.18,2.34 -0.54,0.27 -0.9,0.9 -0.9,1.53 0.09,6.57 3.51,12.51 9.18,16.02 0.54,0.36 1.26,0.36 1.8,0C18.57,18.3894 21.9,12.3594 22.08,5.7894 22.08,5.1594 21.72,4.5294 21.18,4.2594 18.3,2.7294 15.15,1.9194 12,1.9194Z" /> + android:pathData="M20.73,4.9794C15.24,2.0994 8.76,2.0994 3.27,4.9794 3,5.1594 2.82,5.4294 2.82,5.7894c0.09,6.48 3.51,12.06 8.73,15.3 0.27,0.18 0.63,0.18 0.9,0 5.13,-3.15 8.64,-8.82 8.73,-15.3C21.18,5.4294 21,5.1594 20.73,4.9794ZM9.66,15.1494L9.66,6.7794l7.29,4.23z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml index d6e350e99..61825d19d 100644 --- a/app/src/main/res/drawable/ic_download.xml +++ b/app/src/main/res/drawable/ic_download.xml @@ -4,7 +4,7 @@ android:viewportWidth="48" android:viewportHeight="48" android:tint="?android:attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_frame.xml b/app/src/main/res/drawable/ic_frame.xml index 3aa521fd9..a665fed39 100644 --- a/app/src/main/res/drawable/ic_frame.xml +++ b/app/src/main/res/drawable/ic_frame.xml @@ -4,7 +4,7 @@ android:viewportWidth="48" android:viewportHeight="48" android:tint="?android:attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_grid.xml b/app/src/main/res/drawable/ic_grid.xml index c9a29c607..add61c29f 100644 --- a/app/src/main/res/drawable/ic_grid.xml +++ b/app/src/main/res/drawable/ic_grid.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24" android:tint="?android:attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_hd.xml b/app/src/main/res/drawable/ic_hd.xml index c8f25fa7e..752aa24d1 100644 --- a/app/src/main/res/drawable/ic_hd.xml +++ b/app/src/main/res/drawable/ic_hd.xml @@ -4,7 +4,7 @@ android:viewportWidth="48" android:viewportHeight="48" android:tint="?android:attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml index 96fa6c47b..e4c976cea 100644 --- a/app/src/main/res/drawable/ic_info.xml +++ b/app/src/main/res/drawable/ic_info.xml @@ -4,7 +4,7 @@ android:viewportWidth="48" android:viewportHeight="48" android:tint="?android:attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xml index c70085b0b..4ca7cd869 100644 --- a/app/src/main/res/drawable/ic_list.xml +++ b/app/src/main/res/drawable/ic_list.xml @@ -6,5 +6,5 @@ android:tint="?attr/colorControlNormal"> + android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_server.xml b/app/src/main/res/drawable/ic_server.xml index 8a4904c59..05c9d5b44 100644 --- a/app/src/main/res/drawable/ic_server.xml +++ b/app/src/main/res/drawable/ic_server.xml @@ -4,7 +4,7 @@ android:viewportWidth="48" android:viewportHeight="48" android:tint="?android:attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_theme.xml b/app/src/main/res/drawable/ic_theme.xml index 49de893a4..49d92b710 100644 --- a/app/src/main/res/drawable/ic_theme.xml +++ b/app/src/main/res/drawable/ic_theme.xml @@ -4,7 +4,7 @@ android:viewportWidth="48" android:viewportHeight="48" android:tint="?android:attr/colorControlNormal"> - + diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml index e2d141a8d..35f81a257 100644 --- a/app/src/main/res/layout/activity_player.xml +++ b/app/src/main/res/layout/activity_player.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".Player" + tools:context=".util.Player" android:background="@android:color/black"> - + + android:layout_gravity="center" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index aff1dc0dd..250c8c74a 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".Home"> + tools:context=".fragments.Home"> + tools:context=".fragments.Library"> + tools:context=".fragments.Subscriptions"> - - - \ No newline at end of file diff --git a/app/src/main/res/navigation/nav.xml b/app/src/main/res/navigation/nav.xml index a8c74d80b..feba98acd 100644 --- a/app/src/main/res/navigation/nav.xml +++ b/app/src/main/res/navigation/nav.xml @@ -7,17 +7,17 @@ - + #AA000000 #EEFFFFFF diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml index 40474ad22..716307453 100644 --- a/app/src/main/res/xml/advanced_settings.xml +++ b/app/src/main/res/xml/advanced_settings.xml @@ -1,17 +1,17 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> - + Date: Wed, 8 Jun 2022 11:08:40 +0200 Subject: [PATCH 2/2] ktlint --- .../java/com/github/libretube/adapters/PlaylistAdapter.kt | 2 +- .../java/com/github/libretube/adapters/PlaylistsAdapter.kt | 2 +- .../github/libretube/adapters/SubscriptionChannelAdapter.kt | 2 +- .../com/github/libretube/dialogs/AddtoPlaylistDialog.kt | 2 +- .../com/github/libretube/dialogs/CreatePlaylistDialog.kt | 2 +- .../main/java/com/github/libretube/dialogs/LoginDialog.kt | 2 +- .../java/com/github/libretube/fragments/ChannelFragment.kt | 2 +- app/src/main/java/com/github/libretube/fragments/Home.kt | 2 +- app/src/main/java/com/github/libretube/fragments/Library.kt | 2 +- .../java/com/github/libretube/fragments/PlayerFragment.kt | 4 ++-- .../java/com/github/libretube/fragments/PlaylistFragment.kt | 2 +- .../java/com/github/libretube/fragments/SearchFragment.kt | 2 +- .../java/com/github/libretube/fragments/Subscriptions.kt | 2 +- .../java/com/github/libretube/preferences/MainSettings.kt | 6 +++--- .../main/java/com/github/libretube/util/UpdateChecker.kt | 4 ++-- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt index 4397101cb..3938ae50d 100644 --- a/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt @@ -20,10 +20,10 @@ import com.github.libretube.obj.PlaylistId import com.github.libretube.obj.StreamItem import com.github.libretube.util.RetrofitInstance import com.squareup.picasso.Picasso +import java.io.IOException import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import retrofit2.HttpException -import java.io.IOException class PlaylistAdapter( private val videoFeed: MutableList, 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 049e6565b..9aa860f27 100644 --- a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt @@ -17,10 +17,10 @@ import com.github.libretube.obj.Playlists import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.squareup.picasso.Picasso +import java.io.IOException import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import retrofit2.HttpException -import java.io.IOException class PlaylistsAdapter( private val playlists: MutableList, 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 fb06eda1b..ca8c24bef 100644 --- a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt @@ -15,11 +15,11 @@ import com.github.libretube.obj.Subscribe import com.github.libretube.obj.Subscription import com.github.libretube.util.RetrofitInstance import com.squareup.picasso.Picasso +import java.io.IOException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import retrofit2.HttpException -import java.io.IOException class SubscriptionChannelAdapter(private val subscriptions: MutableList) : RecyclerView.Adapter() { 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 126bdd7e0..80453c14b 100644 --- a/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt @@ -19,8 +19,8 @@ import com.github.libretube.R import com.github.libretube.obj.PlaylistId import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class AddtoPlaylistDialog : DialogFragment() { private val TAG = "AddToPlaylistDialog" diff --git a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt index 000bf1897..d33cf90ee 100644 --- a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt @@ -19,8 +19,8 @@ import com.github.libretube.obj.Playlists import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class CreatePlaylistDialog : DialogFragment() { val TAG = "CreatePlaylistDialog" diff --git a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt index 8d1cc33f8..ae27c5ca2 100644 --- a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt @@ -17,8 +17,8 @@ import com.github.libretube.R import com.github.libretube.obj.Login import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class LoginDialog : DialogFragment() { private val TAG = "LoginDialog" diff --git a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt index 61ea05aa1..bf33cecf6 100644 --- a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt @@ -22,8 +22,8 @@ import com.github.libretube.obj.Subscribe import com.github.libretube.util.RetrofitInstance import com.google.android.material.button.MaterialButton import com.squareup.picasso.Picasso -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class ChannelFragment : Fragment() { diff --git a/app/src/main/java/com/github/libretube/fragments/Home.kt b/app/src/main/java/com/github/libretube/fragments/Home.kt index c6972c0be..dd4c675c4 100644 --- a/app/src/main/java/com/github/libretube/fragments/Home.kt +++ b/app/src/main/java/com/github/libretube/fragments/Home.kt @@ -17,8 +17,8 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.github.libretube.R import com.github.libretube.adapters.TrendingAdapter import com.github.libretube.util.RetrofitInstance -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class Home : Fragment() { diff --git a/app/src/main/java/com/github/libretube/fragments/Library.kt b/app/src/main/java/com/github/libretube/fragments/Library.kt index 23bf12b9d..e8c2699d1 100644 --- a/app/src/main/java/com/github/libretube/fragments/Library.kt +++ b/app/src/main/java/com/github/libretube/fragments/Library.kt @@ -18,8 +18,8 @@ import com.github.libretube.R import com.github.libretube.adapters.PlaylistsAdapter import com.github.libretube.dialogs.CreatePlaylistDialog import com.github.libretube.util.RetrofitInstance -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class Library : Fragment() { 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 ccef5b6ad..16495a5c3 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -82,11 +82,11 @@ import com.google.android.exoplayer2.util.RepeatModeUtil import com.google.android.material.button.MaterialButton import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.squareup.picasso.Picasso -import org.chromium.net.CronetEngine -import retrofit2.HttpException import java.io.IOException import java.util.concurrent.Executors import kotlin.math.abs +import org.chromium.net.CronetEngine +import retrofit2.HttpException var isFullScreen = false diff --git a/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt index efdebacaf..d40038aaa 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt @@ -15,8 +15,8 @@ import androidx.recyclerview.widget.RecyclerView import com.github.libretube.R import com.github.libretube.adapters.PlaylistAdapter import com.github.libretube.util.RetrofitInstance -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class PlaylistFragment : Fragment() { private var playlist_id: String? = null 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 3c23723ac..fd7a36619 100644 --- a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt @@ -30,11 +30,11 @@ import com.github.libretube.adapters.SearchHistoryAdapter import com.github.libretube.hideKeyboard import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder +import java.io.IOException import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch import retrofit2.HttpException -import java.io.IOException class SearchFragment : Fragment() { private val TAG = "SearchFragment" diff --git a/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt b/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt index 1804774ad..8e18b9715 100644 --- a/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt +++ b/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt @@ -27,8 +27,8 @@ import com.github.libretube.R import com.github.libretube.adapters.SubscriptionAdapter import com.github.libretube.adapters.SubscriptionChannelAdapter import com.github.libretube.util.RetrofitInstance -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class Subscriptions : Fragment() { val TAG = "SubFragment" 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 11c88e774..04bb1d33d 100644 --- a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt @@ -25,13 +25,13 @@ import com.github.libretube.isCurrentViewMainSettings import com.github.libretube.requireMainActivityRestart import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.ThemeHelper -import org.json.JSONObject -import org.json.JSONTokener -import retrofit2.HttpException import java.io.IOException import java.io.InputStream import java.util.zip.ZipEntry import java.util.zip.ZipInputStream +import org.json.JSONObject +import org.json.JSONTokener +import retrofit2.HttpException class MainSettings : PreferenceFragmentCompat() { val TAG = "SettingsFragment" 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 127e65e3b..7f4db01f3 100644 --- a/app/src/main/java/com/github/libretube/util/UpdateChecker.kt +++ b/app/src/main/java/com/github/libretube/util/UpdateChecker.kt @@ -4,12 +4,12 @@ import android.util.Log import androidx.fragment.app.FragmentManager import com.github.libretube.BuildConfig import com.github.libretube.dialogs.UpdateAvailableDialog -import org.json.JSONArray -import org.json.JSONObject import java.io.BufferedReader import java.io.InputStreamReader import java.net.URL import javax.net.ssl.HttpsURLConnection +import org.json.JSONArray +import org.json.JSONObject fun checkUpdate(childFragmentManager: FragmentManager) { var updateInfo: UpdateInfo? = UpdateInfo("", "")