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

New preferences for timers

Browse Source
This commit is contained in:
Phillip Hsu 2016-08-08 18:58:07 -07:00
parent 74ec0fd883
commit 3e542f585e
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java
View File

@ -7,7 +7,6 @@ import android.media.Ringtone;
import android.media.RingtoneManager; import android.media.RingtoneManager;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
import android.preference.RingtonePreference; import android.preference.RingtonePreference;
@ -61,14 +60,10 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
Preference pref = findPreference(key); Preference pref = findPreference(key);
// Setting a ListPreference's summary value to "%s" in XML automatically updates the // Setting a ListPreference's summary value to "%s" in XML automatically updates the
// preference's summary to display the selected value. // preference's summary to display the selected value.
if (!(pref instanceof ListPreference)) { if (pref instanceof RingtonePreference) {
String summary = prefs.getString(key, ""); Uri ringtoneUri = Uri.parse(prefs.getString(key, ""));
if (pref instanceof RingtonePreference) { Ringtone ringtone = RingtoneManager.getRingtone(getActivity(), ringtoneUri);
Uri ringtoneUri = Uri.parse(summary); pref.setSummary(ringtone.getTitle(getActivity()));
Ringtone ringtone = RingtoneManager.getRingtone(getActivity(), ringtoneUri);
summary = ringtone.getTitle(getActivity());
}
pref.setSummary(summary);
} }
} }
} }

10
app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
View File

@ -3,6 +3,7 @@ package com.philliphsu.clock2.timers;
import android.app.Notification; import android.app.Notification;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.preference.PreferenceManager;
import android.provider.Settings; import android.provider.Settings;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
@ -54,8 +55,9 @@ public class TimerRingtoneService extends RingtoneService<Timer> {
@Override @Override
protected Uri getRingtoneUri() { protected Uri getRingtoneUri() {
// TODO: Read Timer ringtone preference String ringtone = PreferenceManager.getDefaultSharedPreferences(this).getString(
return Settings.System.DEFAULT_ALARM_ALERT_URI; getString(R.string.key_timer_ringtone), Settings.System.ALARM_ALERT);
return Uri.parse(ringtone);
} }
@Override @Override
@ -82,8 +84,8 @@ public class TimerRingtoneService extends RingtoneService<Timer> {
@Override @Override
protected boolean doesVibrate() { protected boolean doesVibrate() {
// TODO: Create new preference. return PreferenceManager.getDefaultSharedPreferences(this).getBoolean(
return false; getString(R.string.key_timer_vibrate), false);
} }
@Override @Override

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

@ -22,7 +22,7 @@ import butterknife.OnClick;
*/ */
public class TimerViewHolder extends BaseViewHolder<Timer> { public class TimerViewHolder extends BaseViewHolder<Timer> {
private static final String TAG = "TimerViewHolder"; private static final String TAG = "TimerViewHolder";
private static final int MAX_PROGRESS = 10000; private static final int MAX_PROGRESS = 100000;
private final AsyncTimersTableUpdateHandler mAsyncTimersTableUpdateHandler; private final AsyncTimersTableUpdateHandler mAsyncTimersTableUpdateHandler;
private TimerController mController; private TimerController mController;

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

@ -4,4 +4,7 @@
<string name="key_timer_ringtone">key_timer_ringtone</string> <string name="key_timer_ringtone">key_timer_ringtone</string>
<string name="title_timer_ringtone">Ringtone</string> <string name="title_timer_ringtone">Ringtone</string>
<string name="key_timer_vibrate">key_timer_vibrate</string>
<string name="title_timer_vibrate">Vibrate</string>
</resources> </resources>

4
app/src/main/res/xml/preferences.xml
View File

@ -62,5 +62,9 @@
android:title="@string/title_timer_ringtone" android:title="@string/title_timer_ringtone"
android:ringtoneType="alarm" android:ringtoneType="alarm"
android:defaultValue="content://settings/system/alarm_alert"/> android:defaultValue="content://settings/system/alarm_alert"/>
<SwitchPreference
android:key="@string/key_timer_vibrate"
android:title="@string/title_timer_vibrate"
android:defaultValue="false"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>