summaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-01-18 01:57:03 +0100
committerFup Duck <fupduck@sacknagel.com>2018-01-18 01:57:03 +0100
commit1ccb2f9e1bcfaf8279ef9576b3bca233e37af61b (patch)
tree1cd2adc2caadf1a24da4c021e92d5d755044a0f1 /app/src/main/res/values
parent20582f79321627257d1b66b22af791e9e22817fd (diff)
WizardConfiguration theme
* download VPN certificate after loging in (#8813) * get the new design up to date (#8819) * fix crash when pressing login (#8817) * add a loading screen according to design (#8816)
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/dimens.xml4
-rw-r--r--app/src/main/res/values/strings.xml5
-rw-r--r--app/src/main/res/values/styles.xml5
-rw-r--r--app/src/main/res/values/themes.xml8
4 files changed, 20 insertions, 2 deletions
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3e06cbe2..a6afc8bc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,6 +6,7 @@
<resources>
<dimen name="paddingItemsSidebarLog">20dp</dimen>
<dimen name="stdpadding">8dp</dimen>
+ <dimen name="standard_margin">8dp</dimen>
<bool name="logSildersAlwaysVisible">false</bool>
<dimen name="diameter">48dp</dimen>
@@ -21,8 +22,11 @@
<dimen name="activity_margin">16dp</dimen>
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
+ <dimen name="list_view_margin_top">24dp</dimen>
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_width">300dp</dimen>
+
+ <dimen name="loading_screen_icon_vertical_margin">16dp</dimen>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9536d96e..3b278091 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,8 +42,11 @@
<string name="error_no_such_algorithm_exception_user_message">Encryption algorithm not found. Please upgrade Android!</string>
<string name="signup_or_login_button">Sign Up/Log In</string>
<string name="login_button">Log In</string>
+ <string name="login_to_profile">Log in to profile</string>
<string name="logout_button">Log Out</string>
<string name="signup_button">Sign Up</string>
+ <string name="create_profile">Create profile</string>
+ <string name="setup_provider">Set up provider</string>
<string name="setup_error_title">Configuration Error</string>
<string name="setup_error_configure_button">Configure</string>
<string name="setup_error_close_button">Exit</string>
@@ -75,6 +78,8 @@
<string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or with the provider. Should it persist, wipe the Bitmask data from the Android settings.</string>
<string name="not_logged_in_user_status">have not logged in.</string>
<string name="logging_in_user_status">is logging in.</string>
+ <string name="logging_in">Logging in</string>
+ <string name="signing_up">Signing up</string>
<string name="logging_out_user_status">is logging out.</string>
<string name="signingup_message">is being registered.</string>
<string name="vpn.button.turn.on">Turn on</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b4e81bc4..3b1150ea 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -62,6 +62,9 @@
<style name="BitmaskButton" parent="android:Widget.Button">
<item name="android:textAllCaps">true</item>
- <item name="android:color">@color/colorPrimary</item>
+ </style>
+
+ <style name="BitmaskActivity">
+ <item name="android:padding">@dimen/activity_margin</item>
</style>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 76cfd866..70bc3e16 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,10 +3,16 @@
<style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimary</item>
+
<item name="textColorError">@color/colorError</item>
- <item name="android:buttonStyle">@style/BitmaskButton</item>
+ <!-- progressBar color -->
+ <item name="colorAccent">@color/colorPrimary</item>
+ <!-- button and controls -->
+ <item name="android:buttonStyle">@style/BitmaskButton</item>
+ <item name="colorButtonNormal">@color/colorPrimaryDark</item>
+ <item name="colorControlHighlight">@color/colorPrimaryDark</item>
</style>
<style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">