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

Commit a22051cd authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Enhanced SettingsActivity: Blue Button and Red Warning for HTTP.

parent 896121bb
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?><!-- Selector is used for Background Colors in List Items -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <!-- :selected -->
    <item android:color="@color/fg_default_high" android:state_enabled="false" />
    <item android:color="@color/fg_contrast" />
</selector>
 No newline at end of file
+4 −0
Original line number Diff line number Diff line
@@ -24,7 +24,11 @@
        android:id="@+id/settings_url_warn_http"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_margin="8dp"
        android:background="@color/bg_attention"
        android:padding="8dp"
        android:text="@string/settings_url_warn_http"
        android:textColor="@color/fg_contrast"
        android:visibility="gone" />

    <android.support.design.widget.TextInputLayout
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@
    <string name="settings_server">Server</string>
    <string name="settings_url">URL</string>
    <string name="settings_url_check_description">Zeigt an, ob die angegebene URL erreichbar ist.</string>
    <string name="settings_url_warn_http">WARNUNG: http ist unsicher. Bitte benutzen Sie https.</string>
    <string name="settings_url_warn_http">WARNUNG: "http" ist unsicher. Bitte benutzen Sie "https".</string>
    <string name="settings_username">Benutzername</string>
    <string name="settings_password">Passwort</string>
    <string name="settings_password_check_description">Zeigt an, ob die angegebenen Zugangsdaten korrekt sind.</string>
+2 −0
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@
    <color name="bg_transparent">#aa081a2f</color>
    <color name="bg_highlighted">#f3f3f3</color>
    <color name="bg_normal">#ffffff</color>
    <color name="bg_attention">#662020</color>
    <color name="fg_default">#000000</color>
    <color name="fg_default_selection">#333333</color>
    <color name="fg_default_low">#666666</color>
    <color name="fg_default_high">#cccccc</color>
    <color name="fg_contrast">#ffffff</color>
</resources>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@
    <string name="settings_server">Server</string>
    <string name="settings_url">URL</string>
    <string name="settings_url_check_description">Shows if the URL can be pinged.</string>
    <string name="settings_url_warn_http">WARNING: http is unsafe. Please use https.</string>
    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Please use "https".</string>
    <string name="settings_username">Username</string>
    <string name="settings_password">Password</string>
    <string name="settings_password_check_description">Shows if the given credentials are correct.</string>
Loading