msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Clarified portrait/landscape options

Browse Source
pull/203/head
M66B 3 years ago
parent afe1e3041f
commit b4bec5ae45
2 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File

48
app/src/main/res/layout/fragment_options_display.xml
Unescape View File

@ -231,21 +231,36 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swNavBarColorize" /> app:layout_constraintTop_toBottomOf="@id/swNavBarColorize" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvPortrait"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_portrait"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvNavBarColorizeHint" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swPortrait2" android:id="@+id/swPortrait2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_advanced_portrait2" android:text="@string/title_advanced_two_row"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvNavBarColorizeHint" app:layout_constraintTop_toBottomOf="@id/tvPortrait"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
android:id="@+id/tvPortrait2Hint" android:id="@+id/tvPortrait2Hint"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="48dp" android:layout_marginEnd="48dp"
android:text="@string/title_advanced_split_hint" android:text="@string/title_advanced_split_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
@ -258,8 +273,9 @@
android:id="@+id/swPortrait2c" android:id="@+id/swPortrait2c"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_advanced_portrait2c" android:text="@string/title_advanced_two_col"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvPortrait2Hint" app:layout_constraintTop_toBottomOf="@id/tvPortrait2Hint"
@ -269,6 +285,7 @@
android:id="@+id/tvPortrait2cHint" android:id="@+id/tvPortrait2cHint"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="48dp" android:layout_marginEnd="48dp"
android:text="@string/title_advanced_split_hint" android:text="@string/title_advanced_split_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
@ -281,29 +298,45 @@
android:id="@+id/swPortrait3" android:id="@+id/swPortrait3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_advanced_portrait3" android:text="@string/title_advanced_default_nav"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvPortrait2cHint" app:layout_constraintTop_toBottomOf="@id/tvPortrait2cHint"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvLandscape"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_landscape"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swPortrait3" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swLandscape" android:id="@+id/swLandscape"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:checked="true" android:checked="true"
android:text="@string/title_advanced_landscape" android:text="@string/title_advanced_two_col"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swPortrait3" app:layout_constraintTop_toBottomOf="@id/tvLandscape"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
android:id="@+id/tvLandscapeHint" android:id="@+id/tvLandscapeHint"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="48dp" android:layout_marginEnd="48dp"
android:text="@string/title_advanced_split_hint" android:text="@string/title_advanced_split_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
@ -316,9 +349,10 @@
android:id="@+id/swLandscape3" android:id="@+id/swLandscape3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:checked="true" android:checked="true"
android:text="@string/title_advanced_landscape3" android:text="@string/title_advanced_default_nav"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvLandscapeHint" app:layout_constraintTop_toBottomOf="@id/tvLandscapeHint"

10
app/src/main/res/values/strings.xml
Unescape View File

@ -396,11 +396,11 @@
<string name="title_advanced_caption_message_body">Message body</string> <string name="title_advanced_caption_message_body">Message body</string>
<string name="title_advanced_caption_debug" translatable="false">Debug</string> <string name="title_advanced_caption_debug" translatable="false">Debug</string>
<string name="title_advanced_portrait2">Use two rows in portrait mode</string> <string name="title_advanced_portrait">Portrait mode</string>
<string name="title_advanced_portrait2c">Use two columns in portrait mode</string> <string name="title_advanced_landscape">Landscape mode</string>
<string name="title_advanced_portrait3">Show navigation menu in portrait mode by default</string> <string name="title_advanced_two_row">Use two rows</string>
<string name="title_advanced_landscape">Use two columns in landscape mode</string> <string name="title_advanced_two_col">Use two columns</string>
<string name="title_advanced_landscape3">Show navigation menu in landscape mode by default</string> <string name="title_advanced_default_nav">Show navigation menu by default</string>
<string name="title_advanced_nav_message_count">Show number of locally stored messages in the navigation menu</string> <string name="title_advanced_nav_message_count">Show number of locally stored messages in the navigation menu</string>
<string name="title_advanced_startup">Show on start screen</string> <string name="title_advanced_startup">Show on start screen</string>
<string name="title_advanced_cards">Use card style instead of tabular style</string> <string name="title_advanced_cards">Use card style instead of tabular style</string>

Write Preview
Loading…
Cancel
Save