Funkwhale
/
funkwhale-app-android
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale-android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'rebrand/update-colors' into 'develop' 

Update colors of light and dark scheme

See merge request funkwhale/funkwhale-android!16
This commit is contained in:
Ryan Harg 2021-07-02 14:07:18 +00:00
parent 0415f2e06b 05fb1d84f4
commit 2ed1bd0e5a
9 changed files with 208 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-night/funkwhale.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

8
app/src/main/res/drawable/login_input.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/white" android:state_focused="true" />
<item android:color="@android:color/white" android:state_hovered="true" />
<item android:color="@android:color/white" />
<item android:color="@color/controlColorHintText" android:state_focused="true" />
<item android:color="@color/controlColorHintText" android:state_hovered="true" />
<item android:color="@color/controlColorHintText" />
</selector>
</selector>

2
app/src/main/res/layout-land/activity_main.xml
View File

@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:theme="@style/AppTheme.AppBar"
app:backgroundTint="@color/colorPrimary"
app:backgroundTint="@color/colorPrimaryDark"
app:layout_insetEdge="bottom"
app:navigationIcon="@drawable/funkwhaleshape"
tools:menu="@menu/toolbar" />

227
app/src/main/res/layout/activity_login.xml
View File

@ -1,132 +1,131 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary">
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:orientation="vertical"
android:padding="32dp">
android:layout_height="match_parent"
android:background="@color/surface">
<ImageView
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_marginBottom="32dp"
android:contentDescription="@string/alt_app_logo"
android:src="@drawable/funkwhale"
app:tint="@android:color/white" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/login_welcome"
android:textAlignment="center"
android:textColor="@android:color/white" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/hostname_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textColorHint="@drawable/login_input"
app:boxBackgroundColor="@color/controlAccent"
app:boxBackgroundMode="filled"
app:boxStrokeWidth="0dp"
app:hintTextColor="@drawable/login_input">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/hostname"
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/login_hostname"
android:inputType="textUri"
android:lines="1"
android:text="@string/debug.hostname"
android:textColor="@android:color/white"
android:textCursorDrawable="@null" />
android:layout_gravity="center_horizontal"
android:gravity="center"
android:orientation="vertical"
android:padding="32dp">
</com.google.android.material.textfield.TextInputLayout>
<ImageView
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_marginBottom="32dp"
android:contentDescription="@string/alt_app_logo"
android:src="@drawable/funkwhale"/>
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/cleartext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:buttonTint="@android:color/white"
android:text="@string/login_cleartext"
android:textColor="@android:color/white" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/login_welcome"
android:textAlignment="center"
android:textColor="@color/colorPrimary" />
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/anonymous"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:buttonTint="@android:color/white"
android:text="@string/login_anonymous"
android:textColor="@android:color/white" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/hostname_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textColorHint="@drawable/login_input"
app:boxBackgroundColor="@color/elevatedSurface"
app:boxBackgroundMode="filled"
app:boxStrokeWidth="0dp"
app:hintTextColor="@drawable/login_input">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/username_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:hint="@string/login_username"
android:textColorHint="@drawable/login_input"
app:boxBackgroundColor="@color/controlAccent"
app:boxBackgroundMode="filled"
app:boxStrokeColor="@drawable/login_input"
app:boxStrokeWidth="0dp"
app:hintTextColor="@drawable/login_input">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/hostname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/login_hostname"
android:inputType="textUri"
android:lines="1"
android:text="@string/debug.hostname"
android:textColor="@color/controlColorText"
android:textCursorDrawable="@null" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:lines="1"
android:text="@string/debug.username"
android:textColor="@android:color/white"
android:textCursorDrawable="@null" />
</com.google.android.material.textfield.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/cleartext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:buttonTint="@color/controlColorText"
android:text="@string/login_cleartext"
android:textColor="@color/controlColorText" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:hint="@string/login_password"
android:textColorHint="@drawable/login_input"
app:boxBackgroundColor="@color/controlAccent"
app:boxBackgroundMode="filled"
app:boxStrokeColor="@drawable/login_input"
app:boxStrokeWidth="0dp"
app:hintTextColor="@drawable/login_input"
app:passwordToggleEnabled="true">
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/anonymous"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:buttonTint="@color/controlColorText"
android:text="@string/login_anonymous"
android:textColor="@color/controlColorText" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:lines="1"
android:text="@string/debug.password"
android:textColor="@android:color/white"
android:textCursorDrawable="@null" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/username_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:hint="@string/login_username"
android:textColorHint="@drawable/login_input"
app:boxBackgroundColor="@color/elevatedSurface"
app:boxBackgroundMode="filled"
app:boxStrokeColor="@drawable/login_input"
app:boxStrokeWidth="0dp"
app:hintTextColor="@drawable/login_input">
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:lines="1"
android:text="@string/debug.username"
android:textColor="@color/controlColorText"
android:textCursorDrawable="@null" />
<com.google.android.material.button.MaterialButton
android:id="@+id/login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorAccent"
android:text="@string/login_submit"
android:textColor="@color/whiteWhileLight" />
</LinearLayout>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:hint="@string/login_password"
android:textColorHint="@drawable/login_input"
app:boxBackgroundColor="@color/elevatedSurface"
app:boxBackgroundMode="filled"
app:boxStrokeColor="@drawable/login_input"
app:boxStrokeWidth="0dp"
app:hintTextColor="@drawable/login_input"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:lines="1"
android:text="@string/debug.password"
android:textColor="@color/controlColorText"
android:textCursorDrawable="@null" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorAccent"
android:text="@string/login_submit"
android:textColor="@color/whiteWhileLight" />
</LinearLayout>
</ScrollView>

4
app/src/main/res/layout/partial_now_playing.xml
View File

@ -22,7 +22,7 @@
android:layout_marginTop="-6dp"
android:layout_marginBottom="-6dp"
android:progress="40"
android:progressTint="@color/colorPrimary" />
android:progressTint="@color/colorPrimaryDark" />
<LinearLayout
android:layout_width="match_parent"
@ -149,7 +149,7 @@
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

132
app/src/main/res/layout/row_track.xml
View File

@ -1,78 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="6dp"
android:background="@drawable/ripple"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="8dp"
android:transitionGroup="true"
tools:showIn="@layout/fragment_tracks">
<org.funkwhale.ffa.views.SquareImageView
android:id="@+id/handle"
android:layout_width="18dp"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@drawable/reorder"
android:tint="#787878"
android:visibility="gone"
tools:visibility="visible" />
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="6dp"
android:background="@drawable/ripple"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="8dp"
android:transitionGroup="true"
tools:showIn="@layout/fragment_tracks">
<org.funkwhale.ffa.views.SquareImageView
android:id="@+id/cover"
android:layout_width="48dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
tools:src="@tools:sample/avatars" />
<org.funkwhale.ffa.views.SquareImageView
android:id="@+id/handle"
android:layout_width="18dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@drawable/reorder"
android:tint="#787878"
android:visibility="gone"
tools:visibility="visible" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<org.funkwhale.ffa.views.SquareImageView
android:id="@+id/cover"
android:layout_width="48dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
tools:src="@tools:sample/avatars" />
<TextView
android:id="@+id/title"
style="@style/AppTheme.ItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableStart="@drawable/downloaded"
android:drawablePadding="8dp"
android:drawableTint="@color/controlColor"
android:ellipsize="end"
android:lines="1"
tools:text="Absolution" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
tools:text="Muse" />
<TextView
android:id="@+id/title"
style="@style/AppTheme.ItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableStart="@drawable/downloaded"
android:drawablePadding="8dp"
android:drawableTint="@color/controlColor"
android:ellipsize="end"
android:lines="1"
tools:text="Absolution" />
</LinearLayout>
<TextView
android:id="@+id/artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
tools:text="Muse" />
<ImageButton
android:id="@+id/favorite"
style="@style/IconButton"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="8dp"
android:contentDescription="@string/manage_add_to_favorites"
android:src="@drawable/favorite" />
</LinearLayout>
<ImageButton
android:id="@+id/actions"
style="@style/IconButton"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@string/alt_more_options"
android:src="@drawable/more" />
<ImageButton
android:id="@+id/favorite"
style="@style/IconButton"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="8dp"
android:contentDescription="@string/manage_add_to_favorites"
android:src="@drawable/favorite" />
<ImageButton
android:id="@+id/actions"
style="@style/IconButton"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@string/alt_more_options"
android:src="@drawable/more" />
</LinearLayout>

2
app/src/main/res/values-de/strings.xml
View File

@ -11,7 +11,7 @@
<string name="login_error_hostname_https">Der Zugriff auf den Funkwhale Server sollte über https erfolgen</string>
<string name="toolbar_search">Suche</string>
<string name="title_settings">Einstellungen</string>
<string name="title_oss_licences">Open Source Lizenz</string>
<string name="title_oss_licences">Open Source Lizenzen</string>
<string name="search_welcome">Gib deine Suchekritieren oben ein und drücke Enter um deine Musikbibliothek zu durchsuchen</string>
<string name="search_placeholder">Durchsuche Künstler, Alben und Songs</string>
<string name="search_no_results">Keine Ergebnisse wurden anhand deiner Suchkritieren gefunden</string>

20
app/src/main/res/values-night/colors.xml
View File

@ -1,19 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="surface">#121212</color>
<color name="elevatedSurface">#191919</color>
<color name="surface">#202020</color>
<color name="elevatedSurface">#2f2f2f</color>
<color name="colorPrimary">#283f4e</color>
<color name="colorAccent">#3282b8</color>
<color name="colorPrimary">#949fa7</color>
<color name="colorAccent">#d35400</color>
<color name="colorSelected">#525252</color>
<color name="colorFavorite">#eba999</color>
<color name="colorFavorite">#b34700</color>
<color name="itemTitle">#abffffff</color>
<color name="controlForeground">#caffffff</color>
<color name="controlColor">#77a8c7</color>
<color name="controlAccent">#304A5A</color>
<color name="controlForeground">@color/colorPrimary</color>
<color name="controlColorText">@color/colorPrimary</color>
<color name="controlColorHintText">#dfebf0</color>
<color name="controlColor">@color/colorAccent</color>
<color name="controlAccent">@color/colorAccent</color>
<color name="whiteWhileLight">#000000</color>
<color name="blackWhileLight">#ffffff</color>
@ -23,4 +25,4 @@
<color name="cached">#aeaeae</color>
<color name="ripple">#283f4e</color>
</resources>
</resources>

18
app/src/main/res/values/colors.xml
View File

@ -1,21 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="surface">@android:color/background_light</color>
<color name="elevatedSurface">@android:color/background_light</color>
<color name="surface">#eeeeee</color>
<color name="elevatedSurface">#f6f6f6</color>
<color name="colorPrimary">#327eae</color>
<color name="colorPrimaryDark">#3d3e40</color>
<color name="colorPrimary">#476d85</color>
<color name="colorPrimaryDark">#646568</color>
<color name="colorAccent">#d35400</color>
<color name="colorError">#fdcfbb</color>
<color name="colorSelected">#dadada</color>
<color name="colorFavorite">#e17055</color>
<color name="colorFavorite">#d35400</color>
<color name="itemTitle">#222222</color>
<color name="controlForeground">@color/colorPrimary</color>
<color name="controlColor">@color/colorPrimary</color>
<color name="controlAccent">#22648E</color>
<color name="controlForeground">@color/colorPrimaryDark</color>
<color name="controlColorText">@color/colorPrimaryDark</color>
<color name="controlColorHintText">#5988a6</color>
<color name="controlColor">@color/colorAccent</color>
<color name="controlAccent">@color/colorAccent</color>
<color name="whiteWhileLight">#ffffff</color>
<color name="blackWhileLight">#000000</color>