Skip to content

Commit 2208228

Browse files
committed
Move migration section to the bottom
1 parent c31a620 commit 2208228

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

app/src/main/res/layout/activity_settings.xml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -397,79 +397,79 @@
397397
layout="@layout/divider" />
398398

399399
<TextView
400-
android:id="@+id/settings_migrating_label"
400+
android:id="@+id/settings_backups_label"
401401
style="@style/SettingsSectionLabelStyle"
402402
android:layout_width="match_parent"
403403
android:layout_height="wrap_content"
404-
android:text="@string/migrating" />
404+
android:text="@string/backups" />
405405

406406
<RelativeLayout
407-
android:id="@+id/settings_export_notes_holder"
408-
style="@style/SettingsHolderTextViewOneLinerStyle"
407+
android:id="@+id/settings_enable_automatic_backups_holder"
408+
style="@style/SettingsHolderCheckboxStyle"
409409
android:layout_width="match_parent"
410410
android:layout_height="wrap_content">
411411

412-
<org.fossify.commons.views.MyTextView
413-
android:id="@+id/settings_export_notes_label"
414-
style="@style/SettingsTextLabelStyle"
412+
<org.fossify.commons.views.MyAppCompatCheckbox
413+
android:id="@+id/settings_enable_automatic_backups"
414+
style="@style/SettingsCheckboxStyle"
415415
android:layout_width="match_parent"
416-
android:layout_height="match_parent"
417-
android:text="@string/export_notes" />
416+
android:layout_height="wrap_content"
417+
android:text="@string/enable_automatic_backups" />
418+
418419
</RelativeLayout>
419420

420421
<RelativeLayout
421-
android:id="@+id/settings_import_notes_holder"
422+
android:id="@+id/settings_manage_automatic_backups_holder"
422423
style="@style/SettingsHolderTextViewOneLinerStyle"
423424
android:layout_width="match_parent"
424425
android:layout_height="wrap_content">
425426

426427
<org.fossify.commons.views.MyTextView
427-
android:id="@+id/settings_import_notes_label"
428+
android:id="@+id/settings_manage_automatic_backups"
428429
style="@style/SettingsTextLabelStyle"
429-
android:layout_width="match_parent"
430-
android:layout_height="match_parent"
431-
android:text="@string/import_notes" />
430+
android:layout_width="wrap_content"
431+
android:layout_height="wrap_content"
432+
android:text="@string/manage_automatic_backups" />
433+
432434
</RelativeLayout>
433435

434436
<include
435-
android:id="@+id/settings_migrating_divider"
437+
android:id="@+id/settings_backups_divider"
436438
layout="@layout/divider" />
437439

438440
<TextView
439-
android:id="@+id/settings_backups_label"
441+
android:id="@+id/settings_migrating_label"
440442
style="@style/SettingsSectionLabelStyle"
441443
android:layout_width="match_parent"
442444
android:layout_height="wrap_content"
443-
android:text="@string/backups" />
445+
android:text="@string/migrating" />
444446

445447
<RelativeLayout
446-
android:id="@+id/settings_enable_automatic_backups_holder"
447-
style="@style/SettingsHolderCheckboxStyle"
448+
android:id="@+id/settings_export_notes_holder"
449+
style="@style/SettingsHolderTextViewOneLinerStyle"
448450
android:layout_width="match_parent"
449451
android:layout_height="wrap_content">
450452

451-
<org.fossify.commons.views.MyAppCompatCheckbox
452-
android:id="@+id/settings_enable_automatic_backups"
453-
style="@style/SettingsCheckboxStyle"
453+
<org.fossify.commons.views.MyTextView
454+
android:id="@+id/settings_export_notes_label"
455+
style="@style/SettingsTextLabelStyle"
454456
android:layout_width="match_parent"
455-
android:layout_height="wrap_content"
456-
android:text="@string/enable_automatic_backups" />
457-
457+
android:layout_height="match_parent"
458+
android:text="@string/export_notes" />
458459
</RelativeLayout>
459460

460461
<RelativeLayout
461-
android:id="@+id/settings_manage_automatic_backups_holder"
462+
android:id="@+id/settings_import_notes_holder"
462463
style="@style/SettingsHolderTextViewOneLinerStyle"
463464
android:layout_width="match_parent"
464465
android:layout_height="wrap_content">
465466

466467
<org.fossify.commons.views.MyTextView
467-
android:id="@+id/settings_manage_automatic_backups"
468+
android:id="@+id/settings_import_notes_label"
468469
style="@style/SettingsTextLabelStyle"
469-
android:layout_width="wrap_content"
470-
android:layout_height="wrap_content"
471-
android:text="@string/manage_automatic_backups" />
472-
470+
android:layout_width="match_parent"
471+
android:layout_height="match_parent"
472+
android:text="@string/import_notes" />
473473
</RelativeLayout>
474474

475475
</LinearLayout>

0 commit comments

Comments
 (0)