diff options
| author | cyBerta <cyberta@riseup.net> | 2018-01-28 10:17:12 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-01-28 10:17:12 +0100 |
| commit | 298c33b94c8aada449c98a24cdb2c687af40cbbd (patch) | |
| tree | c27c162be2fff26538eba1d6ba4db67ed5c4fd9a /app/src/main/res/values | |
| parent | 986fe144729b58382641bbf9769a93bf81c06514 (diff) | |
| parent | 3bb2c2c219359a6016366c4d3533a5e2ef812ea9 (diff) | |
Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_design
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/colors.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 7 |
3 files changed, 12 insertions, 0 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a8a63e4b..53ead009 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,6 +6,8 @@ <color name="colorError">#ef9a9a</color> <color name="colorSuccess">#a5d6a7</color> + <color name="black800">#424242</color> + <color name="red200">#ef9a9a</color> <color name="pink200">#f48fb1</color> <color name="purple200">#ce93d8</color> @@ -23,4 +25,6 @@ <color name="orange200">#ffcc80</color> <color name="deepOrange200">#ffab91</color> + <color name="white">#ffffff</color> + </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 01715c32..c1443138 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,7 @@ <string name="vpn.button.turn.on">Turn on</string> <string name="vpn.button.turn.off">Turn off</string> <string name="vpn_button_turn_off_blocking">Stop blocking</string> + <string name="vpn_securely_routed">Your traffic is securely routed through:</string> <string name="bitmask_log">Bitmask Log</string> <string name="title_activity_main">Bitmask</string> <string name="log_fragment_title">Log</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3b1150ea..867fa54f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -67,4 +67,11 @@ <style name="BitmaskActivity"> <item name="android:padding">@dimen/activity_margin</item> </style> + + <style name="BitmaskButtonBlack" parent="android:Widget.Button"> + <item name="android:textAllCaps">true</item> + <item name="android:background">@color/black800</item> + <item name="android:textColor">@color/white</item> + </style> + </resources>
\ No newline at end of file |