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

View file

@ -30,6 +30,16 @@ class Contributors {
"Owner and Maintainer",
first.htmlUrl
)
)
}
res.filter {it.login != "rebelonion"}.forEach {
developers = developers.plus(
Developer(
it.login,
it.avatarUrl,
"Contributor",
it.htmlUrl
)
).plus(arrayOf(
Developer(
"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
}

View file

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

View file

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

View file

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

View file

@ -1,10 +1,14 @@
<?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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -24,16 +28,11 @@
android:textSize="20sp"
tools:text="@string/name" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="64dp"
android:orientation="vertical">
@ -47,40 +46,39 @@
android:padding="8dp"
android:text="@string/characters"
android:textSize="18sp"
android:visibility="gone"
tools:visibility="visible" />
android:visibility="gone" />
<ani.dantotsu.FadingEdgeRecyclerView
android:id="@+id/charactersRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:nestedScrollingEnabled="true"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:requiresFadingEdge="horizontal"
android:visibility="gone"
tools:itemCount="4"
tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listitem="@layout/item_media_compact"
tools:orientation="horizontal" />
tools:orientation="horizontal"
tools:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/studioRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:nestedScrollingEnabled="false"
android:paddingTop="16dp"
android:visibility="gone"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
tools:itemCount="4"
tools:itemCount="2"
tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_media_compact"
tools:orientation="vertical"
tools:visibility="visible" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<ProgressBar
android:id="@+id/studioProgressBar"
@ -109,5 +107,5 @@
tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
</androidx.core.widget.NestedScrollView>

View file

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

View file

@ -102,22 +102,23 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="20dp"
android:layout_marginStart="24dp"
android:orientation="horizontal">
<ImageView
<androidx.cardview.widget.CardView
android:id="@+id/profileCloseButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:contentDescription="@string/menu"
android:src="@drawable/ic_circle_arrow_left_24"
app:tint="@color/bg_opp" />
</LinearLayout>
android:layout_gravity="start"
android:layout_margin="20dp"
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>
<LinearLayout
android:layout_width="wrap_content"