Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84c10d47 authored by schaarsc's avatar schaarsc Committed by Niedermann IT-Dienstleistungen
Browse files

refactor preference screen. 

- grey icons
- remove categories
- move certificate entries to Preference Screen
parent c5d4c41f

app/src/main/res/drawable/ic_account_circle_grey_24dp.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF757575"

        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>

</vector>

app/src/main/res/drawable/ic_brightness_2_grey_24dp.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF757575"

        android:pathData="M10,2c-1.82,0 -3.53,0.5 -5,1.35C7.99,5.08 10,8.3 10,12s-2.01,6.92 -5,8.65C6.47,21.5 8.18,22 10,22c5.52,0 10,-4.48 10,-10S15.52,2 10,2z"/>

</vector>

app/src/main/res/drawable/ic_https_grey_24dp.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF757575"

        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>

</vector>

app/src/main/res/drawable/ic_remove_red_eye_grey_24dp.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF757575"

        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>

</vector>

app/src/main/res/values-b+en+001/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
    <string name="listview_updated_earlier">Earlier</string>



    <!-- Settings -->

    <string name="settings_server_settings">Account Settings</string>

    <string name="settings_server">Server</string>

    <string name="settings_server_settings">Account</string>

    <string name="settings_url">Server address</string>

    <string name="settings_url_check_description">Shows whether the address can be pinged.</string>

    <string name="settings_url_warn_http">WARNING: \"http\" is unsafe. Please use \"https\".</string>
@@ -50,10 +49,9 @@ 
    <string name="settings_password_check_description">Displays whether the credentials are correct.</string>

    <string name="settings_submit">Connect</string>

    <string name="settings_submitting">Connecting &#8230;</string>

    <string name="settings_view_category">View settings</string>

    <string name="settings_note_mode">Display mode for Notes</string>

    <string name="settings_theme_title">Theme</string>

    <string name="settings_cert_category">Certificates</string>

    <string name="settings_cert_category">Manage certificates</string>

    <string name="settings_cert_trust_system">Trust system certificates</string>

    <string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string>

    <string name="settings_cert_trust_system_off">System and user-added CAs won\'t be trusted</string>