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

Simplification

Browse Source
pull/177/head
M66B 5 years ago
parent b89f6bd48d
commit 7c268ea524
27 changed files with 31 additions and 123 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/res/layout/dialog_duration.xml
Unescape View File

@ -27,8 +27,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_1hour"
app:layout_constraintEnd_toStartOf="@+id/btn1day"
app:layout_constraintStart_toStartOf="parent"
@ -40,8 +38,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_1day"
app:layout_constraintEnd_toStartOf="@+id/btn1week"
app:layout_constraintStart_toEndOf="@id/btn1hour"
@ -53,8 +49,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_1week"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn1day"

2
app/src/main/res/layout/dialog_error_reporting.xml
Unescape View File

@ -37,8 +37,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvExplanation" />

2
app/src/main/res/layout/dialog_first.xml
Unescape View File

@ -48,8 +48,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_info"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBattery" />

2
app/src/main/res/layout/dialog_junk.xml
Unescape View File

@ -57,8 +57,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_edit_rules"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBlockHint" />

4
app/src/main/res/layout/dialog_open_link.xml
Unescape View File

@ -100,12 +100,10 @@
<Button
android:id="@+id/btnOwner"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_check_owner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbSanitize" />

4
app/src/main/res/layout/dialog_review_account.xml
Unescape View File

@ -75,12 +75,10 @@
<Button
android:id="@+id/btnAccount"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_edit_account"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/dialog_rule_match.xml
Unescape View File

@ -35,8 +35,6 @@
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
android:minHeight="0dp"
android:padding="12dp"
android:text="@string/title_rule_execute"
app:layout_constraintBottom_toBottomOf="parent"

20
app/src/main/res/layout/fragment_account.xml
Unescape View File

@ -78,12 +78,10 @@
<Button
android:id="@+id/btnAutoConfig"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_autoconfig"
app:layout_constraintStart_toStartOf="parent"
@ -266,12 +264,10 @@
<Button
android:id="@+id/btnCertificate"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_client_certificate"
app:layout_constraintStart_toStartOf="parent"
@ -291,12 +287,10 @@
<Button
android:id="@+id/btnOAuth"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_setup_authentication"
app:layout_constraintEnd_toEndOf="parent"
@ -380,12 +374,10 @@
<eu.faircode.email.ViewButtonColor
android:id="@+id/btnColor"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_select"
app:layout_constraintStart_toStartOf="parent"
@ -415,12 +407,10 @@
<Button
android:id="@+id/btnAdvanced"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_advanced"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvColorPro" />

4
app/src/main/res/layout/fragment_accounts.xml
Unescape View File

@ -17,12 +17,10 @@
<Button
android:id="@+id/btnGrant"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_setup_grant_again"
app:layout_constraintStart_toStartOf="parent"

6
app/src/main/res/layout/fragment_folder.xml
Unescape View File

@ -87,12 +87,10 @@
<eu.faircode.email.ViewButtonColor
android:id="@+id/btnColor"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_select"
app:layout_constraintStart_toStartOf="parent"
@ -223,8 +221,6 @@
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_info"
app:layout_constraintBottom_toBottomOf="@+id/tvSyncDaysRemark"
app:layout_constraintEnd_toEndOf="parent"

24
app/src/main/res/layout/fragment_identity.xml
Unescape View File

@ -116,12 +116,10 @@
<eu.faircode.email.ViewButtonColor
android:id="@+id/btnColor"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_select"
app:layout_constraintStart_toStartOf="parent"
@ -151,12 +149,10 @@
<Button
android:id="@+id/btnSignature"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_edit_signature"
app:layout_constraintStart_toStartOf="parent"
@ -164,12 +160,10 @@
<Button
android:id="@+id/btnAdvanced"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_advanced"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnSignature" />
@ -231,12 +225,10 @@
<Button
android:id="@+id/btnAutoConfig"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_autoconfig"
app:layout_constraintStart_toStartOf="parent"
@ -421,12 +413,10 @@
<Button
android:id="@+id/btnCertificate"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_client_certificate"
app:layout_constraintStart_toStartOf="parent"
@ -446,12 +436,10 @@
<Button
android:id="@+id/btnOAuth"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_setup_authentication"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/fragment_options_connection.xml
Unescape View File

@ -233,8 +233,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_set"
app:layout_constraintBottom_toBottomOf="@id/etSocks"
app:layout_constraintEnd_toEndOf="parent" />
@ -257,8 +255,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_manage_connectivity"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSocksHint" />

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

@ -46,8 +46,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_theme"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvLayoutHint" />

6
app/src/main/res/layout/fragment_options_encryption.xml
Unescape View File

@ -163,8 +163,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_manage_certificates"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCaptionSmime" />
@ -175,8 +173,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_import_key"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnManageCertificates" />
@ -187,8 +183,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_manage_keys"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnImportKey" />

20
app/src/main/res/layout/fragment_options_misc.xml
Unescape View File

@ -40,6 +40,18 @@
app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swConversationActions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:enabled="true"
android:text="@string/title_advanced_conversation_actions"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swExternalSearch"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swFts"
android:layout_width="0dp"
@ -48,7 +60,7 @@
android:text="@string/title_advanced_fts"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swExternalSearch"
app:layout_constraintTop_toBottomOf="@id/swConversationActions"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
@ -227,8 +239,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_reset_questions"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDebugHint" />
@ -239,8 +249,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_cleanup"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnReset" />
@ -273,8 +281,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvLastCleanup" />

8
app/src/main/res/layout/fragment_options_notifications.xml
Unescape View File

@ -34,8 +34,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_notifications"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral" />
@ -58,8 +56,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_notifications_default"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvManageHint" />
@ -82,8 +78,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_notifications_service"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvManageDefaultHint" />
@ -248,8 +242,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_sound"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swLight" />

4
app/src/main/res/layout/fragment_options_privacy.xml
Unescape View File

@ -134,8 +134,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_biometrics_enable"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBiometrics" />
@ -146,8 +144,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_advanced_pin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBiometrics" />

2
app/src/main/res/layout/fragment_options_send.xml
Unescape View File

@ -94,8 +94,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_manage"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swSuggestReceived" />

4
app/src/main/res/layout/fragment_pop.xml
Unescape View File

@ -218,12 +218,10 @@
<eu.faircode.email.ViewButtonColor
android:id="@+id/btnColor"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_select"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/fragment_pro.xml
Unescape View File

@ -129,8 +129,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_check"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvPriceHint" />

4
app/src/main/res/layout/fragment_rule.xml
Unescape View File

@ -536,12 +536,10 @@
<eu.faircode.email.ViewButtonColor
android:id="@+id/btnColor"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:tag="disable"
android:text="@string/title_select"
app:layout_constraintStart_toStartOf="parent"

4
app/src/main/res/layout/fragment_setup.xml
Unescape View File

@ -90,8 +90,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorInfoBackground"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_help"
android:textColor="?attr/colorInfoForeground"
android:textStyle="bold"
@ -510,8 +508,6 @@
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_manage"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDataSaver" />

4
app/src/main/res/layout/include_message_attachments.xml
Unescape View File

@ -39,8 +39,6 @@
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_save_all"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbInline" />
@ -50,8 +48,6 @@
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_download_all"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbInline" />

6
app/src/main/res/layout/include_message_calendar.xml
Unescape View File

@ -102,8 +102,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_icalendar_accept"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvAttendees" />
@ -115,8 +113,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_icalendar_decline"
app:layout_constraintStart_toEndOf="@id/btnCalendarAccept"
app:layout_constraintTop_toBottomOf="@id/tvAttendees" />
@ -128,8 +124,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_icalendar_maybe"
app:layout_constraintStart_toEndOf="@id/btnCalendarDecline"
app:layout_constraintTop_toBottomOf="@id/tvAttendees" />

2
app/src/main/res/layout/item_account.xml
Unescape View File

@ -220,8 +220,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="?attr/colorInfoBackground"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_help"
android:textColor="?attr/colorInfoForeground"
android:textStyle="bold"

2
app/src/main/res/layout/item_folder.xml
Unescape View File

@ -243,8 +243,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="?attr/colorInfoBackground"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_setup_help"
android:textColor="?attr/colorInfoForeground"
android:textStyle="bold"

4
app/src/main/res/layout/item_keyword.xml
Unescape View File

@ -24,11 +24,9 @@
<eu.faircode.email.ViewButtonColor
android:id="@+id/btnColor"
style="@style/buttonStyleSmall"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
android:minHeight="0dp"
android:padding="9dp"
android:text="@string/title_select"
app:layout_constraintEnd_toEndOf="parent"

Write Preview
Loading…
Cancel
Save