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/improve-color-schemes-2' into 'develop' 

Minor adjustments to color schemes

See merge request funkwhale/funkwhale-android!24
This commit is contained in:
Ryan Harg 2021-07-04 11:48:01 +00:00
parent c9e331acb9 6ab25b390c
commit e96626b5cf
7 changed files with 118 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
app/src/main/res/layout/fragment_artists.xml
View File

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="@color/surface">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swiper" android:id="@+id/swiper"

3
app/src/main/res/layout/fragment_browse.xml
View File

@ -14,7 +14,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="4dp" android:elevation="4dp"
app:tabMode="scrollable" app:tabMode="scrollable"
app:tabSelectedTextColor="@color/controlColor" /> app:tabSelectedTextColor="@color/controlColor"
app:tabTextColor="@color/colorPrimary" />
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/pager" android:id="@+id/pager"

3
app/src/main/res/layout/row_artist.xml
View File

@ -6,9 +6,9 @@
android:layout_marginHorizontal="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginVertical="5dp" android:layout_marginVertical="5dp"
android:background="@drawable/ripple" android:background="@drawable/ripple"
android:padding="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="8dp"
android:transitionGroup="true" android:transitionGroup="true"
tools:showIn="@layout/fragment_artists"> tools:showIn="@layout/fragment_artists">
@ -41,6 +41,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:textColor="@color/colorPrimaryDark"
tools:text="2 album(s)" /> tools:text="2 album(s)" />
</LinearLayout> </LinearLayout>

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

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="surface">#202020</color> <color name="surface">#151515</color>
<color name="elevatedSurface">#2f2f2f</color> <color name="elevatedSurface">#303030</color>
<color name="colorPrimary">#949fa7</color> <color name="colorPrimary">#949fa7</color>
<color name="colorPrimaryDark">#8a8b8f</color>
<color name="colorAccent">#d35400</color> <color name="colorAccent">#d35400</color>
<color name="colorSelected">#525252</color> <color name="colorSelected">#525252</color>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="surface">#eeeeee</color> <color name="surface">#f6f6f6</color>
<color name="elevatedSurface">#f6f6f6</color> <color name="elevatedSurface">#d0d0d0</color>
<color name="colorPrimary">#476d85</color> <color name="colorPrimary">#476d85</color>
<color name="colorPrimaryDark">#646568</color> <color name="colorPrimaryDark">#646568</color>

6
app/src/main/res/values/styles.xml
View File

@ -6,7 +6,7 @@
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="android:navigationBarColor">@color/surface</item> <item name="android:navigationBarColor">@color/elevatedSurface</item>
<item name="materialButtonStyle">@style/AppTheme.ButtonStyle</item> <item name="materialButtonStyle">@style/AppTheme.ButtonStyle</item>
@ -66,8 +66,8 @@
</style> </style>
<style name="AppTheme.AppBar" parent="ThemeOverlay.MaterialComponents.Toolbar.Primary"> <style name="AppTheme.AppBar" parent="ThemeOverlay.MaterialComponents.Toolbar.Primary">
<item name="android:drawableTint" tools:targetApi="m">@android:color/white</item> <item name="android:drawableTint" tools:targetApi="m">@color/colorPrimary</item>
<item name="android:tint">@android:color/white</item> <item name="android:tint">@color/colorPrimary</item>
<item name="actionBarPopupTheme">@style/AppTheme.PopupMenu</item> <item name="actionBarPopupTheme">@style/AppTheme.PopupMenu</item>
<item name="popupTheme">@style/AppTheme.PopupMenu</item> <item name="popupTheme">@style/AppTheme.PopupMenu</item>