diff options
author | Pacien TRAN-GIRARD | 2017-07-03 15:45:50 +0200 |
---|---|---|
committer | Pacien TRAN-GIRARD | 2017-07-03 15:45:50 +0200 |
commit | 328ad552b0b508e08072ebcd9409f6214c748a0d (patch) | |
tree | b7093ce3d6c839d5f89b8d05a42a0e8b5d42090b /app/src/main/res/values | |
parent | d221543bb9d6bc9b7344cc96f010a501ff35bb7f (diff) | |
download | tincapp-328ad552b0b508e08072ebcd9409f6214c748a0d.tar.gz |
Add configure activity, displaying various paths
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 | 12 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 45 |
3 files changed, 56 insertions, 5 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5e30dc2..cc0489b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml | |||
@@ -3,5 +3,7 @@ | |||
3 | <color name="textPrimary">#FFFFFFFF</color> | 3 | <color name="textPrimary">#FFFFFFFF</color> |
4 | <color name="colorPrimary">#424242</color> | 4 | <color name="colorPrimary">#424242</color> |
5 | <color name="colorPrimaryDark">#212121</color> | 5 | <color name="colorPrimaryDark">#212121</color> |
6 | <color name="colorAccent">#FBC02D</color> | 6 | <color name="colorPrimaryLight">#757575</color> |
7 | <color name="colorPrimaryLighter">#d9d9d9</color> | ||
8 | <color name="colorAccent">#f9a825</color> | ||
7 | </resources> | 9 | </resources> |
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e5faea..3bcf701 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml | |||
@@ -11,20 +11,24 @@ | |||
11 | <string name="info_supported_abis_format">Device ABIs: %1$s</string> | 11 | <string name="info_supported_abis_format">Device ABIs: %1$s</string> |
12 | 12 | ||
13 | <string name="menu_about">About this app</string> | 13 | <string name="menu_about">About this app</string> |
14 | <string name="menu_display_conf_dir">Show configuration directory</string> | 14 | <string name="menu_configure">Configure</string> |
15 | 15 | ||
16 | <string name="field_net_name">Tinc network name</string> | 16 | <string name="field_net_name">Tinc network name</string> |
17 | 17 | ||
18 | <string name="title_tinc_config_dir">Tinc config directory</string> | ||
19 | <string name="title_connect_to_network">Connect to network</string> | 18 | <string name="title_connect_to_network">Connect to network</string> |
20 | <string name="title_request_vpn_permissions">Request VPN permissions</string> | 19 | <string name="title_request_vpn_permissions">Request VPN permissions</string> |
20 | <string name="title_path_info">Path info</string> | ||
21 | <string name="title_tools">Tools</string> | ||
22 | <string name="title_configuration_directories">Configuration directories</string> | ||
23 | <string name="title_log_directories">Log directories</string> | ||
24 | <string name="title_tinc_binaries">Tinc binaries</string> | ||
21 | 25 | ||
22 | <string name="action_close">Close</string> | 26 | <string name="action_close">Close</string> |
23 | <string name="action_copy">Copy</string> | ||
24 | <string name="action_open_project_website">Project website</string> | 27 | <string name="action_open_project_website">Project website</string> |
25 | <string name="action_connect">Connect</string> | 28 | <string name="action_connect">Connect</string> |
29 | <string name="action_generate_node_configuration_and_keys">Generate node configuration and keys</string> | ||
30 | <string name="action_join_network_via_invitation_url">Join network via invitation URL</string> | ||
26 | 31 | ||
27 | <string name="message_text_copied">Text copied to clipboard.</string> | ||
28 | <string name="message_vpn_permissions_granted">VPN permissions granted.</string> | 32 | <string name="message_vpn_permissions_granted">VPN permissions granted.</string> |
29 | <string name="message_vpn_permissions_denied">VPN permissions denied.</string> | 33 | <string name="message_vpn_permissions_denied">VPN permissions denied.</string> |
30 | </resources> | 34 | </resources> |
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6b849c8..9f0eb8e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml | |||
@@ -1,4 +1,5 @@ | |||
1 | <resources> | 1 | <resources> |
2 | |||
2 | <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> | 3 | <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> |
3 | <item name="colorPrimary">@color/colorPrimary</item> | 4 | <item name="colorPrimary">@color/colorPrimary</item> |
4 | <item name="colorPrimaryDark">@color/colorPrimaryDark</item> | 5 | <item name="colorPrimaryDark">@color/colorPrimaryDark</item> |
@@ -13,4 +14,48 @@ | |||
13 | <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/> | 14 | <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/> |
14 | 15 | ||
15 | <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/> | 16 | <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/> |
17 | |||
18 | <style name="AppTheme.SectionTitle"> | ||
19 | <item name="android:textColor">@color/colorAccent</item> | ||
20 | <item name="android:layout_width">match_parent</item> | ||
21 | <item name="android:layout_height">wrap_content</item> | ||
22 | <item name="android:paddingLeft">@dimen/activity_horizontal_margin</item> | ||
23 | <item name="android:paddingRight">@dimen/activity_horizontal_margin</item> | ||
24 | <item name="android:paddingTop">@dimen/activity_vertical_margin</item> | ||
25 | </style> | ||
26 | |||
27 | <style name="AppTheme.List"> | ||
28 | <item name="android:layout_width">match_parent</item> | ||
29 | <item name="android:layout_height">wrap_content</item> | ||
30 | <item name="android:divider">@drawable/horizontal_line</item> | ||
31 | <item name="android:orientation">vertical</item> | ||
32 | <item name="android:showDividers">middle</item> | ||
33 | </style> | ||
34 | |||
35 | <style name="AppTheme.ListBlock"> | ||
36 | <item name="android:layout_width">match_parent</item> | ||
37 | <item name="android:layout_height">wrap_content</item> | ||
38 | <item name="android:paddingBottom">@dimen/activity_vertical_margin</item> | ||
39 | <item name="android:paddingLeft">@dimen/activity_horizontal_margin</item> | ||
40 | <item name="android:paddingRight">@dimen/activity_horizontal_margin</item> | ||
41 | <item name="android:paddingTop">@dimen/activity_vertical_margin</item> | ||
42 | <item name="android:orientation">vertical</item> | ||
43 | </style> | ||
44 | |||
45 | <style name="AppTheme.ListBlock.Clickable"> | ||
46 | <item name="android:background">?attr/selectableItemBackground</item> | ||
47 | <item name="android:clickable">true</item> | ||
48 | </style> | ||
49 | |||
50 | <style name="AppTheme.BlockTitle"> | ||
51 | <item name="android:layout_width">match_parent</item> | ||
52 | <item name="android:layout_height">wrap_content</item> | ||
53 | <item name="android:textAppearance">@style/TextAppearance.AppCompat.Light.SearchResult.Subtitle</item> | ||
54 | </style> | ||
55 | |||
56 | <style name="AppTheme.BlockContent"> | ||
57 | <item name="android:layout_width">match_parent</item> | ||
58 | <item name="android:layout_height">wrap_content</item> | ||
59 | <item name="android:textColor">@color/colorPrimaryLight</item> | ||
60 | </style> | ||
16 | </resources> | 61 | </resources> |