mirror of
https://github.com/MatomoCamp/matomocamp-companion-android.git
synced 2024-09-19 16:13:46 +02:00
Updated Floating Action Button style to the official guidelines.
This commit is contained in:
parent
b6cc5513db
commit
29d923a1cd
6 changed files with 17 additions and 12 deletions
|
@ -4,16 +4,14 @@
|
||||||
<objectAnimator
|
<objectAnimator
|
||||||
android:duration="@android:integer/config_shortAnimTime"
|
android:duration="@android:integer/config_shortAnimTime"
|
||||||
android:propertyName="translationZ"
|
android:propertyName="translationZ"
|
||||||
android:valueFrom="@dimen/fab_elevation_low"
|
android:valueTo="@dimen/fab_press_translation_z"
|
||||||
android:valueTo="@dimen/fab_elevation_high"
|
|
||||||
android:valueType="floatType"/>
|
android:valueType="floatType"/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<objectAnimator
|
<objectAnimator
|
||||||
android:duration="@android:integer/config_shortAnimTime"
|
android:duration="@android:integer/config_shortAnimTime"
|
||||||
android:propertyName="translationZ"
|
android:propertyName="translationZ"
|
||||||
android:valueFrom="@dimen/fab_elevation_high"
|
android:valueTo="0"
|
||||||
android:valueTo="@dimen/fab_elevation_low"
|
|
||||||
android:valueType="floatType"/>
|
android:valueType="floatType"/>
|
||||||
</item>
|
</item>
|
||||||
</selector>
|
</selector>
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:color="?colorControlHighlight">
|
android:color="@color/ripple_material_dark">
|
||||||
<item>
|
<item>
|
||||||
<shape android:shape="oval">
|
<shape android:shape="oval">
|
||||||
<solid android:color="?colorAccent"/>
|
<solid android:color="?colorAccent"/>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<shape android:shape="oval">
|
<shape android:shape="oval">
|
||||||
<solid android:color="@color/ripple_material_light"/>
|
<solid android:color="@color/ripple_material_dark"/>
|
||||||
</shape>
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
</layer-list>
|
</layer-list>
|
|
@ -14,4 +14,11 @@
|
||||||
<item name="android:textColorLink">?android:attr/colorAccent</item>
|
<item name="android:textColorLink">?android:attr/colorAccent</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<!-- Styles -->
|
||||||
|
|
||||||
|
<style name="FloatingActionButton" parent="FloatingActionButtonBase">
|
||||||
|
<item name="android:elevation">@dimen/fab_elevation</item>
|
||||||
|
<item name="android:stateListAnimator">@anim/fab_state_list</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
|
@ -19,7 +19,7 @@
|
||||||
<dimen name="detail_card_view_margin_top">54dp</dimen>
|
<dimen name="detail_card_view_margin_top">54dp</dimen>
|
||||||
<dimen name="detail_card_view_margin_bottom">-10dp</dimen>
|
<dimen name="detail_card_view_margin_bottom">-10dp</dimen>
|
||||||
<dimen name="fab_diameter">56dp</dimen>
|
<dimen name="fab_diameter">56dp</dimen>
|
||||||
<dimen name="fab_elevation_low">2dp</dimen>
|
<dimen name="fab_elevation">8dp</dimen>
|
||||||
<dimen name="fab_elevation_high">4dp</dimen>
|
<dimen name="fab_press_translation_z">6dp</dimen>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<!-- Main theme -->
|
<!-- Main theme -->
|
||||||
|
|
||||||
|
@ -77,17 +77,17 @@
|
||||||
<item name="textColor">@color/tab_text</item>
|
<item name="textColor">@color/tab_text</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="FloatingActionButton" tools:ignore="newApi">
|
<style name="FloatingActionButtonBase">
|
||||||
<item name="android:layout_width">@dimen/fab_diameter</item>
|
<item name="android:layout_width">@dimen/fab_diameter</item>
|
||||||
<item name="android:layout_height">@dimen/fab_diameter</item>
|
<item name="android:layout_height">@dimen/fab_diameter</item>
|
||||||
<item name="android:background">@drawable/fab_background</item>
|
<item name="android:background">@drawable/fab_background</item>
|
||||||
<item name="android:elevation">@dimen/fab_elevation_low</item>
|
|
||||||
<item name="android:stateListAnimator">@anim/fab_elevation</item>
|
|
||||||
<item name="android:scaleType">center</item>
|
<item name="android:scaleType">center</item>
|
||||||
<item name="android:clickable">true</item>
|
<item name="android:clickable">true</item>
|
||||||
<item name="android:focusable">true</item>
|
<item name="android:focusable">true</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="FloatingActionButton" parent="FloatingActionButtonBase"/>
|
||||||
|
|
||||||
<style name="SeparatorLine">
|
<style name="SeparatorLine">
|
||||||
<item name="android:layout_width">match_parent</item>
|
<item name="android:layout_width">match_parent</item>
|
||||||
<item name="android:layout_height">1dp</item>
|
<item name="android:layout_height">1dp</item>
|
||||||
|
|
Loading…
Reference in a new issue