fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/auto_backup_strings' into auto_backup_strings

This commit is contained in:
Naveen 2023-03-19 15:17:17 +05:30
parent 2b96480346 f8a0ea1d35
commit 45932e429b
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -70,7 +70,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:2794ea914a' implementation 'com.github.SimpleMobileTools:Simple-Commons:36efd1c355'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

3
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
View File

@ -21,6 +21,7 @@ import android.view.inputmethod.EditorInfo
import android.widget.ImageView import android.widget.ImageView
import android.widget.RelativeLayout import android.widget.RelativeLayout
import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.MaterialTimePicker
import com.google.android.material.timepicker.MaterialTimePicker.INPUT_MODE_CLOCK
import com.google.android.material.timepicker.TimeFormat import com.google.android.material.timepicker.TimeFormat
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
@ -1376,6 +1377,7 @@ class EventActivity : SimpleActivity() {
.setTimeFormat(timeFormat) .setTimeFormat(timeFormat)
.setHour(mEventStartDateTime.hourOfDay) .setHour(mEventStartDateTime.hourOfDay)
.setMinute(mEventStartDateTime.minuteOfHour) .setMinute(mEventStartDateTime.minuteOfHour)
.setInputMode(INPUT_MODE_CLOCK)
.build() .build()
timePicker.addOnPositiveButtonClickListener { timePicker.addOnPositiveButtonClickListener {
@ -1419,6 +1421,7 @@ class EventActivity : SimpleActivity() {
.setTimeFormat(timeFormat) .setTimeFormat(timeFormat)
.setHour(mEventEndDateTime.hourOfDay) .setHour(mEventEndDateTime.hourOfDay)
.setMinute(mEventEndDateTime.minuteOfHour) .setMinute(mEventEndDateTime.minuteOfHour)
.setInputMode(INPUT_MODE_CLOCK)
.build() .build()
timePicker.addOnPositiveButtonClickListener { timePicker.addOnPositiveButtonClickListener {

1
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
View File

@ -741,6 +741,7 @@ class SettingsActivity : SimpleActivity() {
.setTimeFormat(timeFormat) .setTimeFormat(timeFormat)
.setHour(currentDateTime.hourOfDay) .setHour(currentDateTime.hourOfDay)
.setMinute(currentDateTime.minuteOfHour) .setMinute(currentDateTime.minuteOfHour)
.setInputMode(MaterialTimePicker.INPUT_MODE_CLOCK)
.build() .build()
timePicker.addOnPositiveButtonClickListener { timePicker.addOnPositiveButtonClickListener {

1
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
View File

@ -563,6 +563,7 @@ class TaskActivity : SimpleActivity() {
.setTimeFormat(timeFormat) .setTimeFormat(timeFormat)
.setHour(mTaskDateTime.hourOfDay) .setHour(mTaskDateTime.hourOfDay)
.setMinute(mTaskDateTime.minuteOfHour) .setMinute(mTaskDateTime.minuteOfHour)
.setInputMode(MaterialTimePicker.INPUT_MODE_CLOCK)
.build() .build()
timePicker.addOnPositiveButtonClickListener { timePicker.addOnPositiveButtonClickListener {