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

flip the order of some settings

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

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

@ -45,10 +45,10 @@ class SettingsActivity : SimpleActivity() {
setupManageEventTypes() setupManageEventTypes()
setupHourFormat() setupHourFormat()
setupSundayFirst() setupSundayFirst()
setupWeekNumbers()
setupGoogleSync() setupGoogleSync()
setupWeeklyStart() setupWeeklyStart()
setupWeeklyEnd() setupWeeklyEnd()
setupWeekNumbers()
setupVibrate() setupVibrate()
setupReminderSound() setupReminderSound()
setupEventReminder() setupEventReminder()

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

@ -110,41 +110,6 @@
</RelativeLayout> </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 <RelativeLayout
android:id="@+id/settings_sunday_first_holder" android:id="@+id/settings_sunday_first_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -165,6 +130,26 @@
</RelativeLayout> </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 <RelativeLayout
android:id="@+id/settings_start_weekly_at_holder" android:id="@+id/settings_start_weekly_at_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -226,22 +211,37 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_week_numbers_holder" android:id="@+id/settings_reminder_sound_holder"
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:background="?attr/selectableItemBackground" 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 <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_week_numbers" android:id="@+id/settings_reminder_sound_label"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:layout_centerVertical="true"
android:clickable="false" android:layout_toLeftOf="@+id/settings_reminder_sound"
android:layout_toStartOf="@+id/settings_reminder_sound"
android:paddingLeft="@dimen/medium_margin" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin"
android:text="@string/week_numbers"/> 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>