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

Feet(Settings): UI changes (#351)

Browse source 
* Account

* Theme

* Extension, common, notification and anime

* manga and about

* fix(Settings): icon colours
This commit is contained in:
Sadwhy 2024-04-12 13:15:53 +06:00 • committed by GitHub
parent b961701189
commit c0e3243ee6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 394 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package ani.dantotsu.media
import ani.dantotsu.connections.anilist.api.FuzzyDate
import ani.dantotsu.connections.anilist.api.Query
import org.checkerframework.checker.units.qual.A
import java.io.Serializable
data class Character(

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

@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import ani.dantotsu.connections.anilist.Anilist
import org.checkerframework.checker.units.qual.A
import java.text.DateFormat
import java.util.Date

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

@ -41,7 +41,7 @@ class SettingsAboutActivity : AppCompatActivity() {
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
settingsAboutTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
aboutSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
settingsDev.setOnClickListener {
DevelopersDialogFragment().show(supportFragmentManager, "dialog")

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

@ -47,7 +47,7 @@ class SettingsAccountActivity : AppCompatActivity() {
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
settingsaccountTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
accountSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
settingsAccountHelp.setOnClickListener {
CustomBottomDialog.newInstance().apply {

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

@ -40,7 +40,7 @@ class SettingsAnimeActivity: AppCompatActivity(){
settingsPlayer.setOnClickListener {
startActivity(Intent(context, PlayerSettingsActivity::class.java))
}
settingsAnimeTitle.setOnClickListener {
animeSettingsBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
purgeAnimeDownloads.setOnClickListener {

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

@ -98,7 +98,7 @@ class SettingsCommonActivity: AppCompatActivity(){
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
settingsCommonTitle.setOnClickListener {
commonSettingsBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
settingsDownloadManager.setOnClickListener {

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

@ -149,7 +149,7 @@ class SettingsExtensionsActivity: AppCompatActivity() {
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
settingsExtensionsTitle.setOnClickListener{
extensionSettingsBack.setOnClickListener{
onBackPressedDispatcher.onBackPressed()
}
setExtensionOutput(animeRepoInventory, MediaType.ANIME)

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

@ -36,7 +36,7 @@ class SettingsMangaActivity: AppCompatActivity(){
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
settingsMangaTitle.setOnClickListener {
mangaSettingsBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
purgeMangaDownloads.setOnClickListener {

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

@ -46,7 +46,7 @@ class SettingsNotificationActivity: AppCompatActivity(){
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
settingsNotificationsTitle.setOnClickListener {
notificationSettingsBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
settingsSubscriptionsTime.text =

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

@ -33,7 +33,7 @@ class SettingsThemeActivity : AppCompatActivity() {
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
settingsThemeTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
themeSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
settingsUseMaterialYou.apply {
isChecked = PrefManager.getVal(PrefName.UseMaterialYou)

10
app/src/main/res/drawable/ic_lightbulb_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM320,760L320,680L640,680L640,760L320,760ZM330,640Q261,599 220.5,530Q180,461 180,380Q180,255 267.5,167.5Q355,80 480,80Q605,80 692.5,167.5Q780,255 780,380Q780,461 739.5,530Q699,599 630,640L330,640ZM354,560L606,560Q651,528 675.5,481Q700,434 700,380Q700,288 636,224Q572,160 480,160Q388,160 324,224Q260,288 260,380Q260,434 284.5,481Q309,528 354,560ZM480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560L480,560Z"/>
</vector>

59
app/src/main/res/layout/activity_settings_about.xml
View file

@ -11,23 +11,54 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="31dp"
android:paddingEnd="31dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-16dp"
android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<ImageButton
android:id="@+id/aboutSettingsBack"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@color/nav_bg_inv"
android:paddingVertical="16dp"
app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/settingsAboutTitle"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:gravity="center"
android:paddingEnd="28dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:layout_weight="1"
android:text="@string/about"
android:textSize="20sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:drawableTint="?attr/colorOnBackground"
tools:ignore="RtlSymmetry" />
android:textSize="28sp" />
<ImageView
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:padding="24dp"
app:srcCompat="@drawable/ic_round_info_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription" />
</LinearLayout>
<Button
android:id="@+id/settingsFAQ"

58
app/src/main/res/layout/activity_settings_accounts.xml
View file

@ -11,23 +11,53 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="31dp"
android:paddingEnd="31dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-16dp"
android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<ImageButton
android:id="@+id/accountSettingsBack"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@color/nav_bg_inv"
android:padding="16dp"
app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/settingsaccountTitle"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:gravity="center"
android:paddingEnd="28dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:layout_weight="1"
android:text="@string/accounts"
android:textSize="20sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:drawableTint="?attr/colorOnBackground"
tools:ignore="RtlSymmetry" />
android:textSize="28sp" />
<ImageView
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:padding="24dp"
app:srcCompat="@drawable/ic_round_person_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout
android:id="@+id/settingsAnilistLoginContainer"

60
app/src/main/res/layout/activity_settings_anime.xml
View file

@ -11,23 +11,55 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="31dp"
android:paddingEnd="31dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-16dp"
android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<ImageButton
android:id="@+id/animeSettingsBack"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@color/nav_bg_inv"
android:padding="16dp"
app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/settingsAnimeTitle"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:gravity="center"
android:paddingEnd="28dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:layout_weight="1"
android:text="@string/anime"
android:textSize="20sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:drawableTint="?attr/colorOnBackground"
tools:ignore="RtlSymmetry" />
android:textSize="28sp" />
<ImageView
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:padding="24dp"
app:srcCompat="@drawable/ic_round_movie_filter_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"

60
app/src/main/res/layout/activity_settings_common.xml
View file

@ -11,23 +11,55 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="31dp"
android:paddingEnd="31dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-16dp"
android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<ImageButton
android:id="@+id/commonSettingsBack"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@color/nav_bg_inv"
android:padding="16dp"
app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/settingsCommonTitle"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:gravity="center"
android:paddingEnd="28dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:layout_weight="1"
android:text="@string/common"
android:textSize="20sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:drawableTint="?attr/colorOnBackground"
tools:ignore="RtlSymmetry" />
android:textSize="28sp" />
<ImageView
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:padding="24dp"
app:srcCompat="@drawable/ic_lightbulb_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"

59
app/src/main/res/layout/activity_settings_extensions.xml
View file

@ -11,23 +11,54 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="31dp"
android:paddingEnd="31dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-16dp"
android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<ImageButton
android:id="@+id/extensionSettingsBack"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@color/nav_bg_inv"
android:padding="16dp"
app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/settingsExtensionsTitle"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:gravity="center"
android:paddingEnd="28dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:layout_weight="1"
android:text="@string/extensions"
android:textSize="20sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:drawableTint="?attr/colorOnBackground"
tools:ignore="RtlSymmetry" />
android:textSize="28sp" />
<ImageView
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:padding="24dp"
app:srcCompat="@drawable/ic_extension"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription" />
</LinearLayout>
<Button

58
app/src/main/res/layout/activity_settings_manga.xml
View file

@ -11,23 +11,53 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="31dp"
android:paddingEnd="31dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-16dp"
android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<ImageButton
android:id="@+id/mangaSettingsBack"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@color/nav_bg_inv"
android:padding="16dp"
app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/settingsMangaTitle"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:gravity="center"
android:paddingEnd="28dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:layout_weight="1"
android:text="@string/manga"
android:textSize="20sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:drawableTint="?attr/colorOnBackground"
tools:ignore="RtlSymmetry" />
android:textSize="28sp" />
<ImageView
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:padding="24dp"
app:srcCompat="@drawable/ic_round_import_contacts_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout

60
app/src/main/res/layout/activity_settings_notifications.xml
View file

@ -11,23 +11,55 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="31dp"
android:paddingEnd="31dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-16dp"
android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<ImageButton
android:id="@+id/notificationSettingsBack"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@color/nav_bg_inv"
android:padding="16dp"
app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/settingsNotificationsTitle"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:gravity="center"
android:paddingEnd="28dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:layout_weight="1"
android:text="@string/notifications"
android:textSize="20sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:drawableTint="?attr/colorOnBackground"
tools:ignore="RtlSymmetry" />
android:textSize="28sp" />
<ImageView
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:padding="24dp"
app:srcCompat="@drawable/ic_round_notifications_none_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription" />
</LinearLayout>
<Button
android:id="@+id/settingsSubscriptionsTime"

59
app/src/main/res/layout/activity_settings_theme.xml
View file

@ -11,23 +11,54 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="31dp"
android:paddingEnd="31dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-16dp"
android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<ImageButton
android:id="@+id/themeSettingsBack"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@color/nav_bg_inv"
android:padding="16dp"
app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/settingsThemeTitle"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:gravity="center"
android:paddingEnd="28dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:layout_weight="1"
android:text="@string/theme"
android:textSize="20sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
app:drawableTint="?attr/colorOnBackground"
tools:ignore="RtlSymmetry" />
android:textSize="28sp" />
<ImageView
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:padding="24dp"
app:srcCompat="@drawable/ic_palette"
app:tint="?attr/colorOnBackground"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout