mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

Updated Floating Action Button style to the official guidelines.

Browse source
This commit is contained in:
Christophe Beyls 2015-06-26 17:32:03 +02:00
parent b6cc5513db
commit 29d923a1cd
6 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/anim-v21/fab_elevation.xml → app/src/main/res/anim-v21/fab_state_list.xml
View file

@ -4,16 +4,14 @@
<objectAnimator
android:duration="@android:integer/config_shortAnimTime"
android:propertyName="translationZ"
android:valueFrom="@dimen/fab_elevation_low"
android:valueTo="@dimen/fab_elevation_high"
android:valueTo="@dimen/fab_press_translation_z"
android:valueType="floatType"/>
</item>
<item>
<objectAnimator
android:duration="@android:integer/config_shortAnimTime"
android:propertyName="translationZ"
android:valueFrom="@dimen/fab_elevation_high"
android:valueTo="@dimen/fab_elevation_low"
android:valueTo="0"
android:valueType="floatType"/>
</item>
</selector>

2
app/src/main/res/drawable-v21/fab_background.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?colorControlHighlight">
android:color="@color/ripple_material_dark">
<item>
<shape android:shape="oval">
<solid android:color="?colorAccent"/>

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

@ -7,7 +7,7 @@
</item>
<item>
<shape android:shape="oval">
<solid android:color="@color/ripple_material_light"/>
<solid android:color="@color/ripple_material_dark"/>
</shape>
</item>
</layer-list>

7
app/src/main/res/values-v21/styles.xml
View file

@ -14,4 +14,11 @@
<item name="android:textColorLink">?android:attr/colorAccent</item>
</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>

4
app/src/main/res/values/dimens.xml
View file

@ -19,7 +19,7 @@
<dimen name="detail_card_view_margin_top">54dp</dimen>
<dimen name="detail_card_view_margin_bottom">-10dp</dimen>
<dimen name="fab_diameter">56dp</dimen>
<dimen name="fab_elevation_low">2dp</dimen>
<dimen name="fab_elevation_high">4dp</dimen>
<dimen name="fab_elevation">8dp</dimen>
<dimen name="fab_press_translation_z">6dp</dimen>
</resources>

8
app/src/main/res/values/styles.xml
View file

@ -1,5 +1,5 @@
<?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 -->
@ -77,17 +77,17 @@
<item name="textColor">@color/tab_text</item>
</style>
<style name="FloatingActionButton" tools:ignore="newApi">
<style name="FloatingActionButtonBase">
<item name="android:layout_width">@dimen/fab_diameter</item>
<item name="android:layout_height">@dimen/fab_diameter</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:clickable">true</item>
<item name="android:focusable">true</item>
</style>
<style name="FloatingActionButton" parent="FloatingActionButtonBase"/>
<style name="SeparatorLine">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>