mirror of
https://github.com/SimpleMobileTools/Simple-Clock.git
synced 2025-04-13 09:52:14 +02:00
Clock - Add labels to timers
This commit is contained in:
parent
08aa7bf62c
commit
ceeb3ccd22
@ -43,6 +43,7 @@ class TimerFragment : Fragment() {
|
|||||||
val textColor = config.textColor
|
val textColor = config.textColor
|
||||||
|
|
||||||
timer_time.text = config.timerSeconds.getFormattedDuration()
|
timer_time.text = config.timerSeconds.getFormattedDuration()
|
||||||
|
timer_label.setText(config.timerLabel)
|
||||||
|
|
||||||
requiredActivity.updateTextColors(timer_fragment)
|
requiredActivity.updateTextColors(timer_fragment)
|
||||||
timer_play_pause.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, context!!.getAdjustedPrimaryColor())
|
timer_play_pause.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, context!!.getAdjustedPrimaryColor())
|
||||||
@ -109,6 +110,10 @@ class TimerFragment : Fragment() {
|
|||||||
context.checkAlarmsWithDeletedSoundUri(sound.uri)
|
context.checkAlarmsWithDeletedSoundUri(sound.uri)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
timer_label.onTextChangeListener { text ->
|
||||||
|
config.timerLabel = text
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return view
|
return view
|
||||||
|
@ -53,6 +53,10 @@ class Config(context: Context) : BaseConfig(context) {
|
|||||||
get() = prefs.getInt(TIMER_MAX_REMINDER_SECS, DEFAULT_MAX_TIMER_REMINDER_SECS)
|
get() = prefs.getInt(TIMER_MAX_REMINDER_SECS, DEFAULT_MAX_TIMER_REMINDER_SECS)
|
||||||
set(timerMaxReminderSecs) = prefs.edit().putInt(TIMER_MAX_REMINDER_SECS, timerMaxReminderSecs).apply()
|
set(timerMaxReminderSecs) = prefs.edit().putInt(TIMER_MAX_REMINDER_SECS, timerMaxReminderSecs).apply()
|
||||||
|
|
||||||
|
var timerLabel: String?
|
||||||
|
get() = prefs.getString(TIMER_LABEL, null)
|
||||||
|
set(label) = prefs.edit().putString(TIMER_LABEL, label).apply()
|
||||||
|
|
||||||
var alarmMaxReminderSecs: Int
|
var alarmMaxReminderSecs: Int
|
||||||
get() = prefs.getInt(ALARM_MAX_REMINDER_SECS, DEFAULT_MAX_ALARM_REMINDER_SECS)
|
get() = prefs.getInt(ALARM_MAX_REMINDER_SECS, DEFAULT_MAX_ALARM_REMINDER_SECS)
|
||||||
set(alarmMaxReminderSecs) = prefs.edit().putInt(ALARM_MAX_REMINDER_SECS, alarmMaxReminderSecs).apply()
|
set(alarmMaxReminderSecs) = prefs.edit().putInt(ALARM_MAX_REMINDER_SECS, alarmMaxReminderSecs).apply()
|
||||||
|
@ -13,6 +13,7 @@ const val TIMER_STATE = "timer_state"
|
|||||||
const val TIMER_VIBRATE = "timer_vibrate"
|
const val TIMER_VIBRATE = "timer_vibrate"
|
||||||
const val TIMER_SOUND_URI = "timer_sound_uri"
|
const val TIMER_SOUND_URI = "timer_sound_uri"
|
||||||
const val TIMER_SOUND_TITLE = "timer_sound_title"
|
const val TIMER_SOUND_TITLE = "timer_sound_title"
|
||||||
|
const val TIMER_LABEL = "timer_label"
|
||||||
const val TIMER_MAX_REMINDER_SECS = "timer_max_reminder_secs"
|
const val TIMER_MAX_REMINDER_SECS = "timer_max_reminder_secs"
|
||||||
const val ALARM_MAX_REMINDER_SECS = "alarm_max_reminder_secs"
|
const val ALARM_MAX_REMINDER_SECS = "alarm_max_reminder_secs"
|
||||||
const val ALARM_LAST_CONFIG = "alarm_last_config"
|
const val ALARM_LAST_CONFIG = "alarm_last_config"
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/timer_fragment"
|
android:id="@+id/timer_fragment"
|
||||||
@ -19,7 +18,7 @@
|
|||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
tools:text="00:00"/>
|
tools:text="00:00" />
|
||||||
|
|
||||||
<com.simplemobiletools.commons.views.MyTextView
|
<com.simplemobiletools.commons.views.MyTextView
|
||||||
android:id="@+id/timer_initial_time"
|
android:id="@+id/timer_initial_time"
|
||||||
@ -32,7 +31,7 @@
|
|||||||
android:padding="@dimen/activity_margin"
|
android:padding="@dimen/activity_margin"
|
||||||
android:textSize="@dimen/bigger_text_size"
|
android:textSize="@dimen/bigger_text_size"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/timer_time"
|
app:layout_constraintTop_toBottomOf="@+id/timer_time"
|
||||||
tools:text="05:00"/>
|
tools:text="05:00" />
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:id="@+id/timer_vibrate_holder"
|
android:id="@+id/timer_vibrate_holder"
|
||||||
@ -51,7 +50,7 @@
|
|||||||
android:drawableLeft="@drawable/ic_vibrate_vector"
|
android:drawableLeft="@drawable/ic_vibrate_vector"
|
||||||
android:drawablePadding="@dimen/normal_margin"
|
android:drawablePadding="@dimen/normal_margin"
|
||||||
android:text="@string/vibrate"
|
android:text="@string/vibrate"
|
||||||
android:textSize="@dimen/bigger_text_size"/>
|
android:textSize="@dimen/bigger_text_size" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
@ -65,7 +64,38 @@
|
|||||||
android:padding="@dimen/activity_margin"
|
android:padding="@dimen/activity_margin"
|
||||||
android:textSize="@dimen/bigger_text_size"
|
android:textSize="@dimen/bigger_text_size"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/timer_vibrate_holder"
|
app:layout_constraintTop_toBottomOf="@+id/timer_vibrate_holder"
|
||||||
tools:text="Default alarm"/>
|
tools:text="Default alarm" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:paddingStart="@dimen/activity_margin"
|
||||||
|
android:paddingTop="@dimen/medium_margin"
|
||||||
|
android:paddingEnd="@dimen/activity_margin"
|
||||||
|
android:paddingBottom="@dimen/medium_margin"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/timer_sound">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/timer_label_image"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:src="@drawable/ic_label_vector" />
|
||||||
|
|
||||||
|
<com.simplemobiletools.commons.views.MyEditText
|
||||||
|
android:id="@+id/timer_label"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:hint="@string/label"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:textCursorDrawable="@null"
|
||||||
|
android:textSize="@dimen/normal_text_size" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/timer_play_pause"
|
android:id="@+id/timer_play_pause"
|
||||||
@ -79,7 +109,7 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
app:layout_constraintStart_toStartOf="parent"/>
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/timer_reset"
|
android:id="@+id/timer_reset"
|
||||||
@ -94,6 +124,6 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="@+id/timer_play_pause"
|
app:layout_constraintBottom_toBottomOf="@+id/timer_play_pause"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/timer_play_pause"
|
app:layout_constraintEnd_toStartOf="@+id/timer_play_pause"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@+id/timer_play_pause"/>
|
app:layout_constraintTop_toTopOf="@+id/timer_play_pause" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user