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

replaces switches with checkboxes at selecting CalDAV calendars

Browse Source
This commit is contained in:
tibbi 2021-11-23 13:56:54 +01:00
parent b53e427909
commit 30d125e840
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectCalendarsDialog.kt
View File

@ -4,13 +4,13 @@ import android.text.TextUtils
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.RelativeLayout import android.widget.RelativeLayout
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.SwitchCompat
import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.calendar.pro.R
import com.simplemobiletools.calendar.pro.activities.SimpleActivity import com.simplemobiletools.calendar.pro.activities.SimpleActivity
import com.simplemobiletools.calendar.pro.extensions.calDAVHelper import com.simplemobiletools.calendar.pro.extensions.calDAVHelper
import com.simplemobiletools.calendar.pro.extensions.config import com.simplemobiletools.calendar.pro.extensions.config
import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.views.MyAppCompatCheckbox
import kotlinx.android.synthetic.main.calendar_item_account.view.* import kotlinx.android.synthetic.main.calendar_item_account.view.*
import kotlinx.android.synthetic.main.calendar_item_calendar.view.* import kotlinx.android.synthetic.main.calendar_item_calendar.view.*
import kotlinx.android.synthetic.main.dialog_select_calendars.view.* import kotlinx.android.synthetic.main.dialog_select_calendars.view.*
@ -39,11 +39,11 @@ class SelectCalendarsDialog(val activity: SimpleActivity, val callback: () -> Un
} }
dialog = AlertDialog.Builder(activity) dialog = AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok) { dialogInterface, i -> confirmSelection() } .setPositiveButton(R.string.ok) { dialogInterface, i -> confirmSelection() }
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.create().apply { .create().apply {
activity.setupDialogStuff(view, this, R.string.select_caldav_calendars) activity.setupDialogStuff(view, this, R.string.select_caldav_calendars)
} }
} }
private fun addCalendarItem(isEvent: Boolean, text: String, tag: Int = 0, shouldCheck: Boolean = false) { private fun addCalendarItem(isEvent: Boolean, text: String, tag: Int = 0, shouldCheck: Boolean = false) {
@ -73,7 +73,7 @@ class SelectCalendarsDialog(val activity: SimpleActivity, val callback: () -> Un
val child = view.dialog_select_calendars_holder.getChildAt(i) val child = view.dialog_select_calendars_holder.getChildAt(i)
if (child is RelativeLayout) { if (child is RelativeLayout) {
val check = child.getChildAt(0) val check = child.getChildAt(0)
if (check is SwitchCompat && check.isChecked) { if (check is MyAppCompatCheckbox && check.isChecked) {
calendarIds.add(check.tag as Int) calendarIds.add(check.tag as Int)
} }
} }

2
app/src/main/res/layout/calendar_item_account.xml
View File

@ -4,7 +4,7 @@
android:id="@+id/calendar_item_account" android:id="@+id/calendar_item_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/big_margin" android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:alpha="0.8" android:alpha="0.8"

7
app/src/main/res/layout/calendar_item_calendar.xml
View File

@ -4,15 +4,16 @@
android:id="@+id/calendar_item_calendar_holder" android:id="@+id/calendar_item_calendar_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"> android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/calendar_item_calendar_switch" android:id="@+id/calendar_item_calendar_switch"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/big_margin" android:paddingStart="@dimen/small_margin"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/activity_margin"