Skip to content

Commit

Permalink
fix: idr
Browse files Browse the repository at this point in the history
  • Loading branch information
@aayush2622
aayush2622 committed Apr 8, 2024
1 parent 87535a9 commit 9b6dc13
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 96 deletions.
20 changes: 10 additions & 10 deletions app/src/main/java/ani/dantotsu/connections/github/Contributors.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/ani/dantotsu/media/AuthorActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 1 addition & 4 deletions app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -230,7 +230,6 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
PrefManager.getVal<String>(PrefName.AnilistUserName)
)
openLinkInBrowser(anilistLink)
true
}

settingsMALLoginRequired.visibility = View.GONE
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
112 changes: 55 additions & 57 deletions app/src/main/res/layout/activity_author.xml
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
<?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">

<com.google.android.material.appbar.AppBarLayout

<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface">
android:layout_height="match_parent">

<com.google.android.material.appbar.AppBarLayout

<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" />

android:background="?attr/colorSurface">

</com.google.android.material.appbar.AppBarLayout>
<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" />

<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
</com.google.android.material.appbar.AppBarLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="64dp"
android:orientation="vertical">

Expand All @@ -47,67 +46,66 @@
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"
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 changes: 9 additions & 8 deletions app/src/main/res/layout/item_character.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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
Expand Down
31 changes: 16 additions & 15 deletions app/src/main/res/layout/item_profile_app_bar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,23 @@

</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<androidx.cardview.widget.CardView
android:id="@+id/profileCloseButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="start"
android:layout_marginTop="20dp"
android:layout_marginStart="24dp"
android:orientation="horizontal">

<ImageView
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_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"
Expand Down

0 comments on commit 9b6dc13

Please sign in to comment.