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

Feet(Settings): Revamped UI (#352)

Browse source 
Feet(Settings): Revamped UI
This commit is contained in:
Sadwhy 2024-04-13 01:52:10 +06:00 • committed by GitHub
parent 70be4e92fb
commit 9ec448e503
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 338 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/res/layout/activity_player_settings.xml
View file

@ -49,6 +49,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="32dp" android:layout_margin="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/player_settings" android:text="@string/player_settings"
android:textSize="28sp" /> android:textSize="28sp" />
@ -193,9 +194,9 @@
android:id="@+id/subtitleTestText" android:id="@+id/subtitleTestText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="32dp"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:paddingHorizontal="32dp"
android:text="@string/sub_text_example" /> android:text="@string/sub_text_example" />
</LinearLayout> </LinearLayout>
@ -336,6 +337,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="64dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:clickable="false"
android:fontFamily="@font/poppins_bold" android:fontFamily="@font/poppins_bold"
android:insetTop="0dp" android:insetTop="0dp"
android:insetBottom="0dp" android:insetBottom="0dp"
@ -347,17 +349,16 @@
app:cornerRadius="0dp" app:cornerRadius="0dp"
app:icon="@drawable/ic_round_color_24" app:icon="@drawable/ic_round_color_24"
app:iconPadding="16dp" app:iconPadding="16dp"
app:iconSize="24dp" app:iconSize="24dp" />
android:clickable="false" />
<com.google.android.material.slider.Slider <com.google.android.material.slider.Slider
android:id="@+id/videoSubAlpha" android:id="@+id/videoSubAlpha"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp" android:layout_marginHorizontal="32dp"
android:stepSize="0.1"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="1" android:valueTo="1">
android:stepSize="0.1">
</com.google.android.material.slider.Slider> </com.google.android.material.slider.Slider>

1
app/src/main/res/layout/activity_reader_settings.xml
View file

@ -49,6 +49,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="32dp" android:layout_margin="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/reader_settings" android:text="@string/reader_settings"
android:textSize="28sp" /> android:textSize="28sp" />

400
app/src/main/res/layout/activity_settings.xml
View file

@ -21,7 +21,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="31dp" android:layout_marginTop="32dp"
app:cardBackgroundColor="@color/nav_bg_inv" app:cardBackgroundColor="@color/nav_bg_inv"
app:cardCornerRadius="16dp" app:cardCornerRadius="16dp"
app:cardElevation="0dp"> app:cardElevation="0dp">
@ -46,8 +46,9 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="31dp" android:layout_margin="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/settings" android:text="@string/settings"
android:textSize="28sp" /> android:textSize="28sp" />
@ -68,123 +69,348 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginHorizontal="18dp"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:clipToPadding="false" android:clipToPadding="false"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="31dp" tools:ignore="ContentDescription">
android:paddingEnd="31dp">
<TextView <!--account-->
<LinearLayout
android:id="@+id/settingsAccount" android:id="@+id/settingsAccount"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginEnd="-28dp" android:layout_marginTop="24dp"
android:background="@drawable/ui_bg" android:orientation="horizontal">
android:backgroundTint="?attr/colorOnBackground"
android:fontFamily="@font/poppins_bold"
android:gravity="center_vertical"
android:text="@string/accounts"
android:textColor="?attr/colorSecondary"
tools:ignore="TextContrastCheck" />
<TextView <ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="24dp"
app:srcCompat="@drawable/ic_round_person_24"
app:tint="?attr/colorPrimary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44sp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/accounts"
android:textColor="?attr/colorOnSurface"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.66"
android:fontFamily="@font/poppins_semi_bold"
android:text="@string/accounts_desc"
android:textColor="?attr/colorOnSurfaceVariant" />
</LinearLayout>
</LinearLayout>
<!--theme-->
<LinearLayout
android:id="@+id/settingsTheme" android:id="@+id/settingsTheme"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginEnd="-28dp" android:layout_marginTop="24dp"
android:background="@drawable/ui_bg" android:orientation="horizontal">
android:backgroundTint="?attr/colorOnBackground"
android:fontFamily="@font/poppins_bold"
android:gravity="center_vertical"
android:text="@string/theme"
android:textColor="?attr/colorSecondary"
tools:ignore="TextContrastCheck" /> <ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="24dp"
app:srcCompat="@drawable/ic_palette"
app:tint="?attr/colorPrimary" />
<TextView <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44sp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/theme"
android:textColor="?attr/colorOnSurface"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.66"
android:fontFamily="@font/poppins_semi_bold"
android:text="@string/theme_desc"
android:textColor="?attr/colorOnSurfaceVariant" />
</LinearLayout>
</LinearLayout>
<!--extentions-->
<LinearLayout
android:id="@+id/settingsExtension" android:id="@+id/settingsExtension"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginEnd="-28dp" android:layout_marginTop="24dp"
android:background="@drawable/ui_bg" android:orientation="horizontal">
android:backgroundTint="?attr/colorOnBackground"
android:fontFamily="@font/poppins_bold"
android:gravity="center_vertical"
android:text="@string/extensions"
android:textColor="?attr/colorSecondary"
tools:ignore="TextContrastCheck" />
<TextView <ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="24dp"
android:scaleX="0.92"
android:scaleY="0.92"
app:srcCompat="@drawable/ic_extension"
app:tint="?attr/colorPrimary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44sp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/extensions"
android:textColor="?attr/colorOnSurface"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.66"
android:fontFamily="@font/poppins_semi_bold"
android:text="@string/extensions_desc"
android:textColor="?attr/colorOnSurfaceVariant" />
</LinearLayout>
</LinearLayout>
<!--Common-->
<LinearLayout
android:id="@+id/settingsCommon" android:id="@+id/settingsCommon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginEnd="-28dp" android:layout_marginTop="24dp"
android:background="@drawable/ui_bg" android:orientation="horizontal">
android:backgroundTint="?attr/colorOnBackground"
android:fontFamily="@font/poppins_bold"
android:gravity="center_vertical"
android:text="@string/common"
android:textColor="?attr/colorSecondary"
tools:ignore="TextContrastCheck" />
<TextView
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="24dp"
app:srcCompat="@drawable/ic_lightbulb_24"
app:tint="?attr/colorPrimary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44sp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/common"
android:textColor="?attr/colorOnSurface"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.66"
android:fontFamily="@font/poppins_semi_bold"
android:text="@string/common_desc"
android:textColor="?attr/colorOnSurfaceVariant" />
</LinearLayout>
</LinearLayout>
<!--Notification-->
<LinearLayout
android:id="@+id/settingsNotification" android:id="@+id/settingsNotification"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginEnd="-28dp" android:layout_marginTop="24dp"
android:background="@drawable/ui_bg" android:orientation="horizontal">
android:backgroundTint="?attr/colorOnBackground"
android:fontFamily="@font/poppins_bold"
android:gravity="center_vertical"
android:text="@string/notifications"
android:textColor="?attr/colorSecondary"
tools:ignore="TextContrastCheck" />
<TextView <ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="24dp"
app:srcCompat="@drawable/ic_round_notifications_none_24"
app:tint="?attr/colorPrimary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44sp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/notifications"
android:textColor="?attr/colorOnSurface"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.66"
android:fontFamily="@font/poppins_semi_bold"
android:text="@string/notifications_desc"
android:textColor="?attr/colorOnSurfaceVariant" />
</LinearLayout>
</LinearLayout>
<!--Anime-->
<LinearLayout
android:id="@+id/settingsAnime" android:id="@+id/settingsAnime"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginEnd="-28dp" android:layout_marginTop="24dp"
android:background="@drawable/ui_bg" android:orientation="horizontal">
android:backgroundTint="?attr/colorOnBackground"
android:fontFamily="@font/poppins_bold"
android:gravity="center_vertical"
android:text="@string/anime"
android:textColor="?attr/colorSecondary"
tools:ignore="TextContrastCheck" />
<TextView <ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="24dp"
app:srcCompat="@drawable/ic_round_movie_filter_24"
app:tint="?attr/colorPrimary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44sp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/anime"
android:textColor="?attr/colorOnSurface"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.66"
android:fontFamily="@font/poppins_semi_bold"
android:text="@string/anime_desc"
android:textColor="?attr/colorOnSurfaceVariant" />
</LinearLayout>
</LinearLayout>
<!--Manga-->
<LinearLayout
android:id="@+id/settingsManga" android:id="@+id/settingsManga"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginEnd="-28dp" android:layout_marginTop="24dp"
android:background="@drawable/ui_bg" android:orientation="horizontal">
android:backgroundTint="?attr/colorOnBackground"
android:fontFamily="@font/poppins_bold"
android:gravity="center_vertical"
android:text="@string/manga"
android:textColor="?attr/colorSecondary"
tools:ignore="TextContrastCheck" />
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="24dp"
app:srcCompat="@drawable/ic_round_import_contacts_24"
app:tint="?attr/colorPrimary" />
<TextView <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44sp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/manga"
android:textColor="?attr/colorOnSurface"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.66"
android:fontFamily="@font/poppins_semi_bold"
android:text="@string/manga_desc"
android:textColor="?attr/colorOnSurfaceVariant" />
</LinearLayout>
</LinearLayout>
<!--about-->
<LinearLayout
android:id="@+id/settingsAbout" android:id="@+id/settingsAbout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:layout_marginEnd="-28dp" android:layout_marginTop="24dp"
android:background="@drawable/ui_bg" android:orientation="horizontal">
android:backgroundTint="?attr/colorOnBackground"
android:fontFamily="@font/poppins_bold" <ImageView
android:gravity="center_vertical" android:layout_width="24dp"
android:text="@string/about" android:layout_height="24dp"
android:textColor="?attr/colorSecondary" android:layout_margin="24dp"
tools:ignore="TextContrastCheck" /> app:srcCompat="@drawable/ic_round_info_24"
app:tint="?attr/colorPrimary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44sp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/about"
android:textColor="?attr/colorOnSurface"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.66"
android:fontFamily="@font/poppins_semi_bold"
android:text="@string/about_desc"
android:textColor="?attr/colorOnSurfaceVariant" />
</LinearLayout>
</LinearLayout>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="31dp" android:layout_marginTop="32dp"
android:layout_marginEnd="-28dp"
android:ellipsize="end" android:ellipsize="end"
android:fontFamily="@font/poppins_bold" android:fontFamily="@font/poppins_bold"
android:maxLines="3" android:maxLines="3"
@ -233,7 +459,6 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="64dp" android:layout_height="64dp"
android:layout_margin="8dp" android:layout_margin="8dp"
android:layout_weight="1"
android:padding="6dp" android:padding="6dp"
android:src="@drawable/ic_discord" android:src="@drawable/ic_discord"
app:tint="?attr/colorOnBackground" app:tint="?attr/colorOnBackground"
@ -277,3 +502,4 @@
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

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

@ -46,6 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="32dp" android:layout_marginVertical="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/about" android:text="@string/about"
android:textSize="28sp" /> android:textSize="28sp" />

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

@ -45,6 +45,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="32dp" android:layout_marginVertical="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/accounts" android:text="@string/accounts"
android:textSize="28sp" /> android:textSize="28sp" />

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

@ -46,6 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="32dp" android:layout_marginVertical="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/anime" android:text="@string/anime"
android:textSize="28sp" /> android:textSize="28sp" />

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

@ -46,6 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="32dp" android:layout_marginVertical="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/common" android:text="@string/common"
android:textSize="28sp" /> android:textSize="28sp" />

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

@ -46,6 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="32dp" android:layout_marginVertical="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/extensions" android:text="@string/extensions"
android:textSize="28sp" /> android:textSize="28sp" />

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

@ -45,6 +45,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="32dp" android:layout_marginVertical="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/manga" android:text="@string/manga"
android:textSize="28sp" /> android:textSize="28sp" />

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

@ -47,6 +47,7 @@
android:layout_marginVertical="32dp" android:layout_marginVertical="32dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/notifications" android:text="@string/notifications"
android:fontFamily="@font/poppins_bold"
android:textSize="28sp" /> android:textSize="28sp" />
<ImageView <ImageView

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

@ -46,6 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="32dp" android:layout_marginVertical="32dp"
android:layout_weight="1" android:layout_weight="1"
android:fontFamily="@font/poppins_bold"
android:text="@string/theme" android:text="@string/theme"
android:textSize="28sp" /> android:textSize="28sp" />

1
app/src/main/res/layout/activity_user_interface_settings.xml
View file

@ -53,6 +53,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/ui_settings" android:text="@string/ui_settings"
android:textSize="28sp" /> android:textSize="28sp" />

9
app/src/main/res/values/strings.xml
View file

@ -891,4 +891,13 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
<string name="social">Social</string> <string name="social">Social</string>
<string name="auto_skip_recap">Auto Skip Recap</string> <string name="auto_skip_recap">Auto Skip Recap</string>
<string name="use_anilist_icon">Use AniList Icon</string> <string name="use_anilist_icon">Use AniList Icon</string>
<string name="accounts_desc">Anilist, MAL and Discord.\nWhat more could you need?</string>
<string name="theme_desc">Change the vibe of your app</string>
<string name="extensions_desc">Manage your reliable repositories</string>
<string name="common_desc">UI and other mischievous stuff</string>
<string name="notifications_desc">Customise your news and updates</string>
<string name="anime_desc">Choose how you watch</string>
<string name="manga_desc">Choose how you read</string>
<string name="about_desc">Learn more about Dantotsu</string>
</resources> </resources>