diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-13 12:10:33 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-15 19:18:52 +0000 |
| commit | b3a1686ec1f4d2eb63ba5cbbfdb57386aebfbc64 (patch) | |
| tree | 2e74a729b712ba2f4b511e2d74989f66a9847987 /android/src/main/res/values | |
| parent | d8c4ed04242cdc07fbed1a6b6c0d242d86bcc8ec (diff) | |
| download | mullvadvpn-b3a1686ec1f4d2eb63ba5cbbfdb57386aebfbc64.tar.xz mullvadvpn-b3a1686ec1f4d2eb63ba5cbbfdb57386aebfbc64.zip | |
Implement initial Connect screen
Diffstat (limited to 'android/src/main/res/values')
| -rw-r--r-- | android/src/main/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | android/src/main/res/values/styles.xml | 17 |
3 files changed, 24 insertions, 0 deletions
diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml index 22a7e4108d..430756720a 100644 --- a/android/src/main/res/values/colors.xml +++ b/android/src/main/res/values/colors.xml @@ -6,8 +6,10 @@ <color name="darkBlue">#192E45</color> <color name="white">#FFFFFF</color> <color name="white60">#99FFFFFF</color> + <color name="white40">#66FFFFFF</color> <color name="white20">#33FFFFFF</color> <color name="green">#44AD4D</color> + <color name="green90">#E644AD4D</color> <color name="red">#D0021B</color> <color name="textInputBorder">#234161</color> diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 59c207b71c..a643ef2150 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -9,4 +9,9 @@ <string name="logged_in_title">Login successful</string> <string name="login_fail_title">Login failed</string> <string name="login_fail_description">Invalid account number, try again</string> + + <string name="unsecured_connection">Unsecured connection</string> + <string name="country">Country</string> + <string name="connect">Secure my connection</string> + <string name="switch_location">Switch location</string> </resources> diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml index 726847ab42..86401714f7 100644 --- a/android/src/main/res/values/styles.xml +++ b/android/src/main/res/values/styles.xml @@ -3,4 +3,21 @@ <item name="colorPrimary">@color/colorPrimary</item> <item name="android:windowBackground">@color/blue</item> </style> + + <style name="Button" parent="Widget.AppCompat.Button.Borderless"> + <item name="android:layout_height">44dp</item> + <item name="android:layout_width">match_parent</item> + <item name="android:textAllCaps">false</item> + <item name="android:textColor">@color/white</item> + <item name="android:textSize">20sp</item> + <item name="android:textStyle">bold</item> + </style> + + <style name="GreenButton" parent="Button"> + <item name="android:background">@drawable/green_button_background</item> + </style> + + <style name="White20Button" parent="Button"> + <item name="android:background">@drawable/white20_button_background</item> + </style> </resources> |