diff options
| author | sigmabeta <sigmabeta@users.noreply.github.com> | 2015-06-20 19:37:36 -0400 |
|---|---|---|
| committer | Eder Bastos <bastos.eder@gmail.com> | 2015-06-23 21:54:02 -0400 |
| commit | fa2d06e7a4d503f8aeefbe81ca3f0b642b2d3869 (patch) | |
| tree | 54a9112027bcf9a01660468e1f4f720cb459f4bc /Source/Android/app/src/main/res/layout | |
| parent | bb89a81053f2fc3024afc5e6b92cd89920314594 (diff) | |
Android: Switch all activities to AppCompat-based Material themes, and use Support Library version of Floating Action Button.
Diffstat (limited to 'Source/Android/app/src/main/res/layout')
| -rw-r--r-- | Source/Android/app/src/main/res/layout/activity_game_grid.xml | 10 | ||||
| -rw-r--r-- | Source/Android/app/src/main/res/layout/dialog_game_details.xml | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/Source/Android/app/src/main/res/layout/activity_game_grid.xml b/Source/Android/app/src/main/res/layout/activity_game_grid.xml index 53ac5d614e..cf91a6dac6 100644 --- a/Source/Android/app/src/main/res/layout/activity_game_grid.xml +++ b/Source/Android/app/src/main/res/layout/activity_game_grid.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -26,17 +27,18 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin"/> - <ImageButton + <android.support.design.widget.FloatingActionButton android:id="@+id/button_add_directory" android:layout_width="56dp" android:layout_height="56dp" android:layout_alignBottom="@+id/image_game_screen" android:layout_alignEnd="@+id/text_game_title" android:layout_marginBottom="28dp" - android:background="@drawable/oval_ripple_accent" android:src="@drawable/ic_add" - android:stateListAnimator="@anim/button_elevation" - android:elevation="4dp" + app:borderWidth="0dp" + app:rippleColor="?android:colorPrimaryDark" + app:elevation="6dp" + app:pressedTranslationZ="12dp" android:layout_gravity="bottom|right" android:layout_marginRight="@dimen/activity_horizontal_margin"/> </FrameLayout> diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml index 1d7b63468b..ca33e56007 100644 --- a/Source/Android/app/src/main/res/layout/dialog_game_details.xml +++ b/Source/Android/app/src/main/res/layout/dialog_game_details.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_height="match_parent" android:layout_width="match_parent" @@ -113,17 +114,20 @@ android:gravity="center_vertical" tools:text="Nintendo"/> - <ImageButton + <android.support.design.widget.FloatingActionButton android:id="@+id/button_launch" android:layout_width="56dp" android:layout_height="56dp" android:layout_alignBottom="@+id/image_game_screen" android:layout_alignEnd="@+id/text_game_title" android:layout_marginBottom="-28dp" - android:background="@drawable/oval_ripple_accent" android:src="@drawable/ic_play" android:stateListAnimator="@anim/button_elevation" - android:elevation="4dp"/> + app:rippleColor="?android:colorPrimaryDark" + app:borderWidth="0dp" + app:elevation="6dp" + app:pressedTranslationZ="12dp" + /> </RelativeLayout> |