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

Themed icon colors for TimerViewHolder

Browse Source
This commit is contained in:
Phillip Hsu 2016-08-31 21:05:27 -07:00
parent db3e60d4dc
commit c21cbc1124
10 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -10,7 +10,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme.Dark">
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name"

2
app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
View File

@ -33,7 +33,7 @@ public class TimerViewHolder extends BaseViewHolder<Timer> {
@Bind(R.id.label) TextView mLabel;
@Bind(R.id.duration) CountdownChronometer mChronometer;
@Bind(R.id.seek_bar) SeekBar mSeekBar;
@Bind(R.id.add_one_minute) ImageButton mAddOneMinute;
@Bind(R.id.add_one_minute) TextView mAddOneMinute;
@Bind(R.id.start_pause) ImageButton mStartPause;
@Bind(R.id.stop) ImageButton mStop;

2
app/src/main/res/drawable/ic_start_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFF"
android:pathData="M8,5v14l11,-7z"/>
</vector>

2
app/src/main/res/drawable/ic_stop_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFF"
android:pathData="M6,6h12v12H6z"/>
</vector>

19
app/src/main/res/layout-land/item_timer.xml
View File

@ -19,10 +19,7 @@
android:textSize="@dimen/text_size_medium"
android:maxLines="1"
android:ellipsize="end"
android:paddingStart="@dimen/cardview_margin"
android:paddingEnd="@dimen/cardview_margin"
android:paddingTop="@dimen/item_padding_top"
android:paddingBottom="@dimen/item_padding_bottom"/>
android:padding="@dimen/cardview_margin"/>
<com.philliphsu.clock2.timers.CountdownChronometer
android:id="@+id/duration"
@ -43,13 +40,19 @@
android:paddingEnd="0dp"
android:splitTrack="false"/>
<ImageButton
<!-- Fake icon, so use dp for textSize -->
<TextView
android:id="@+id/add_one_minute"
android:layout_width="@dimen/cardview_action_icon_size"
android:layout_height="@dimen/cardview_action_icon_size"
android:src="@drawable/ic_half_day_1_24dp"
android:background="?selectableItemBackground"
android:layout_below="@id/seek_bar"
android:gravity="center"
android:text="@string/add_one_minute_icon_text"
android:textSize="@dimen/add_one_minute_text_size"
android:textColor="?attr/themedIconTint"
android:textStyle="bold"
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/cardview_action_icon_margin"/>
@ -57,8 +60,9 @@
android:id="@+id/start_pause"
android:layout_width="@dimen/cardview_action_icon_size"
android:layout_height="@dimen/cardview_action_icon_size"
android:src="@drawable/ic_half_day_1_24dp"
android:src="@drawable/ic_start_24dp"
android:background="?selectableItemBackground"
android:tint="?attr/themedIconTint"
android:layout_below="@id/seek_bar"
android:layout_centerHorizontal="true"/>
@ -66,8 +70,9 @@
android:id="@+id/stop"
android:layout_width="@dimen/cardview_action_icon_size"
android:layout_height="@dimen/cardview_action_icon_size"
android:src="@drawable/ic_half_day_1_24dp"
android:src="@drawable/ic_stop_24dp"
android:background="?selectableItemBackground"
android:tint="?attr/themedIconTint"
android:layout_below="@id/seek_bar"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/cardview_action_icon_margin"/>

19
app/src/main/res/layout/item_timer.xml
View File

@ -20,10 +20,7 @@
android:textSize="@dimen/text_size_medium"
android:maxLines="1"
android:ellipsize="end"
android:paddingStart="@dimen/cardview_margin"
android:paddingEnd="@dimen/cardview_margin"
android:paddingTop="@dimen/item_padding_top"
android:paddingBottom="@dimen/item_padding_bottom"/>
android:padding="@dimen/cardview_margin"/>
<com.philliphsu.clock2.timers.CountdownChronometer
android:id="@+id/duration"
@ -44,13 +41,19 @@
android:paddingEnd="0dp"
android:splitTrack="false"/>
<ImageButton
<!-- Fake icon, so use dp for textSize -->
<TextView
android:id="@+id/add_one_minute"
android:layout_width="@dimen/cardview_action_icon_size"
android:layout_height="@dimen/cardview_action_icon_size"
android:src="@drawable/ic_half_day_1_24dp"
android:background="?selectableItemBackground"
android:layout_below="@id/seek_bar"
android:gravity="center"
android:text="@string/add_one_minute_icon_text"
android:textSize="@dimen/add_one_minute_text_size"
android:textColor="?attr/themedIconTint"
android:textStyle="bold"
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/cardview_action_icon_margin"/>
@ -58,8 +61,9 @@
android:id="@+id/start_pause"
android:layout_width="@dimen/cardview_action_icon_size"
android:layout_height="@dimen/cardview_action_icon_size"
android:src="@drawable/ic_half_day_1_24dp"
android:src="@drawable/ic_start_24dp"
android:background="?selectableItemBackground"
android:tint="?attr/themedIconTint"
android:layout_below="@id/seek_bar"
android:layout_centerHorizontal="true"/>
@ -67,8 +71,9 @@
android:id="@+id/stop"
android:layout_width="@dimen/cardview_action_icon_size"
android:layout_height="@dimen/cardview_action_icon_size"
android:src="@drawable/ic_half_day_1_24dp"
android:src="@drawable/ic_stop_24dp"
android:background="?selectableItemBackground"
android:tint="?attr/themedIconTint"
android:layout_below="@id/seek_bar"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/cardview_action_icon_margin"/>

2
app/src/main/res/values/attrs.xml
View File

@ -14,4 +14,6 @@
<attr name="secondaryText" format="string"/>
</declare-styleable>
<attr name="themedIconTint" format="reference|color"/>
</resources>

3
app/src/main/res/values/dimens.xml
View File

@ -57,6 +57,9 @@
<dimen name="laps_container_margin_top">8dp</dimen>
<dimen name="chronometer_padding">16dp</dimen>
<!-- TimerViewHolder -->
<dimen name="add_one_minute_text_size">18dp</dimen>
<dimen name="text_size_body_1">14sp</dimen>
<dimen name="text_size_body_2">14sp</dimen>
<dimen name="text_size_button">14sp</dimen>

1
app/src/main/res/values/strings.xml
View File

@ -197,6 +197,7 @@
<string name="add_one_minute">Add 1 minute</string>
<string name="stop">Stop</string>
<string name="timer_expired">Timer expired</string>
<string name="add_one_minute_icon_text">+60s</string>
<string name="alarm_auto_silenced_text">You missed your alarm.</string>
<string name="timer_auto_silenced_text">Your timer expired.</string>

5
app/src/main/res/values/styles.xml
View File

@ -10,17 +10,22 @@
<!--<item name="dialogTheme">@style/AppCompatDialogTheme</item>-->
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyle</item>
<item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
<item name="themedIconTint">@color/icon_color</item>
</style>
<style name="AppTheme.Dark" parent="Theme.AppCompat.NoActionBar">
<!--TODO: Define colorPrimaryInverse in colors.xml-->
<item name="colorPrimary">@color/dark_gray</item>
<!-- TODO: Define colorPrimaryDarkInverse in colors.xml -->
<item name="colorPrimaryDark">@color/dark_gray</item>
<!-- TODO: Define colorAccentInverse in colors.xml -->
<item name="colorAccent">@color/colorAccent</item>
<!-- TODO: This doesn't work for BottomSheetDialogs. Verify this works for other types of dialogs. -->
<!--<item name="dialogTheme">@style/AppCompatDialogTheme.Dark</item>-->
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyle.Dark</item>
<!--TODO: Dark theme-->
<item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
<item name="themedIconTint">@color/icon_color_dark</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>