From 1354faf8c7feabed6c5f8d002178b4c2384d7815 Mon Sep 17 00:00:00 2001
From: Kacper Ziubryniewicz <kapi2289@gmail.com>
Date: Sat, 29 Feb 2020 00:43:25 +0100
Subject: [PATCH] [Dialog/GenerateBlockTimetable] Make better dialog layout.

---
 .../timetable/GenerateBlockTimetableDialog.kt |  31 ++---
 .../dialog_generate_block_timetable.xml       | 108 +++++++-----------
 2 files changed, 50 insertions(+), 89 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt
index 3f947761..0cfa9e36 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt
@@ -77,34 +77,25 @@ class GenerateBlockTimetableDialog(
 
         b = DialogGenerateBlockTimetableBinding.inflate(activity.layoutInflater)
 
-        b.showProfileNameItem.onClick { b.showProfileNameCheckbox.trigger() }
+        b.withChangesCurrentWeekRadio.setText(R.string.timetable_generate_current_week_format, weekCurrentStart.formattedStringShort, weekCurrentEnd.formattedStringShort)
+        b.withChangesNextWeekRadio.setText(R.string.timetable_generate_next_week_format, weekNextStart.formattedStringShort, weekCurrentEnd.formattedStringShort)
+
         b.showProfileNameCheckbox.setOnCheckedChangeListener { _, isChecked -> showProfileName = isChecked }
-
-        b.showTeachersNamesItem.onClick { b.showTeachersNamesCheckbox.trigger() }
         b.showTeachersNamesCheckbox.setOnCheckedChangeListener { _, isChecked -> showTeachersNames = isChecked }
-
-        b.noColorsItem.onClick { b.noColorsCheckbox.trigger() }
         b.noColorsCheckbox.setOnCheckedChangeListener { _, isChecked -> noColors = isChecked }
 
         dialog = MaterialAlertDialogBuilder(activity)
                 .setTitle(R.string.timetable_generate_range)
-                .setItems(arrayOf(
-                        activity.getString(R.string.timetable_generate_current_week_format, weekCurrentStart.formattedStringShort, weekCurrentEnd.formattedStringShort)
-                                .asColoredSpannable(android.R.attr.textColorPrimary.resolveAttr(activity)),
-                        activity.getString(R.string.timetable_generate_next_week_format, weekNextStart.formattedStringShort, weekNextEnd.formattedStringShort)
-                                .asColoredSpannable(android.R.attr.textColorPrimary.resolveAttr(activity)),
-                        activity.getString(R.string.timetable_generate_selected_week)
-                                .asColoredSpannable(android.R.attr.textColorPrimary.resolveAttr(activity))
-                )) { dialog, which ->
-                    dialog.dismiss()
-                    when (which) {
-                        0 -> generateBlockTimetable(weekCurrentStart, weekCurrentEnd)
-                        1 -> generateBlockTimetable(weekNextStart, weekNextEnd)
-                        2 -> selectDate()
-                    }
-                }
                 .setView(b.root)
                 .setNeutralButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .setPositiveButton(R.string.save) { dialog, _ ->
+                    dialog.dismiss()
+                    when (b.weekSelectionRadioGroup.checkedRadioButtonId) {
+                        R.id.withChangesCurrentWeekRadio -> generateBlockTimetable(weekCurrentStart, weekCurrentEnd)
+                        R.id.withChangesNextWeekRadio -> generateBlockTimetable(weekNextStart, weekNextEnd)
+                        R.id.forSelectedWeekRadio -> selectDate()
+                    }
+                }
                 .setOnDismissListener { onDismissListener?.invoke(TAG) }
                 .show()
     }}
diff --git a/app/src/main/res/layout/dialog_generate_block_timetable.xml b/app/src/main/res/layout/dialog_generate_block_timetable.xml
index e4f2d01b..0a4164c9 100644
--- a/app/src/main/res/layout/dialog_generate_block_timetable.xml
+++ b/app/src/main/res/layout/dialog_generate_block_timetable.xml
@@ -2,87 +2,57 @@
   ~ Copyright (c) Kacper Ziubryniewicz 2020-1-5
   -->
 
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingHorizontal="20dp">
 
-        <LinearLayout
-            android:id="@+id/showProfileNameItem"
+        <RadioGroup
+            android:id="@+id/weekSelectionRadioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RadioButton
+                android:id="@+id/withChangesCurrentWeekRadio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                tools:text="@string/timetable_generate_current_week_format" />
+
+            <RadioButton
+                android:id="@+id/withChangesNextWeekRadio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="@string/timetable_generate_next_week_format" />
+
+            <RadioButton
+                android:id="@+id/forSelectedWeekRadio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/timetable_generate_selected_week" />
+        </RadioGroup>
+
+        <CheckBox
+            android:id="@+id/showProfileNameCheckbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:orientation="horizontal">
+            android:text="@string/timetable_generate_show_profile_name" />
 
-            <CheckBox
-                android:id="@+id/showProfileNameCheckbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/timetable_generate_show_profile_name" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/showTeachersNamesItem"
+        <CheckBox
+            android:id="@+id/showTeachersNamesCheckbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:orientation="horizontal">
+            android:checked="true"
+            android:text="@string/timetable_generate_show_teachers_names" />
 
-            <CheckBox
-                android:id="@+id/showTeachersNamesCheckbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:checked="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/timetable_generate_show_teachers_names" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/noColorsItem"
+        <CheckBox
+            android:id="@+id/noColorsCheckbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:orientation="horizontal">
-
-            <CheckBox
-                android:id="@+id/noColorsCheckbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/timetable_generate_no_colors" />
-        </LinearLayout>
+            android:text="@string/timetable_generate_no_colors" />
     </LinearLayout>
 </layout>