drop roundbutton class

This commit is contained in:
Alexey Kuznetsov 2016-07-02 19:25:01 +03:00
commit 150a834619
6 changed files with 43 additions and 8 deletions

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/colorAccentDark" />
<padding
android:bottom="5dp"
android:left="5dp"
android:right="5dp"
android:top="5dp" />
</shape>

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/colorAccentLight" />
<padding
android:bottom="5dp"
android:left="5dp"
android:right="5dp"
android:top="5dp" />
</shape>

View file

@ -52,24 +52,27 @@
android:layout_height="wrap_content"
android:paddingBottom="5dp">
<com.github.axet.androidlibrary.widgets.RoundButton
<ImageButton
android:id="@+id/recording_cut"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/ic_content_cut_24dp"
android:text="Cancel" />
<com.github.axet.androidlibrary.widgets.RoundButton
<ImageButton
android:id="@+id/recording_play"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/play" />
<com.github.axet.androidlibrary.widgets.RoundButton
<ImageButton
android:id="@+id/recording_edit_done"
style="Widget.AppCompat.RoundButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/ic_close_24dp" />
</com.github.axet.androidlibrary.widgets.EqualLinearLayout>
</FrameLayout>
@ -93,24 +96,27 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.github.axet.androidlibrary.widgets.RoundButton
<ImageButton
android:id="@+id/recording_cancel"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:gravity="center"
android:src="@drawable/ic_close_24dp"
android:text="Cancel" />
<com.github.axet.androidlibrary.widgets.RoundButton
<ImageButton
android:id="@+id/recording_pause"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/ic_pause_24dp" />
<com.github.axet.androidlibrary.widgets.RoundButton
<ImageButton
android:id="@+id/recording_done"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/ic_done" />
</com.github.axet.androidlibrary.widgets.EqualLinearLayout>

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="secondBackground" format="color" />
<attr name="roundButton" format="reference" />
</resources>

View file

@ -3,4 +3,6 @@
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="secondBackground">#33333333</color>
<color name="colorAccentLight">#FF4081</color>
<color name="colorAccentDark">#a4a4a4</color>
</resources>

View file

@ -3,8 +3,9 @@
<style name="AppThemeLight" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">#FF4081</item>
<item name="colorAccent">@color/colorAccentLight</item>
<item name="secondBackground">#c2c2c2</item>
<item name="roundButton">@drawable/round_button_light</item>
</style>
<style name="AppThemeLight.NoActionBar">
@ -19,8 +20,9 @@
<style name="AppThemeDark" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">#a4a4a4</item>
<item name="colorAccent">@color/colorAccentDark</item>
<item name="secondBackground">#151515</item>
<item name="roundButton">@drawable/round_button_dark</item>
</style>
<style name="AppThemeDark.NoActionBar">