mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
Merge pull request #1075 from deltachat/adapt-preferences
Adapt preferences
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="-2dp" android:right="-2dp">
|
||||
<shape android:shape="rectangle">
|
||||
<stroke android:width="1dp" android:color="#464545" />
|
||||
<solid android:color="@color/gray78" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
@@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="-2dp" android:right="-2dp">
|
||||
<shape android:shape="rectangle">
|
||||
<stroke android:width="1dp" android:color="#d4d4d4" />
|
||||
<solid android:color="#dddddd" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
@@ -1,14 +0,0 @@
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_margin="0dp"
|
||||
android:background="@color/amber_50"
|
||||
android:padding="0dp">
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:background="?pref_divider"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,19 +0,0 @@
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_margin="0dp"
|
||||
android:background="@color/amber_50"
|
||||
android:padding="0dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/autocrypt_explain"
|
||||
android:paddingLeft="16dp"
|
||||
android:paddingRight="16dp"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="16dp"
|
||||
android:background="?pref_divider"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -119,8 +119,6 @@
|
||||
|
||||
<attr name="pref_icon_tint" format="color"/>
|
||||
|
||||
<attr name="pref_divider" format="reference" />
|
||||
|
||||
<declare-styleable name="CustomDefaultPreference">
|
||||
<attr name="custom_pref_toggle" format="string"/>
|
||||
</declare-styleable>
|
||||
|
||||
@@ -202,8 +202,6 @@
|
||||
|
||||
<item name="pref_icon_tint">@color/delta_primary_dark</item>
|
||||
|
||||
<item name="pref_divider">@drawable/preference_divider_light</item>
|
||||
|
||||
<item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
|
||||
|
||||
@@ -348,8 +346,6 @@
|
||||
|
||||
<item name="pref_icon_tint">@color/core_white</item>
|
||||
|
||||
<item name="pref_divider">@drawable/preference_divider_dark</item>
|
||||
|
||||
<item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
|
||||
<item name="search_toolbar_background">@color/black</item>
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<PreferenceCategory android:title="@string/autocrypt">
|
||||
|
||||
<Preference android:key="pref_send_autocrypt_setup_message"
|
||||
android:title="@string/autocrypt_send_asm_title"/>
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="true"
|
||||
android:key="pref_prefer_e2ee"
|
||||
android:title="@string/autocrypt_prefer_e2ee"/>
|
||||
|
||||
<Preference android:key="pref_send_autocrypt_setup_message"
|
||||
android:title="@string/autocrypt_send_asm_title"
|
||||
android:summary="@string/autocrypt_explain"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:layout="@layout/preference_divider_explain_autocrypt"/>
|
||||
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_imap_folder_handling">
|
||||
@@ -44,7 +44,6 @@
|
||||
android:summary="@string/pref_auto_folder_moves_explain"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:layout="@layout/preference_divider" />
|
||||
|
||||
|
||||
<PreferenceCategory android:title="Experimental features">
|
||||
@@ -58,7 +57,6 @@
|
||||
android:title="Delete e-mails from server" />
|
||||
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:layout="@layout/preference_divider" />
|
||||
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_other">
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider" />
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_app_access">
|
||||
|
||||
@@ -33,7 +32,6 @@
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider" />
|
||||
|
||||
<PreferenceCategory android:title="@string/screenlock_title">
|
||||
|
||||
|
||||
@@ -33,8 +33,6 @@
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider"/>
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_email_interaction_title">
|
||||
|
||||
<org.thoughtcrime.securesms.preferences.widgets.ListPreferenceWithSummary
|
||||
@@ -46,7 +44,6 @@
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider"/>
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_other">
|
||||
<Preference android:key="pref_backup"
|
||||
@@ -54,8 +51,6 @@
|
||||
android:summary="@string/pref_backup_explain"/>
|
||||
</PreferenceCategory>
|
||||
<!--
|
||||
<PreferenceCategory android:layout="@layout/preference_divider"/>
|
||||
|
||||
<PreferenceCategory android:key="message_trimming" android:title="@string/pref_trim_headline">
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
|
||||
Reference in New Issue
Block a user