hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix layout of EditTimerActivity. Create landscape layout.

Browse Source
This commit is contained in:
Phillip Hsu
2016-09-06 18:08:02 -07:00
parent 5d5002a6d7
commit f3e01995a1
9 changed files with 300 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/values/dimens.xml
+3
View File
@@ -64,6 +64,9 @@
<dimen name="expanded_alarm_elevation">2dp</dimen> <!--TODO: Increase for v21-->
<dimen name="label_height">48dp</dimen>
<!--EditTimerActivity-->
<dimen name="field_end_margin">8dp</dimen>
<dimen name="text_size_body_1">14sp</dimen>
<dimen name="text_size_body_2">14sp</dimen>
<dimen name="text_size_button">14sp</dimen>
app/src/main/res/values/styles_timer.xml
+24 -2
View File
@@ -4,13 +4,24 @@
<item name="android:layout_centerHorizontal">true</item>
<item name="android:padding">@dimen/cardview_margin</item>
</style>
<style name="TimerCountdown" parent="TextAppearance.AppCompat">
<style name="TimerText" parent="TextAppearance.AppCompat">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:layout_centerHorizontal">true</item>
<item name="android:textSize">@dimen/text_size_display_2</item>
</style>
<style name="TimerText.Countdown">
<item name="android:layout_centerHorizontal">true</item>
</style>
<style name="TimerText.EditField">
<item name="android:text">00</item>
<item name="android:textSize">@dimen/text_size_display_3</item>
<item name="android:background">@android:color/transparent</item>
</style>
<style name="TimerText.FieldLabel">
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:layout_marginEnd">@dimen/field_end_margin</item>
</style>
<style name="TimerSeekBar" parent="BaseSeekBar">
<item name="android:splitTrack">false</item> <!--TODO: Move to v21?-->
</style>
@@ -33,4 +44,15 @@
<item name="android:textColor">?attr/themedIconTint</item>
<item name="android:textStyle">bold</item>
</style>
<!--Style for the FAB in EditTimerActivity-->
<style name="BaseTimerFab">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:src">@drawable/ic_start_24dp</item>
</style>
<style name="TimerFab" parent="BaseTimerFab"/>
<style name="GridLayoutTimerNumpadButton" parent="GridLayoutNumpadButton">
<item name="android:layout_height">0dp</item>
<item name="layout_rowWeight">1</item>
</style>
</resources>