fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

scroll to the current time zone at the selector by default

Browse Source
This commit is contained in:
tibbi
2019-12-10 22:38:29 +01:00
parent 393abbaf90
commit 2796cfdfe4
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1186,6 +1186,7 @@ class EventActivity : SimpleActivity() {
private fun setupTimeZone() { private fun setupTimeZone() {
Intent(this, SelectTimeZoneActivity::class.java).apply { Intent(this, SelectTimeZoneActivity::class.java).apply {
putExtra(CURRENT_TIME_ZONE, mEvent.getTimeZoneString())
startActivityForResult(this, SELECT_TIME_ZONE_INTENT) startActivityForResult(this, SELECT_TIME_ZONE_INTENT)
} }
} }

12
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SelectTimeZoneActivity.kt
View File

@@ -10,6 +10,7 @@ import androidx.appcompat.widget.SearchView
import androidx.core.view.MenuItemCompat import androidx.core.view.MenuItemCompat
import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.calendar.pro.R
import com.simplemobiletools.calendar.pro.adapters.SelectTimeZoneAdapter import com.simplemobiletools.calendar.pro.adapters.SelectTimeZoneAdapter
import com.simplemobiletools.calendar.pro.helpers.CURRENT_TIME_ZONE
import com.simplemobiletools.calendar.pro.helpers.TIME_ZONE import com.simplemobiletools.calendar.pro.helpers.TIME_ZONE
import com.simplemobiletools.calendar.pro.helpers.getAllTimeZones import com.simplemobiletools.calendar.pro.helpers.getAllTimeZones
import com.simplemobiletools.calendar.pro.models.MyTimeZone import com.simplemobiletools.calendar.pro.models.MyTimeZone
@@ -18,13 +19,14 @@ import java.util.*
class SelectTimeZoneActivity : SimpleActivity() { class SelectTimeZoneActivity : SimpleActivity() {
private var mSearchMenuItem: MenuItem? = null private var mSearchMenuItem: MenuItem? = null
private val allTimeZones = getAllTimeZones()
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_select_time_zone) setContentView(R.layout.activity_select_time_zone)
title = "" title = ""
SelectTimeZoneAdapter(this, getAllTimeZones()) { SelectTimeZoneAdapter(this, allTimeZones) {
val data = Intent() val data = Intent()
data.putExtra(TIME_ZONE, it as MyTimeZone) data.putExtra(TIME_ZONE, it as MyTimeZone)
setResult(RESULT_OK, data) setResult(RESULT_OK, data)
@@ -32,6 +34,12 @@ class SelectTimeZoneActivity : SimpleActivity() {
}.apply { }.apply {
select_time_zone_list.adapter = this select_time_zone_list.adapter = this
} }
val currentTimeZone = intent.getStringExtra(CURRENT_TIME_ZONE) ?: TimeZone.getDefault().id
val pos = allTimeZones.indexOfFirst { it.zoneName.equals(currentTimeZone, true) }
if (pos != -1) {
select_time_zone_list.scrollToPosition(pos)
}
} }
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -74,7 +82,7 @@ class SelectTimeZoneActivity : SimpleActivity() {
} }
private fun searchQueryChanged(text: String) { private fun searchQueryChanged(text: String) {
val timeZones = getAllTimeZones().filter { val timeZones = allTimeZones.filter {
it.zoneName.toLowerCase(Locale.getDefault()).contains(text.toLowerCase(Locale.getDefault())) it.zoneName.toLowerCase(Locale.getDefault()).contains(text.toLowerCase(Locale.getDefault()))
}.toMutableList() as ArrayList<MyTimeZone> }.toMutableList() as ArrayList<MyTimeZone>
(select_time_zone_list.adapter as? SelectTimeZoneAdapter)?.updateTimeZones(timeZones) (select_time_zone_list.adapter as? SelectTimeZoneAdapter)?.updateTimeZones(timeZones)

1
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
View File

@@ -18,6 +18,7 @@ const val VIEW_TO_OPEN = "view_to_open"
const val SHORTCUT_NEW_EVENT = "shortcut_new_event" const val SHORTCUT_NEW_EVENT = "shortcut_new_event"
const val REGULAR_EVENT_TYPE_ID = 1L const val REGULAR_EVENT_TYPE_ID = 1L
const val TIME_ZONE = "time_zone" const val TIME_ZONE = "time_zone"
const val CURRENT_TIME_ZONE = "current_time_zone"
const val MONTHLY_VIEW = 1 const val MONTHLY_VIEW = 1
const val YEARLY_VIEW = 2 const val YEARLY_VIEW = 2