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

Merge pull request #84 from aayush2622/dev

Browse source 
some changes
This commit is contained in:
rebel onion 2023-12-14 18:06:11 -06:00 • committed by GitHub
commit dfc10d5520
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 183 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
View file

@ -75,6 +75,12 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
textInputLayout.boxBackgroundColor = (color and 0x00FFFFFF) or 0x28000000.toInt()
materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000.toInt())
}
val incognito = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
?.getBoolean("incognito", false) ?: false
if(incognito) {
binding.incognitoTextView.visibility = View.VISIBLE
binding.incognitoView.visibility = View.VISIBLE
}
binding.animeTitleContainer.updatePadding(top = statusBarHeight)

11
app/src/main/java/ani/dantotsu/home/HomeFragment.kt
View file

@ -1,6 +1,8 @@
package ani.dantotsu.home
import android.animation.ObjectAnimator
import android.content.Context
import android.content.ContextWrapper
import android.content.Intent
import android.graphics.drawable.Animatable
import android.os.Build
@ -19,6 +21,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import ani.dantotsu.App
import ani.dantotsu.R
import ani.dantotsu.Refresh
import ani.dantotsu.bottomBar
@ -71,6 +74,7 @@ class HomeFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
val scope = lifecycleScope
var uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
fun load() {
if (activity != null && _binding != null) lifecycleScope.launch(Dispatchers.Main) {
binding.homeUserName.text = Anilist.username
@ -111,7 +115,12 @@ class HomeFragment : Fragment() {
snackString(currContext()?.getString(R.string.please_reload))
}
}
val incognito = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
?.getBoolean("incognito", false) ?: false
if(incognito) {
binding.incognitoTextView.visibility = View.VISIBLE
binding.incognitoView.visibility = View.VISIBLE
}
binding.homeUserAvatarContainer.setSafeOnClickListener {
val dialogFragment =
SettingsDialogFragment.newInstance(SettingsDialogFragment.Companion.PageType.HOME)

7
app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
View file

@ -75,6 +75,13 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000.toInt())
}
val incognito = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
?.getBoolean("incognito", false) ?: false
if(incognito) {
binding.incognitoTextView.visibility = View.VISIBLE
binding.incognitoView.visibility = View.VISIBLE
}
binding.mangaTitleContainer.updatePadding(top = statusBarHeight)
if (uiSettings.smallView) binding.mangaTrendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {

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

@ -1101,7 +1101,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
if (settings.cursedSpeeds)
arrayOf(1f, 1.25f, 1.5f, 1.75f, 2f, 2.5f, 3f, 4f, 5f, 10f, 25f, 50f)
else
arrayOf(0.25f, 0.33f, 0.5f, 0.66f, 0.75f, 1f, 1.25f, 1.33f, 1.5f, 1.66f, 1.75f, 2f)
arrayOf(0.25f, 0.33f, 0.5f, 0.66f, 0.75f, 1f, 1.15f, 1.25f, 1.33f, 1.5f, 1.66f, 1.75f, 2f)
val speedsName = speeds.map { "${it}x" }.toTypedArray()
var curSpeed = loadData("${media.id}_speed", this) ?: settings.defaultSpeed
@ -1156,14 +1156,18 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
}
preloading = false
val incognito = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
?.getBoolean("incognito", false) ?: false
val showProgressDialog =
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.MyPopup)
.setTitle(getString(R.string.auto_update, media.userPreferredName))
.setMessage(getString(R.string.incognito_will_not_update))
.apply {
if (incognito) {
setMessage(getString(R.string.incognito_will_not_update))
}
setOnCancelListener { hideSystemBars() }
setCancelable(false)
setPositiveButton(getString(R.string.yes)) { dialog, _ ->

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

@ -3,6 +3,7 @@ package ani.dantotsu.media.manga.mangareader
import android.animation.ObjectAnimator
import android.annotation.SuppressLint
import android.app.AlertDialog
import android.content.Context
import android.content.Intent
import android.content.res.Configuration
import android.graphics.Bitmap
@ -796,6 +797,7 @@ class MangaReaderActivity : AppCompatActivity() {
private fun progress(runnable: Runnable) {
if (maxChapterPage - currentChapterPage <= 1 && Anilist.userid != null) {
if (showProgressDialog) {
val dialogView = layoutInflater.inflate(R.layout.item_custom_dialog, null)
val checkbox = dialogView.findViewById<CheckBox>(R.id.dialog_checkbox)
checkbox.text = getString(R.string.dont_ask_again, media.userPreferredName)
@ -803,9 +805,15 @@ class MangaReaderActivity : AppCompatActivity() {
saveData("${media.id}_progressDialog", isChecked)
showProgressDialog = !isChecked
}
val incognito = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
?.getBoolean("incognito", false) ?: false
AlertDialog.Builder(this, R.style.MyPopup)
.setTitle(getString(R.string.title_update_progress))
.apply {
if (incognito) {
setMessage(getString(R.string.incognito_will_not_update))
}
}
.setView(dialogView)
.setCancelable(false)
.setPositiveButton(getString(R.string.yes)) { dialog, _ ->

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

@ -62,7 +62,7 @@ class ListActivity : AppCompatActivity() {
binding.listTabLayout.setTabTextColors(secondaryTextColor, primaryTextColor)
binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
val uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
if (!uiSettings.immersiveMode) {
if (!uiSettings.immersiveModeList) {
this.window.statusBarColor =
ContextCompat.getColor(this, R.color.nav_bg_inv)
binding.root.fitsSystemWindows = true

2
app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt
View file

@ -97,7 +97,7 @@ class PlayerSettingsActivity : AppCompatActivity() {
val speeds =
arrayOf(0.25f, 0.33f, 0.5f, 0.66f, 0.75f, 1f, 1.25f, 1.33f, 1.5f, 1.66f, 1.75f, 2f)
arrayOf(0.25f, 0.33f, 0.5f, 0.66f, 0.75f, 1f, 1.15f, 1.25f, 1.33f, 1.5f, 1.66f, 1.75f, 2f)
val cursedSpeeds = arrayOf(1f, 1.25f, 1.5f, 1.75f, 2f, 2.5f, 3f, 4f, 5f, 10f, 25f, 50f)
var curSpeedArr = if (settings.cursedSpeeds) cursedSpeeds else speeds
var speedsName = curSpeedArr.map { "${it}x" }.toTypedArray()

1
app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
View file

@ -408,6 +408,7 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListen
binding.settingsIncognito.setOnCheckedChangeListener { _, isChecked ->
getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit()
.putBoolean("incognito", isChecked).apply()
restartApp()
}
var previousStart: View = when (uiSettings.defaultStartUpTab) {

16
app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
View file

@ -113,19 +113,9 @@ class SettingsDialogFragment() : BottomSheetDialogFragment() {
}
PageType.HOME -> {
try {
val arrayOfFiles =
ContextCompat.getExternalFilesDirs(requireContext(), null)
startActivity(
if (loadData<Boolean>("sd_dl") == true && arrayOfFiles.size > 1 && arrayOfFiles[0] != null && arrayOfFiles[1] != null) {
val parentDirectory = arrayOfFiles[1].toString()
val intent = Intent(Intent.ACTION_VIEW)
intent.setDataAndType(Uri.parse(parentDirectory), "resource/folder")
} else Intent(DownloadManager.ACTION_VIEW_DOWNLOADS)
)
} catch (e: ActivityNotFoundException) {
toast(getString(R.string.file_manager_not_found))
}
val intent = Intent(activity, DownloadContainerActivity::class.java)
intent.putExtra("FRAGMENT_CLASS_NAME", OfflineMangaFragment::class.java.name)
startActivity(intent)
}
}

1
app/src/main/java/ani/dantotsu/settings/UserInterfaceSettings.kt
View file

@ -10,6 +10,7 @@ data class UserInterfaceSettings(
//App
var immersiveMode: Boolean = false,
var immersiveModeList: Boolean = false,
var smallView: Boolean = true,
var defaultStartUpTab: Int = 1,
var homeLayoutShow: MutableList<Boolean> = mutableListOf(

6
app/src/main/java/ani/dantotsu/settings/UserInterfaceSettingsActivity.kt
View file

@ -68,6 +68,12 @@ class UserInterfaceSettingsActivity : AppCompatActivity() {
saveData(ui, settings)
restartApp()
}
binding.uiSettingsImmersiveList.isChecked = settings.immersiveModeList
binding.uiSettingsImmersiveList.setOnCheckedChangeListener { _, isChecked ->
settings.immersiveModeList = isChecked
saveData(ui, settings)
restartApp()
}
binding.uiSettingsBannerAnimation.isChecked = settings.bannerAnimations
binding.uiSettingsBannerAnimation.setOnCheckedChangeListener { _, isChecked ->

2
app/src/main/res/drawable/ic_round_delete_24.xml
View file

@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
android:viewportWidth="24" android:width="24dp" android:tint="?attr/colorControlNormal" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
</vector>

14
app/src/main/res/layout/activity_list.xml
View file

@ -28,21 +28,19 @@
<TextView
android:id="@+id/listTitle"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:layout_marginStart="32dp"
android:fontFamily="@font/poppins_bold"
android:gravity="center"
android:gravity="center|start"
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
android:textSize="16sp"
android:singleLine="true"
android:textColor="?attr/colorOnBackground"
android:ellipsize="end"
tools:text="@string/app_name" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<ImageButton
android:id="@+id/random"
android:layout_width="48dp"

22
app/src/main/res/layout/activity_user_interface_settings.xml
View file

@ -121,6 +121,28 @@
</com.google.android.material.switchmaterial.SwitchMaterial>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/uiSettingsImmersiveList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:checked="true"
android:drawableStart="@drawable/ic_round_fullscreen_24"
android:drawablePadding="16dp"
app:drawableTint="?attr/colorPrimary"
android:elegantTextHeight="true"
android:fontFamily="@font/poppins_bold"
android:minHeight="64dp"
android:paddingStart="32dp"
android:paddingEnd="32dp"
android:text="@string/immersive_modelist"
android:textAlignment="viewStart"
android:textColor="?attr/colorOnBackground"
app:cornerRadius="0dp"
app:showText="false"
app:thumbTint="@color/button_switch_track">
</com.google.android.material.switchmaterial.SwitchMaterial>
<View
android:layout_width="match_parent"
android:layout_height="1dp"

21
app/src/main/res/layout/fragment_home.xml
View file

@ -12,17 +12,34 @@
android:id="@+id/homeScroll"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/homeContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/incognitoView"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:orientation="horizontal"
android:visibility="gone"/>
<TextView
android:id="@+id/incognitoTextView"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="Incognito Mode"
android:fontFamily="@font/poppins_bold"
android:textSize="11sp"
android:textColor="#4f2dbd"
android:layout_gravity="bottom|center_horizontal"
android:background="#00FFFFFF"
android:padding="8dp"
android:visibility="gone"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.flaviofaria.kenburnsview.KenBurnsView
android:id="@+id/homeUserBg"
android:layout_width="match_parent"

19
app/src/main/res/layout/item_anime_page.xml
View file

@ -8,7 +8,26 @@
android:layout_marginStart="-16dp"
android:layout_marginEnd="-16dp"
android:orientation="vertical">
<LinearLayout
android:id="@+id/incognitoView"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:orientation="horizontal"
android:background="?attr/colorPrimary"
android:visibility="gone"/>
<TextView
android:id="@+id/incognitoTextView"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="Incognito Mode"
android:fontFamily="@font/poppins_bold"
android:textSize="11sp"
android:textColor="#4f2dbd"
android:layout_gravity="bottom|center_horizontal"
android:background="#00FFFFFF"
android:padding="8dp"
android:visibility="gone"/>
<FrameLayout
android:id="@+id/animeTrendingContainer"
android:layout_width="match_parent"

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

@ -30,10 +30,9 @@
android:text="@string/play_yt"
android:textColor="@color/bg_white"
android:fontFamily="@font/poppins_bold"
android:visibility="gone"
app:cornerRadius="12dp"
app:icon="@drawable/ic_round_play_circle_24"
app:iconTint="?attr/colorOnSecondaryContainer"
app:iconTint="@color/bg_white"
tools:ignore="TextContrastCheck" />
<TextView

105
app/src/main/res/layout/item_chapter_list.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -8,60 +8,60 @@
android:background="@drawable/card_outline"
app:cardCornerRadius="12dp">
<LinearLayout
android:layout_width="312dp"
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:gravity="center_vertical"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/listAppBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
android:theme="@style/Theme.Dantotsu.AppBarOverlay">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="@font/poppins_bold"
android:singleLine="true"
android:text=""
android:textSize="14dp"
tools:ignore="SpUsage" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text=""
android:textSize="14dp"
tools:ignore="SpUsage" />
android:layout_width="match_parent"
android:layout_height="65dp"
android:orientation="horizontal"
android:gravity="center">
<TextView
android:id="@+id/itemChapterNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="48dp"
android:layout_marginStart="10dp"
android:fontFamily="@font/poppins_bold"
android:maxWidth="250dp"
android:paddingEnd="8dp"
android:gravity="center|start"
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
android:textSize="16sp"
android:singleLine="true"
android:textSize="14dp"
tools:ignore="SpUsage"
android:textColor="?attr/colorOnBackground"
android:ellipsize="end"
tools:text="1" />
</LinearLayout>
<ImageButton
android:id="@+id/itemEpisodeViewed"
android:layout_width="24dp"
android:layout_height="48dp"
android:layout_marginEnd="5dp"
android:background="?android:attr/selectableItemBackground"
app:tint="?attr/colorOnBackground"
app:srcCompat="@drawable/ic_round_remove_red_eye_24" />
<ImageButton
android:id="@+id/itemDownload"
android:layout_width="24dp"
android:layout_height="48dp"
android:layout_marginEnd="5dp"
android:background="?android:attr/selectableItemBackground"
app:tint="?attr/colorOnBackground"
app:srcCompat="@drawable/ic_round_download_24" />
</LinearLayout>
<TextView
android:id="@+id/itemChapterTitle"
android:layout_width="312dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="-10dp"
android:layout_marginBottom="10dp"
android:alpha="0.66"
android:ellipsize="end"
android:fontFamily="@font/poppins_bold"
@ -69,17 +69,7 @@
android:textSize="14dp"
android:visibility="gone"
tools:ignore="SpUsage" />
</LinearLayout>
<ImageView
android:id="@+id/itemDownload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="8dp"
app:srcCompat="@drawable/ic_round_download_24"
tools:ignore="ContentDescription" />
</com.google.android.material.appbar.AppBarLayout>
<View
android:id="@+id/itemEpisodeViewedCover"
@ -89,13 +79,4 @@
android:background="?android:colorBackground"
android:visibility="gone" />
<ImageView
android:id="@+id/itemEpisodeViewed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="40dp"
app:srcCompat="@drawable/ic_round_remove_red_eye_24"
tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView>

9
app/src/main/res/layout/item_custom_dialog.xml
View file

@ -6,15 +6,6 @@
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/dialog_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/incognito_will_not_update"
android:paddingBottom="16dp"
android:textSize="12sp"
android:fontFamily="@font/poppins_bold"/>
<CheckBox
android:id="@+id/dialog_checkbox"
android:layout_width="match_parent"

19
app/src/main/res/layout/item_manga_page.xml
View file

@ -8,7 +8,26 @@
android:layout_marginStart="-16dp"
android:layout_marginEnd="-16dp"
android:orientation="vertical">
<LinearLayout
android:id="@+id/incognitoView"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:orientation="horizontal"
android:background="?attr/colorPrimary"
android:visibility="gone"/>
<TextView
android:id="@+id/incognitoTextView"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="Incognito Mode"
android:fontFamily="@font/poppins_bold"
android:textSize="11sp"
android:textColor="#4f2dbd"
android:layout_gravity="bottom|center_horizontal"
android:background="#00FFFFFF"
android:padding="8dp"
android:visibility="gone"/>
<FrameLayout
android:id="@+id/mangaTrendingContainer"
android:layout_width="match_parent"

1
app/src/main/res/values/strings.xml
View file

@ -267,6 +267,7 @@
<string name="app">App</string>
<string name="immersive_mode">Hide Status Bar</string>
<string name="immersive_modelist">Hide Status Bar for list</string>
<string name="immersive_mode_info">Requires App restart to fully apply.</string>
<string name="home_layout_show">Show/Hide Layouts on Home</string>
<string-array name="home_layouts">

1
app/src/main/res/values/style.xml
View file

@ -67,7 +67,6 @@
<item name="android:windowIsFloating">true</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:textSize">14sp</item>
</style>
<style name="BottomNavBar" parent="">