diff options
| author | cyberta <cyberta@riseup.net> | 2018-01-27 16:35:36 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2018-01-27 16:35:36 -0800 |
| commit | 3bb2c2c219359a6016366c4d3533a5e2ef812ea9 (patch) | |
| tree | c743e74b951d3104e32f7e8351f83f68207430b4 /app/src/main/res/values | |
| parent | df8b1fcf1ecc55f15229935294a337c897960ff4 (diff) | |
| parent | 0ad1b398e19a02dd725b253e15f6ded4d0cd641b (diff) | |
Merge branch '8800_vpn_fragment' into '0.9.8'
new UI for EipFragment
See merge request leap/bitmask_android!29
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 96b79222..5205a628 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -80,6 +80,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 b4e81bc4..0f41ea86 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -64,4 +64,11 @@ <item name="android:textAllCaps">true</item> <item name="android:color">@color/colorPrimary</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 |