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

replace the spinners at Settings with radiobutton dialogs

This commit is contained in:
tibbi 2017-04-02 18:14:53 +02:00
parent ce18ae7fb2
commit e9efd38cc6
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,15 +6,14 @@ import android.media.RingtoneManager
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable import android.os.Parcelable
import android.view.View
import android.widget.AdapterView
import android.widget.ArrayAdapter
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.extensions.dbHelper import com.simplemobiletools.calendar.extensions.dbHelper
import com.simplemobiletools.calendar.extensions.getReminderText import com.simplemobiletools.calendar.extensions.getReminderText
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.models.RadioItem
import kotlinx.android.synthetic.main.activity_settings.* import kotlinx.android.synthetic.main.activity_settings.*
class SettingsActivity : SimpleActivity() { class SettingsActivity : SimpleActivity() {
@ -114,40 +113,34 @@ class SettingsActivity : SimpleActivity() {
} }
private fun setupWeeklyStart() { private fun setupWeeklyStart() {
settings_start_weekly_at.apply { settings_start_weekly_at.text = getHoursString(config.startWeeklyAt)
adapter = getWeeklyAdapter() settings_start_weekly_at_holder.setOnClickListener {
setSelection(config.startWeeklyAt) val items = ArrayList<RadioItem>()
onItemSelectedListener = object : AdapterView.OnItemSelectedListener { (0..24).mapTo(items) { RadioItem(it, getHoursString(it)) }
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
if (selectedItemPosition >= config.endWeeklyAt) {
toast(R.string.day_end_before_start)
setSelection(config.startWeeklyAt)
} else {
config.startWeeklyAt = selectedItemPosition
}
}
override fun onNothingSelected(parent: AdapterView<*>?) { RadioGroupDialog(this@SettingsActivity, items, config.startWeeklyAt) {
if (it as Int >= config.endWeeklyAt) {
toast(R.string.day_end_before_start)
} else {
config.startWeeklyAt = it
settings_start_weekly_at.text = getHoursString(it)
} }
} }
} }
} }
private fun setupWeeklyEnd() { private fun setupWeeklyEnd() {
settings_end_weekly_at.apply { settings_end_weekly_at.text = getHoursString(config.endWeeklyAt)
adapter = getWeeklyAdapter() settings_end_weekly_at_holder.setOnClickListener {
setSelection(config.endWeeklyAt) val items = ArrayList<RadioItem>()
onItemSelectedListener = object : AdapterView.OnItemSelectedListener { (0..24).mapTo(items) { RadioItem(it, getHoursString(it)) }
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
if (selectedItemPosition <= config.startWeeklyAt) {
toast(R.string.day_end_before_start)
setSelection(config.endWeeklyAt)
} else {
config.endWeeklyAt = selectedItemPosition
}
}
override fun onNothingSelected(parent: AdapterView<*>?) { RadioGroupDialog(this@SettingsActivity, items, config.endWeeklyAt) {
if (it as Int <= config.startWeeklyAt) {
toast(R.string.day_end_before_start)
} else {
config.endWeeklyAt = it
settings_end_weekly_at.text = getHoursString(it)
} }
} }
} }
@ -203,13 +196,12 @@ class SettingsActivity : SimpleActivity() {
} }
} }
private fun getWeeklyAdapter(): ArrayAdapter<String> { private fun getHoursString(hours: Int): String {
val adapter = ArrayAdapter<String>(this, android.R.layout.simple_spinner_item) return if (hours < 10) {
for (i in 0..24) { "0$hours:00"
adapter.add("$i:00") } else {
"$hours:00"
} }
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
return adapter
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
@ -223,7 +215,7 @@ class SettingsActivity : SimpleActivity() {
config.reminderSound = uri.toString() config.reminderSound = uri.toString()
} }
} else if (requestCode == REQUEST_ACCOUNT_NAME && resultData?.extras != null) { } else if (requestCode == REQUEST_ACCOUNT_NAME && resultData?.extras != null) {
val accountName = resultData!!.getStringExtra(AccountManager.KEY_ACCOUNT_NAME) val accountName = resultData.getStringExtra(AccountManager.KEY_ACCOUNT_NAME)
config.syncAccountName = accountName config.syncAccountName = accountName
//tryEnablingSync() //tryEnablingSync()
} else if (requestCode == REQUEST_AUTHORIZATION) { } else if (requestCode == REQUEST_AUTHORIZATION) {

28
app/src/main/res/layout/activity_settings.xml
View File

@ -155,10 +155,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/bigger_margin"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/medium_margin" android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"> android:paddingTop="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_start_weekly_at_label" android:id="@+id/settings_start_weekly_at_label"
@ -171,12 +171,16 @@
android:paddingRight="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin"
android:text="@string/start_weekly_at"/> android:text="@string/start_weekly_at"/>
<com.simplemobiletools.commons.views.MyAppCompatSpinner <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_start_weekly_at" android:id="@+id/settings_start_weekly_at"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"/> android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
</RelativeLayout> </RelativeLayout>
@ -185,10 +189,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/bigger_margin"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/medium_margin" android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"> android:paddingTop="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_end_weekly_at_label" android:id="@+id/settings_end_weekly_at_label"
@ -201,12 +205,16 @@
android:paddingRight="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin"
android:text="@string/end_weekly_at"/> android:text="@string/end_weekly_at"/>
<com.simplemobiletools.commons.views.MyAppCompatSpinner <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_end_weekly_at" android:id="@+id/settings_end_weekly_at"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"/> android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
</RelativeLayout> </RelativeLayout>