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

fix: what does the fix say? 🦊

Browse source
This commit is contained in:
rebelonion 2024-05-25 08:37:16 -05:00
parent 37949c7e8e
commit 7717974b9e
8 changed files with 436 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,8 @@ import ani.dantotsu.navBarHeight
import ani.dantotsu.profile.User import ani.dantotsu.profile.User
import ani.dantotsu.settings.saving.PrefManager import ani.dantotsu.settings.saving.PrefManager
import ani.dantotsu.statusBarHeight import ani.dantotsu.statusBarHeight
import ani.dantotsu.toast
import ani.dantotsu.util.Logger
class StatusActivity : AppCompatActivity(), StoriesCallback { class StatusActivity : AppCompatActivity(), StoriesCallback {
private lateinit var activity: ArrayList<User> private lateinit var activity: ArrayList<User>
@ -44,10 +46,14 @@ class StatusActivity : AppCompatActivity(), StoriesCallback {
val key = "activities" val key = "activities"
val watchedActivity = PrefManager.getCustomVal<Set<Int>>(key, setOf()) val watchedActivity = PrefManager.getCustomVal<Set<Int>>(key, setOf())
if (activity.getOrNull(position) != null) {
val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity ) val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity )
val startIndex = if ( startFrom > 0) startFrom else 0 val startIndex = if ( startFrom > 0) startFrom else 0
binding.stories.setStoriesList(activity[position].activity, this, startIndex + 1) binding.stories.setStoriesList(activity[position].activity, this, startIndex + 1)
} else {
Logger.log("index out of bounds for position $position of size ${activity.size}")
finish()
}
} }
private fun findFirstNonMatch(watchedActivity: Set<Int>, activity: List<Activity>): Int { private fun findFirstNonMatch(watchedActivity: Set<Int>, activity: List<Activity>): Int {
@ -58,12 +64,15 @@ class StatusActivity : AppCompatActivity(), StoriesCallback {
} }
return -1 return -1
} }
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
binding.stories.pause() binding.stories.pause()
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (hasWindowFocus())
binding.stories.resume() binding.stories.resume()
} }

1
app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
View file

@ -424,6 +424,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
} }
override fun onResume() { override fun onResume() {
if (::navBar.isInitialized)
navBar.selectTabAt(selected) navBar.selectTabAt(selected)
super.onResume() super.onResume()
} }

8
app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt
View file

@ -43,6 +43,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import java.util.Locale
class ExtensionsActivity : AppCompatActivity() { class ExtensionsActivity : AppCompatActivity() {
lateinit var binding: ActivityExtensionsBinding lateinit var binding: ActivityExtensionsBinding
@ -173,8 +174,11 @@ class ExtensionsActivity : AppCompatActivity() {
initActivity(this) initActivity(this)
binding.languageselect.setOnClickListener { binding.languageselect.setOnClickListener {
val languageOptions = val languageOptions =
LanguageMapper.Companion.Language.entries.map { it.name }.toTypedArray() LanguageMapper.Companion.Language.entries.map { entry ->
val builder = AlertDialog.Builder(currContext(), R.style.MyPopup) entry.name.lowercase().replace("_", " ")
.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() }
}.toTypedArray()
val builder = AlertDialog.Builder(this, R.style.MyPopup)
val listOrder: String = PrefManager.getVal(PrefName.LangSort) val listOrder: String = PrefManager.getVal(PrefName.LangSort)
val index = LanguageMapper.Companion.Language.entries.toTypedArray() val index = LanguageMapper.Companion.Language.entries.toTypedArray()
.indexOfFirst { it.code == listOrder } .indexOfFirst { it.code == listOrder }

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

@ -6,6 +6,7 @@ import androidx.core.app.NotificationCompat
import ani.dantotsu.R import ani.dantotsu.R
import ani.dantotsu.connections.crashlytics.CrashlyticsInterface import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
import ani.dantotsu.snackString import ani.dantotsu.snackString
import ani.dantotsu.util.Logger
import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.data.notification.Notifications
import eu.kanade.tachiyomi.extension.InstallStep import eu.kanade.tachiyomi.extension.InstallStep
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
@ -30,6 +31,7 @@ class InstallerSteps(
fun onError(error: Throwable, extra: () -> Unit) { fun onError(error: Throwable, extra: () -> Unit) {
Injekt.get<CrashlyticsInterface>().logException(error) Injekt.get<CrashlyticsInterface>().logException(error)
Logger.log(error)
val builder = NotificationCompat.Builder( val builder = NotificationCompat.Builder(
context, context,
Notifications.CHANNEL_DOWNLOADER_ERROR Notifications.CHANNEL_DOWNLOADER_ERROR

390
app/src/main/res/layout-land/activity_calc.xml Normal file
View file

@ -0,0 +1,390 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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"
android:layout_height="match_parent"
android:background="@color/bg">
<LinearLayout
android:id="@+id/mainContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@color/bg"
android:baselineAligned="false"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/displayContainer"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_marginTop="16dp"
android:orientation="vertical">
<TextView
android:id="@+id/display"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@drawable/rounded_top_corners"
android:gravity="end"
android:maxLines="2"
app:autoSizeMaxTextSize="48sp"
app:autoSizeMinTextSize="10sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="?attr/colorOnSurfaceVariant"
android:textSize="48sp"
tools:ignore="ButtonStyle,HardcodedText" />
<TextView
android:id="@+id/displayBinary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="2dp"
android:background="?attr/colorSurfaceVariant"
android:gravity="end"
android:maxLines="2"
app:autoSizeMaxTextSize="48sp"
app:autoSizeMinTextSize="10sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="?attr/colorOnSurfaceVariant"
android:textSize="28sp"
tools:ignore="ButtonStyle,HardcodedText" />
<TextView
android:id="@+id/displayHex"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="2dp"
android:background="@drawable/rounded_bottom_corners"
android:gravity="end"
android:maxLines="2"
app:autoSizeMaxTextSize="48sp"
app:autoSizeMinTextSize="10sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="?attr/colorOnSurfaceVariant"
android:textSize="28sp"
tools:ignore="ButtonStyle,HardcodedText" />
</LinearLayout>
<LinearLayout
android:id="@+id/buttonContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="horizontal">
<Button
android:id="@+id/button7"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="7"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/button8"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="8"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/button9"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="9"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/buttonDivide"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginStart="16dp"
android:backgroundTint="?attr/colorPrimary"
android:elegantTextHeight="true"
android:text="÷"
android:textColor="?attr/colorOnPrimary"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="horizontal">
<Button
android:id="@+id/button4"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="4"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/button5"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="5"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/button6"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="6"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/buttonMultiply"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginStart="16dp"
android:backgroundTint="?attr/colorPrimary"
android:elegantTextHeight="true"
android:text="×"
android:textColor="?attr/colorOnPrimary"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="horizontal">
<Button
android:id="@+id/button1"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="1"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/button2"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="2"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/button3"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="3"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/buttonSubtract"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginStart="16dp"
android:backgroundTint="?attr/colorPrimary"
android:elegantTextHeight="true"
android:text="−"
android:textColor="?attr/colorOnPrimary"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="horizontal">
<Button
android:id="@+id/button0"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="0"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/buttonDot"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="."
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/buttonBackspace"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:backgroundTint="?attr/colorSurfaceVariant"
android:elegantTextHeight="true"
android:text="⌫"
android:textColor="?attr/colorOnSurfaceVariant"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/buttonAdd"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginStart="16dp"
android:backgroundTint="?attr/colorPrimary"
android:elegantTextHeight="true"
android:text="+"
android:textColor="?attr/colorOnPrimary"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="16dp"
android:orientation="horizontal">
<Button
android:id="@+id/buttonClear"
android:layout_width="70dp"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:backgroundTint="?attr/colorPrimary"
android:elegantTextHeight="true"
android:text="C"
android:textColor="?attr/colorOnPrimary"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
<Button
android:id="@+id/buttonEquals"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_gravity="bottom|end"
android:layout_marginTop="16dp"
android:backgroundTint="?attr/colorPrimary"
android:elegantTextHeight="true"
android:text="="
android:textColor="?attr/colorOnPrimary"
app:cornerRadius="16dp"
android:textSize="20sp"
android:textStyle="bold"
tools:ignore="ButtonStyle,HardcodedText" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</FrameLayout>

16
app/src/main/res/layout/activity_calc.xml
View file

@ -33,6 +33,10 @@
android:background="@drawable/rounded_top_corners" android:background="@drawable/rounded_top_corners"
android:gravity="end" android:gravity="end"
android:maxLines="1" android:maxLines="1"
app:autoSizeMaxTextSize="48sp"
app:autoSizeMinTextSize="10sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="?attr/colorOnSurfaceVariant" android:textColor="?attr/colorOnSurfaceVariant"
android:textSize="48sp" android:textSize="48sp"
tools:ignore="ButtonStyle,HardcodedText" /> tools:ignore="ButtonStyle,HardcodedText" />
@ -46,7 +50,11 @@
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:background="?attr/colorSurfaceVariant" android:background="?attr/colorSurfaceVariant"
android:gravity="end" android:gravity="end"
android:maxLines="1" android:maxLines="2"
app:autoSizeMaxTextSize="48sp"
app:autoSizeMinTextSize="10sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="?attr/colorOnSurfaceVariant" android:textColor="?attr/colorOnSurfaceVariant"
android:textSize="28sp" android:textSize="28sp"
tools:ignore="ButtonStyle,HardcodedText" /> tools:ignore="ButtonStyle,HardcodedText" />
@ -60,7 +68,11 @@
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:background="@drawable/rounded_bottom_corners" android:background="@drawable/rounded_bottom_corners"
android:gravity="end" android:gravity="end"
android:maxLines="1" android:maxLines="2"
app:autoSizeMaxTextSize="48sp"
app:autoSizeMinTextSize="10sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
android:textColor="?attr/colorOnSurfaceVariant" android:textColor="?attr/colorOnSurfaceVariant"
android:textSize="28sp" android:textSize="28sp"
tools:ignore="ButtonStyle,HardcodedText" /> tools:ignore="ButtonStyle,HardcodedText" />

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -54,11 +54,14 @@
<EditText <EditText
android:id="@+id/editText" android:id="@+id/editText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp" android:layout_margin="16dp"
android:fontFamily="@font/poppins" android:fontFamily="@font/poppins"
android:inputType="textMultiLine" android:inputType="textMultiLine"
android:padding="16dp" android:padding="16dp"
android:nestedScrollingEnabled="true"
android:gravity="top|start"
android:textColor="?attr/colorOnBackground" android:textColor="?attr/colorOnBackground"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="12sp" android:textSize="12sp"
@ -101,4 +104,4 @@
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </LinearLayout>

4
app/src/main/res/layout/fragment_status.xml
View file

@ -28,7 +28,7 @@
android:src="@drawable/linear_gradient_bg" android:src="@drawable/linear_gradient_bg"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<LinearLayout <androidx.core.widget.NestedScrollView
android:id="@+id/textActivityContainer" android:id="@+id/textActivityContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -47,7 +47,7 @@
android:textSize="18sp" android:textSize="18sp"
android:visibility="gone" android:visibility="gone"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </androidx.core.widget.NestedScrollView>
<FrameLayout <FrameLayout
android:id="@+id/leftTouchPanel" android:id="@+id/leftTouchPanel"