nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update material colors, dark mode pure black

Browse source
This commit is contained in:
jarnedemeulemeester 2021-10-02 21:10:10 +02:00
parent c43f9bad82
commit 73fc37b4f1
No known key found for this signature in database
GPG key ID: 60884A0C1EBA43E5
13 changed files with 67 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View file

@ -11,7 +11,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Jellyfin"
android:theme="@style/Theme.Findroid"
android:usesCleartextTraffic="true">
<activity
android:name=".PlayerActivity"
@ -19,7 +19,7 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:theme="@style/Theme.JellyfinSplashScreen"
android:theme="@style/Theme.FindroidSplashScreen"
android:windowSoftInputMode="adjustPan">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

5
app/src/main/res/drawable-night/header_gradient.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:angle="90"
android:startColor="@color/neutral_900"/>
</shape>

4
app/src/main/res/drawable/button_setup_background.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/primary_variant">
android:color="?attr/colorPrimaryVariant">
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<solid android:color="@color/primary" />
<solid android:color="?attr/colorPrimary" />
<corners
android:radius="10dp" />
</shape>

2
app/src/main/res/drawable/circle_background.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/primary" />
<solid android:color="?attr/colorPrimary" />
</shape>

2
app/src/main/res/drawable/header_gradient.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:angle="90"
android:startColor="@color/neutral_100"/>
android:startColor="?android:attr/colorBackground"/>
</shape>

2
app/src/main/res/layout/activity_main.xml
View file

@ -12,7 +12,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:background="?android:attr/windowBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@ -34,7 +33,6 @@
android:id="@+id/main_toolbar_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?android:attr/windowBackground"
app:layout_constraintBottom_toTopOf="@id/nav_host_fragment_activity_main"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

9
app/src/main/res/layout/episode_bottom_sheet.xml
View file

@ -17,7 +17,6 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackgroundFloating"
android:paddingBottom="24dp">
<ImageView
@ -29,7 +28,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/colorOnBackground" />
app:tint="?attr/colorOnSurface" />
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/episode_image"
@ -49,7 +48,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/circle_background"
android:backgroundTint="@color/red"
android:backgroundTint="?attr/colorError"
android:visibility="@{viewModel.item.locationType == LocationType.VIRTUAL ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/episode_image"
app:layout_constraintTop_toTopOf="@id/episode_image">
@ -210,7 +209,7 @@
android:layout_marginEnd="8dp"
android:text="@string/error_preparing_player_items"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/red" />
android:textColor="?attr/colorError" />
<TextView
android:id="@+id/player_items_error_details"
@ -218,7 +217,7 @@
android:layout_height="wrap_content"
android:text="@string/view_details_underlined"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/red" />
android:textColor="?attr/colorError" />
</LinearLayout>
<TextView

2
app/src/main/res/layout/episode_item.xml
View file

@ -53,7 +53,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/circle_background"
android:backgroundTint="@color/red"
android:backgroundTint="?attr/colorError"
android:visibility="@{episode.locationType == LocationType.VIRTUAL ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toStartOf="@id/played_icon"
app:layout_constraintTop_toTopOf="@id/episode_image">

2
app/src/main/res/layout/exo_player_control_view.xml
View file

@ -195,7 +195,7 @@
android:id="@+id/exo_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:played_color="@color/primary" />
app:played_color="?attr/colorPrimary" />
</LinearLayout>

4
app/src/main/res/layout/fragment_media_info.xml
View file

@ -210,7 +210,7 @@
android:layout_marginEnd="8dp"
android:text="@string/error_preparing_player_items"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/red" />
android:textColor="?attr/colorError" />
<TextView
android:id="@+id/player_items_error_details"
@ -218,7 +218,7 @@
android:layout_height="wrap_content"
android:text="@string/view_details_underlined"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/red" />
android:textColor="?attr/colorError" />
</LinearLayout>

35
app/src/main/res/values-night/themes.xml
View file

@ -1,24 +1,29 @@
<resources>
<!-- Base application theme. -->
<style name="Theme.Jellyfin" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryVariant">@color/primary_variant</item>
<style name="Theme.Findroid" parent="Base.Theme.Findroid">
<!-- Main colors -->
<item name="colorPrimary">@color/blue_600</item>
<item name="colorPrimaryVariant">@color/blue_800</item>
<item name="colorSecondary">@color/green_300</item>
<item name="colorSecondaryVariant">@color/green_800</item>
<!-- Background colors and error state color -->
<item name="android:colorBackground">@color/black</item>
<item name="colorSurface">@color/black</item>
<item name="colorError">@color/red</item>
<!-- Text, icons and strokes in relation to the surface -->
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/secondary</item>
<item name="colorSecondaryVariant">@color/secondary_variant</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">@color/neutral_900</item>
<!-- Customize your theme here. -->
<item name="android:windowBackground">@color/neutral_900</item>
<item name="android:colorBackgroundFloating">@color/neutral_900</item>
<item name="colorOnBackground">@color/white</item>
<item name="colorOnSurface">@color/white</item>
<item name="colorOnError">@color/white</item>
<item name="elevationOverlayEnabled">false</item>
</style>
<style name="Theme.JellyfinSplashScreen" parent="Theme.SplashScreen">
<style name="Theme.FindroidSplashScreen" parent="Theme.SplashScreen">
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
<item name="windowSplashScreenBackground">@color/neutral_900</item>
<item name="postSplashScreenTheme">@style/Theme.Jellyfin</item>
<item name="postSplashScreenTheme">@style/Theme.Findroid</item>
</style>
</resources>

10
app/src/main/res/values/colors.xml
View file

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="primary">#2B82D9</color>
<color name="primary_variant">#1B5692</color>
<color name="secondary">#24B364</color>
<color name="secondary_variant">#126839</color>
<color name="blue_300">#67b0ed</color>
<color name="blue_600">#2B82D9</color>
<color name="blue_800">#2060b4</color>
<color name="green_300">#71ca92</color>
<color name="green_500">#24B364</color>
<color name="green_800">#038043</color>
<color name="neutral_900">#121A21</color>
<color name="neutral_800">#243342</color>
<color name="neutral_700">#374F67</color>

42
app/src/main/res/values/themes.xml
View file

@ -1,26 +1,38 @@
<resources>
<!-- Base application theme. -->
<style name="Theme.Jellyfin" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryVariant">@color/primary_variant</item>
<style name="Theme.Findroid" parent="Base.Theme.Findroid" />
<style name="Base.Theme.Findroid" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Main colors -->
<item name="colorPrimary">@color/blue_600</item>
<item name="colorPrimaryVariant">@color/blue_800</item>
<item name="colorSecondary">@color/green_500</item>
<item name="colorSecondaryVariant">@color/green_800</item>
<!-- Background colors and error state color -->
<item name="android:colorBackground">@color/neutral_100</item>
<item name="colorSurface">@color/neutral_100</item>
<item name="colorError">@color/red</item>
<!-- Text, icons and strokes in relation to the surface -->
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/secondary</item>
<item name="colorSecondaryVariant">@color/secondary_variant</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">@color/neutral_100</item>
<item name="android:windowLightStatusBar">true</item>
<!-- Customize your theme here. -->
<item name="android:windowBackground">@color/neutral_100</item>
<item name="android:colorBackgroundFloating">@color/neutral_100</item>
<item name="colorOnBackground">@color/black</item>
<item name="colorOnSurface">@color/black</item>
<item name="colorOnError">@color/white</item>
<!-- Status bar -->
<item name="android:statusBarColor">?android:attr/colorBackground</item>
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>
<!-- Extra's -->
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
</style>
<style name="Theme.JellyfinSplashScreen" parent="Theme.SplashScreen">
<style name="Theme.FindroidSplashScreen" parent="Theme.SplashScreen">
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
<item name="windowSplashScreenBackground">@color/neutral_100</item>
<item name="postSplashScreenTheme">@style/Theme.Jellyfin</item>
<item name="postSplashScreenTheme">@style/Theme.Findroid</item>
</style>
<string-array name="themes">