rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/rebelonion/Dantotsu into dev

Browse source
This commit is contained in:
Finnley Somdahl 2023-11-26 21:16:02 -06:00
commit c2a07278fc
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/ani/dantotsu/media/SearchFilterBottomDialog.kt
View file

@ -99,7 +99,7 @@ class SearchFilterBottomDialog() : BottomSheetDialogFragment() {
ArrayAdapter(
binding.root.context,
R.layout.item_dropdown,
(1970 until 2024).map { it.toString() }.reversed().toTypedArray()
(1970 until 2025).map { it.toString() }.reversed().toTypedArray()
)
)
}

2
app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
View file

@ -1151,7 +1151,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
if (settings.askIndividual) loadData<Boolean>("${media.id}_progressDialog")
?: true else false
if (showProgressDialog && Anilist.userid != null && if (media.isAdult) settings.updateForH else true)
AlertDialog.Builder(this, R.style.DialogTheme)
AlertDialog.Builder(this, R.style.MyPopup)
.setTitle(getString(R.string.auto_update, media.userPreferredName))
.apply {
setOnCancelListener { hideSystemBars() }

2
app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt
View file

@ -245,7 +245,7 @@ ThemeManager(this).applyTheme()
showProgressDialog = if (settings.askIndividual) loadData<Boolean>("${media.id}_progressDialog") != true else false
progressDialog =
if (showProgressDialog && Anilist.userid != null && if (media.isAdult) settings.updateForH else true)
AlertDialog.Builder(this, R.style.DialogTheme).setTitle(getString(R.string.title_update_progress)).apply {
AlertDialog.Builder(this, R.style.MyPopup).setTitle(getString(R.string.title_update_progress)).apply {
setMultiChoiceItems(
arrayOf(getString(R.string.dont_ask_again, media.userPreferredName)),
booleanArrayOf(false)

3
app/src/main/res/layout/activity_image_search.xml
View file

@ -2,7 +2,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="fill_parent">
android:layout_height="fill_parent"
android:fitsSystemWindows="true">
<LinearLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/bottom_sheet_selector.xml
View file

@ -55,7 +55,7 @@
android:insetBottom="0dp"
android:padding="8dp"
android:text="@android:string/cancel"
android:textColor="?attr/colorOnPrimary"
android:textColor="?attr/colorPrimary"
android:textSize="16sp"
app:cornerRadius="16dp" />