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

fix: idr

Browse source
This commit is contained in:
aayush262 2024-04-08 17:45:18 +05:30
parent 87535a9239
commit 9b6dc1318d
7 changed files with 90 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/ani/dantotsu/connections/github/Contributors.kt
View file

@ -30,6 +30,16 @@ class Contributors {
"Owner and Maintainer", "Owner and Maintainer",
first.htmlUrl first.htmlUrl
) )
)
}
res.filter {it.login != "rebelonion"}.forEach {
developers = developers.plus(
Developer(
it.login,
it.avatarUrl,
"Contributor",
it.htmlUrl
)
).plus(arrayOf( ).plus(arrayOf(
Developer( Developer(
"Wai What", "Wai What",
@ -57,16 +67,6 @@ class Contributors {
) )
)) ))
} }
res.filter {it.login != "rebelonion"}.forEach {
developers = developers.plus(
Developer(
it.login,
it.avatarUrl,
"Contributor",
it.htmlUrl
)
)
}
} }
return developers return developers
} }

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

@ -33,7 +33,6 @@ class AuthorActivity : AppCompatActivity() {
private val model: OtherDetailsViewModel by viewModels() private val model: OtherDetailsViewModel by viewModels()
private var author: Author? = null private var author: Author? = null
private var loaded = false private var loaded = false
private var isVoiceArtist: Boolean = false
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)

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

@ -433,7 +433,6 @@ class SelectorDialogFragment : BottomSheetDialogFragment() {
val episode = media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]!! val episode = media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]!!
val selectedVideo = val selectedVideo =
if (extractor.videos.size > episode.selectedVideo) extractor.videos[episode.selectedVideo] else null if (extractor.videos.size > episode.selectedVideo) extractor.videos[episode.selectedVideo] else null
val subtitles = extractor.subtitles
val subtitleNames = subtitles.map { it.language } val subtitleNames = subtitles.map { it.language }
var subtitleToDownload: Subtitle? = null var subtitleToDownload: Subtitle? = null
val activity = currActivity()?:requireActivity() val activity = currActivity()?:requireActivity()

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

@ -109,7 +109,7 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
override fun handleOnBackPressed() = startMainActivity(this@SettingsActivity) override fun handleOnBackPressed() = startMainActivity(this@SettingsActivity)
} }
lateinit var binding: ActivitySettingsBinding lateinit var binding: ActivitySettingsBinding
lateinit var launcher: LauncherWrapper private lateinit var launcher: LauncherWrapper
private lateinit var bindingAccounts: ActivitySettingsAccountsBinding private lateinit var bindingAccounts: ActivitySettingsAccountsBinding
private lateinit var bindingTheme: ActivitySettingsThemeBinding private lateinit var bindingTheme: ActivitySettingsThemeBinding
private lateinit var bindingExtensions: ActivitySettingsExtensionsBinding private lateinit var bindingExtensions: ActivitySettingsExtensionsBinding
@ -230,7 +230,6 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
PrefManager.getVal<String>(PrefName.AnilistUserName) PrefManager.getVal<String>(PrefName.AnilistUserName)
) )
openLinkInBrowser(anilistLink) openLinkInBrowser(anilistLink)
true
} }
settingsMALLoginRequired.visibility = View.GONE settingsMALLoginRequired.visibility = View.GONE
@ -251,7 +250,6 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
val myanilistLink = getString(R.string.myanilist_link, MAL.username) val myanilistLink = getString(R.string.myanilist_link, MAL.username)
openLinkInBrowser(myanilistLink) openLinkInBrowser(myanilistLink)
true
} }
} else { } else {
settingsMALAvatar.setImageResource(R.drawable.ic_round_person_24) settingsMALAvatar.setImageResource(R.drawable.ic_round_person_24)
@ -283,7 +281,6 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
val discordLink = getString(R.string.discord_link, id) val discordLink = getString(R.string.discord_link, id)
openLinkInBrowser(discordLink) openLinkInBrowser(discordLink)
true
} }
} }
settingsDiscordUsername.visibility = View.VISIBLE settingsDiscordUsername.visibility = View.VISIBLE

112
app/src/main/res/layout/activity_author.xml
View file

@ -1,39 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.core.widget.NestedScrollView 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"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:background="?attr/colorSurface">
<com.google.android.material.appbar.AppBarLayout
<TextView
android:id="@+id/studioTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp" android:background="?attr/colorSurface">
android:ellipsize="marquee"
android:fontFamily="@font/poppins_bold"
android:singleLine="true"
android:textAlignment="center"
android:textColor="@color/bg_opp"
android:textSize="20sp"
tools:text="@string/name" />
<TextView
android:id="@+id/studioTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:ellipsize="marquee"
android:fontFamily="@font/poppins_bold"
android:singleLine="true"
android:textAlignment="center"
android:textColor="@color/bg_opp"
android:textSize="20sp"
tools:text="@string/name" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginTop="64dp" android:layout_marginTop="64dp"
android:orientation="vertical"> android:orientation="vertical">
@ -47,67 +46,66 @@
android:padding="8dp" android:padding="8dp"
android:text="@string/characters" android:text="@string/characters"
android:textSize="18sp" android:textSize="18sp"
android:visibility="gone" android:visibility="gone" />
tools:visibility="visible" />
<ani.dantotsu.FadingEdgeRecyclerView <ani.dantotsu.FadingEdgeRecyclerView
android:id="@+id/charactersRecycler" android:id="@+id/charactersRecycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:clipToPadding="false" android:clipToPadding="false"
android:nestedScrollingEnabled="true" android:nestedScrollingEnabled="true"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="20dp" android:paddingEnd="20dp"
android:requiresFadingEdge="horizontal" android:requiresFadingEdge="horizontal"
android:visibility="gone"
tools:itemCount="4" tools:itemCount="4"
tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager" tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listitem="@layout/item_media_compact" tools:listitem="@layout/item_media_compact"
tools:orientation="horizontal" /> tools:orientation="horizontal"
tools:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/studioRecycler" android:id="@+id/studioRecycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false" android:clipToPadding="false"
android:nestedScrollingEnabled="false"
android:paddingTop="16dp" android:paddingTop="16dp"
android:visibility="gone" android:visibility="gone"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
tools:itemCount="4" tools:itemCount="2"
tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_media_compact" tools:listitem="@layout/item_media_compact"
tools:orientation="vertical" tools:orientation="vertical"
tools:visibility="visible" /> tools:visibility="visible" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView>
<ProgressBar
android:id="@+id/studioProgressBar"
style="?android:attr/progressBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="32dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:visibility="gone" />
<androidx.cardview.widget.CardView
android:id="@+id/studioClose"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="end"
android:layout_margin="16dp"
android:translationZ="2dp"
app:cardBackgroundColor="@color/nav_bg"
app:cardCornerRadius="16dp">
<androidx.constraintlayout.utils.widget.ImageFilterView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:src="@drawable/ic_round_close_24"
tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView>
</androidx.coordinatorlayout.widget.CoordinatorLayout> <ProgressBar
android:id="@+id/studioProgressBar"
style="?android:attr/progressBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="32dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:visibility="gone" />
<androidx.cardview.widget.CardView
android:id="@+id/studioClose"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="end"
android:layout_margin="16dp"
android:translationZ="2dp"
app:cardBackgroundColor="@color/nav_bg"
app:cardCornerRadius="16dp">
<androidx.constraintlayout.utils.widget.ImageFilterView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:src="@drawable/ic_round_close_24"
tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView>
</FrameLayout>
</androidx.core.widget.NestedScrollView>

17
app/src/main/res/layout/item_character.xml
View file

@ -4,17 +4,18 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="-12dp" android:layout_marginStart="-16dp"
android:layout_marginTop="-12dp" android:layout_marginEnd="-16dp"
android:layout_marginEnd="-12dp"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-16dp"
android:layout_marginBottom="-16dp"
android:clipToPadding="false" android:clipToPadding="false"
android:padding="24dp"> android:padding="22dp">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/itemCompactCard" android:id="@+id/itemCompactCard"
@ -26,8 +27,8 @@
<com.google.android.material.imageview.ShapeableImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/itemCompactImage" android:id="@+id/itemCompactImage"
android:layout_width="108dp" android:layout_width="102dp"
android:layout_height="160dp" android:layout_height="154dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:transitionName="characterCover" android:transitionName="characterCover"
app:shapeAppearanceOverlay="@style/roundedImageView" app:shapeAppearanceOverlay="@style/roundedImageView"
@ -47,8 +48,8 @@
android:orientation="vertical"> android:orientation="vertical">
<View <View
android:layout_width="108dp" android:layout_width="102dp"
android:layout_height="160dp" android:layout_height="128dp"
android:layout_marginBottom="8dp" /> android:layout_marginBottom="8dp" />
<TextView <TextView

29
app/src/main/res/layout/item_profile_app_bar.xml
View file

@ -102,22 +102,23 @@
</LinearLayout> </LinearLayout>
<LinearLayout <androidx.cardview.widget.CardView
android:layout_width="wrap_content" android:id="@+id/profileCloseButton"
android:layout_height="wrap_content" android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="start" android:layout_gravity="start"
android:layout_marginTop="20dp" android:layout_margin="20dp"
android:layout_marginStart="24dp" android:translationZ="2dp"
android:orientation="horizontal"> app:cardBackgroundColor="@color/nav_bg"
app:cardCornerRadius="16dp">
<ImageView <androidx.constraintlayout.utils.widget.ImageFilterView
android:id="@+id/profileCloseButton" android:layout_width="24dp"
android:layout_width="32dp" android:layout_height="24dp"
android:layout_height="32dp" android:layout_gravity="center"
android:contentDescription="@string/menu" android:src="@drawable/ic_round_close_24"
android:src="@drawable/ic_circle_arrow_left_24" tools:ignore="ContentDescription" />
app:tint="@color/bg_opp" /> </androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"