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

New icon for auto silenced text

Browse Source
This commit is contained in:
Phillip Hsu 2016-09-05 18:17:32 -07:00
parent ed351ab859
commit f4addce363
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java
View File

@ -68,12 +68,6 @@ public class AlarmActivity extends RingtoneActivity<Alarm> {
getLayoutInflater().inflate(R.layout.content_header_alarm_activity, parent, true);
}
@Override
protected int getAutoSilencedDrawable() {
// TODO: correct icon
return R.drawable.ic_half_day_1_24dp;
}
@Override
protected int getAutoSilencedText() {
return R.string.alarm_auto_silenced_text;

4
app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
View File

@ -56,7 +56,9 @@ public abstract class RingtoneActivity<T extends Parcelable> extends AppCompatAc
protected abstract void getHeaderContent(ViewGroup parent);
@DrawableRes
protected abstract int getAutoSilencedDrawable();
protected int getAutoSilencedDrawable() {
return R.drawable.ic_error_outline_96dp;
}
@StringRes
protected abstract int getAutoSilencedText();

6
app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
View File

@ -61,12 +61,6 @@ public class TimesUpActivity extends RingtoneActivity<Timer> {
parent.addView(countdown);
}
@Override
protected int getAutoSilencedDrawable() {
// TODO: correct icon
return R.drawable.ic_half_day_1_24dp;
}
@Override
protected int getAutoSilencedText() {
return R.string.timer_auto_silenced_text;

4
app/src/main/res/drawable/ic_error_outline_96dp.xml Normal file
View File

@ -0,0 +1,4 @@
<vector android:height="96dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="96dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF" android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
</vector>

2
app/src/main/res/layout/activity_ringtone.xml
View File

@ -35,9 +35,7 @@
android:id="@+id/auto_silenced_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_half_day_1_24dp"
android:drawablePadding="8dp"
android:text="@string/alarm_auto_silenced_text"
style="@style/TextAppearance.AppCompat.Large"
android:theme="@style/AppTheme.TextOverlay"
android:layout_marginBottom="16dp"/>