tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Karim Abou Zeid 2016-02-28 23:02:59 +01:00
commit 8d3cc602c4
6 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/activity_album_tag_editor.xml
View file

@ -149,7 +149,7 @@
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/play_pause_fab" android:id="@+id/play_pause_fab"
style="@style/PlayPauseFab" style="@style/Fab"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin_top_left_right" android:layout_margin="@dimen/fab_margin_top_left_right"
app:srcCompat="@drawable/ic_done_white_24dp" /> app:srcCompat="@drawable/ic_done_white_24dp" />

2
app/src/main/res/layout/activity_song_tag_editor.xml
View file

@ -173,7 +173,7 @@
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/play_pause_fab" android:id="@+id/play_pause_fab"
style="@style/PlayPauseFab" style="@style/Fab"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin_top_left_right" android:layout_margin="@dimen/fab_margin_top_left_right"
app:srcCompat="@drawable/ic_done_white_24dp" /> app:srcCompat="@drawable/ic_done_white_24dp" />

2
app/src/main/res/layout/fragment_playback_controls.xml
View file

@ -126,7 +126,7 @@
app:pressedTranslationZ="2dp" app:pressedTranslationZ="2dp"
app:elevation="4dp" app:elevation="4dp"
android:id="@+id/player_play_pause_fab" android:id="@+id/player_play_pause_fab"
style="@style/PlayPauseFab" style="@style/Fab"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
</RelativeLayout> </RelativeLayout>

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

@ -19,7 +19,7 @@
<style name="Theme.Phonograph.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" /> <style name="Theme.Phonograph.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
<style name="PlayPauseFab" parent="PlayPauseFabParent"> <style name="Fab" parent="FabParent">
<item name="android:transitionName">@string/transition_fab</item> <item name="android:transitionName">@string/transition_fab</item>
</style> </style>

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

@ -28,7 +28,7 @@
<item name="android:layout_gravity">center</item> <item name="android:layout_gravity">center</item>
</style> </style>
<style name="PlayPauseFab" parent="PlayPauseFabParent" /> <style name="Fab" parent="FabParent" />
<style name="MusicProgressSlider" parent="MusicProgressSliderParent"> <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
<item name="android:thumbOffset">0dp</item> <item name="android:thumbOffset">0dp</item>

14
app/src/main/res/values/styles_parents.xml
View file

@ -67,7 +67,7 @@
<item name="md_background_color">@color/grey_900</item> <item name="md_background_color">@color/grey_900</item>
</style> </style>
<style name="PlayPauseFabParent"> <style name="FabParent">
<item name="borderWidth">0dp</item> <item name="borderWidth">0dp</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
@ -87,18 +87,6 @@
<item name="android:layout_marginRight">@dimen/seek_bar_margin_left_right</item> <item name="android:layout_marginRight">@dimen/seek_bar_margin_left_right</item>
</style> </style>
<style name="OverFlowButtonParent">
<item name="android:tint">?attr/iconColor</item>
<item name="srcCompat">@drawable/abc_ic_menu_overflow_material</item>
<item name="android:layout_margin">8dp</item>
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:scaleType">center</item>
<item name="android:background">?attr/roundSelector</item>
<item name="android:focusableInTouchMode">false</item>
<item name="android:focusable">false</item>
</style>
<!-- content description is necessary to find the overflow button later in the layout--> <!-- content description is necessary to find the overflow button later in the layout-->
<style name="Widget.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow"> <style name="Widget.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
<item name="android:contentDescription">@string/abc_action_menu_overflow_description</item> <item name="android:contentDescription">@string/abc_action_menu_overflow_description</item>