From ce18ae7fb27ab07b32b16111007da495c818f98e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 2 Apr 2017 17:14:45 +0200
Subject: [PATCH] flip the order of some settings

---
 .../calendar/activities/SettingsActivity.kt   |  2 +-
 app/src/main/res/layout/activity_settings.xml | 86 +++++++++----------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
index 956f1e6e5..ccbc17481 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
@@ -45,10 +45,10 @@ class SettingsActivity : SimpleActivity() {
         setupManageEventTypes()
         setupHourFormat()
         setupSundayFirst()
+        setupWeekNumbers()
         setupGoogleSync()
         setupWeeklyStart()
         setupWeeklyEnd()
-        setupWeekNumbers()
         setupVibrate()
         setupReminderSound()
         setupEventReminder()
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index fb7a700bb..aff1fdf62 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -110,41 +110,6 @@
 
         </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/settings_reminder_sound_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/bigger_margin"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
-            android:paddingTop="@dimen/bigger_margin">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_reminder_sound_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/settings_reminder_sound"
-                android:layout_toStartOf="@+id/settings_reminder_sound"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
-                android:text="@string/reminder_sound"/>
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_reminder_sound"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="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
             android:id="@+id/settings_sunday_first_holder"
             android:layout_width="match_parent"
@@ -165,6 +130,26 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_week_numbers_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:padding="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_week_numbers"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/week_numbers"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_start_weekly_at_holder"
             android:layout_width="match_parent"
@@ -226,22 +211,37 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/settings_week_numbers_holder"
+            android:id="@+id/settings_reminder_sound_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/activity_margin">
+            android:paddingBottom="@dimen/bigger_margin"
+            android:paddingLeft="@dimen/activity_margin"
+            android:paddingRight="@dimen/activity_margin"
+            android:paddingTop="@dimen/bigger_margin">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_week_numbers"
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_reminder_sound_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/settings_reminder_sound"
+                android:layout_toStartOf="@+id/settings_reminder_sound"
                 android:paddingLeft="@dimen/medium_margin"
-                android:paddingStart="@dimen/medium_margin"
-                android:text="@string/week_numbers"/>
+                android:paddingRight="@dimen/medium_margin"
+                android:text="@string/reminder_sound"/>
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_reminder_sound"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="@dimen/small_margin"
+                android:layout_marginRight="@dimen/small_margin"
+                android:background="@null"
+                android:clickable="false"/>
 
         </RelativeLayout>