From de91f1f3fa3f560b8446dc55747c151d502ab08c Mon Sep 17 00:00:00 2001 From: rebelonion <87634197+rebelonion@users.noreply.github.com> Date: Tue, 23 Jan 2024 01:23:47 -0600 Subject: [PATCH] idk some fixes or smth --- app/src/main/java/ani/dantotsu/Functions.kt | 7 +++++++ app/src/main/java/ani/dantotsu/MainActivity.kt | 4 ++-- .../ani/dantotsu/media/anime/ExoplayerView.kt | 18 ++++++++++++------ .../ani/dantotsu/others/CustomBottomDialog.kt | 5 +---- app/src/main/res/layout/item_chapter_list.xml | 2 +- .../main/res/layout/item_episode_compact.xml | 5 +++++ app/src/main/res/layout/item_episode_list.xml | 1 + app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/themes.xml | 2 +- 9 files changed, 31 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt index da5b5e1f..9578aed6 100644 --- a/app/src/main/java/ani/dantotsu/Functions.kt +++ b/app/src/main/java/ani/dantotsu/Functions.kt @@ -15,6 +15,7 @@ import android.content.res.Configuration import android.content.res.Resources.getSystem import android.graphics.Bitmap import android.graphics.Color +import android.graphics.drawable.ColorDrawable import android.media.MediaScannerConnection import android.net.ConnectivityManager import android.net.NetworkCapabilities.* @@ -25,6 +26,7 @@ import android.telephony.TelephonyManager import android.text.InputFilter import android.text.Spanned import android.util.AttributeSet +import android.util.TypedValue import android.view.* import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import android.view.animation.* @@ -48,6 +50,7 @@ import ani.dantotsu.media.Media import ani.dantotsu.parsers.ShowResponse import ani.dantotsu.settings.UserInterfaceSettings import ani.dantotsu.subcriptions.NotificationClickReceiver +import ani.dantotsu.themes.ThemeManager import com.bumptech.glide.Glide import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade @@ -211,6 +214,10 @@ open class BottomSheetDialogFragment : BottomSheetDialogFragment() { val behavior = BottomSheetBehavior.from(requireView().parent as View) behavior.state = BottomSheetBehavior.STATE_EXPANDED } + val typedValue = TypedValue() + val theme = requireContext().theme + theme.resolveAttribute(com.google.android.material.R.attr.colorOnSurfaceInverse, typedValue, true) + window.navigationBarColor = typedValue.data } override fun show(manager: FragmentManager, tag: String?) { diff --git a/app/src/main/java/ani/dantotsu/MainActivity.kt b/app/src/main/java/ani/dantotsu/MainActivity.kt index 2be1a87d..fdd30840 100644 --- a/app/src/main/java/ani/dantotsu/MainActivity.kt +++ b/app/src/main/java/ani/dantotsu/MainActivity.kt @@ -213,13 +213,13 @@ class MainActivity : AppCompatActivity() { } } - val offline = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) + val offlineMode = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) .getBoolean("offlineMode", false) if (!isOnline(this)) { snackString(this@MainActivity.getString(R.string.no_internet_connection)) startActivity(Intent(this, NoInternet::class.java)) } else { - if (offline) { + if (offlineMode) { snackString(this@MainActivity.getString(R.string.no_internet_connection)) startActivity(Intent(this, NoInternet::class.java)) } else { diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt index ee5baedf..29aae29f 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt @@ -969,6 +969,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL exoPlayer.currentPosition, this ) + exoPlayer.seekTo(0) val prev = episodeArr[currentEpisodeIndex] isTimeStampsLoaded = false episodeLength = 0f @@ -1472,7 +1473,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL try { - mediaSession = MediaSession.Builder(this, exoPlayer).build() + val rightNow = Calendar.getInstance() + mediaSession = MediaSession.Builder(this, exoPlayer) + .setId(rightNow.timeInMillis.toString()) + .build() } catch (e: Exception) { toast(e.toString()) } @@ -1556,11 +1560,13 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL if (castPlayer?.isPlaying == false) { playerView.player?.pause() } - saveData( - "${media.id}_${media.anime!!.selectedEpisode}", - exoPlayer.currentPosition, - this - ) + if (exoPlayer.currentPosition > 5000) { + saveData( + "${media.id}_${media.anime!!.selectedEpisode}", + exoPlayer.currentPosition, + this + ) + } } } diff --git a/app/src/main/java/ani/dantotsu/others/CustomBottomDialog.kt b/app/src/main/java/ani/dantotsu/others/CustomBottomDialog.kt index e5446bd0..d95d56cb 100644 --- a/app/src/main/java/ani/dantotsu/others/CustomBottomDialog.kt +++ b/app/src/main/java/ani/dantotsu/others/CustomBottomDialog.kt @@ -7,6 +7,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import ani.dantotsu.BottomSheetDialogFragment +import ani.dantotsu.R import ani.dantotsu.databinding.BottomSheetCustomBinding open class CustomBottomDialog : BottomSheetDialogFragment() { @@ -55,10 +56,6 @@ open class CustomBottomDialog : BottomSheetDialogFragment() { _binding = BottomSheetCustomBinding.inflate(inflater, container, false) val window = dialog?.window window?.statusBarColor = Color.TRANSPARENT - val typedValue = TypedValue() - val theme = requireContext().theme - theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true) - window?.navigationBarColor = typedValue.data return binding.root } diff --git a/app/src/main/res/layout/item_chapter_list.xml b/app/src/main/res/layout/item_chapter_list.xml index 1cf2f099..7588bcd4 100644 --- a/app/src/main/res/layout/item_chapter_list.xml +++ b/app/src/main/res/layout/item_chapter_list.xml @@ -12,7 +12,7 @@ android:id="@+id/listAppBar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorSurface" + android:background="?attr/colorSurfaceVariant" android:theme="@style/Theme.Dantotsu.AppBarOverlay"> + + @color/md_theme_dark_5_surfaceVariant @color/md_theme_dark_5_onSurfaceVariant @color/md_theme_dark_5_outline - @color/md_theme_dark_5_inverseOnSurface + @color/md_theme_dark_5_surface @color/md_theme_dark_5_inverseSurface @color/md_theme_dark_5_inversePrimary diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 7d231359..4e4aa8c8 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -223,7 +223,7 @@ @color/md_theme_light_5_surfaceVariant @color/md_theme_light_5_onSurfaceVariant @color/md_theme_light_5_outline - @color/md_theme_light_5_inverseOnSurface + @color/md_theme_light_5_surface @color/md_theme_light_5_inverseSurface @color/md_theme_light_5_inversePrimary