diff options
author | pacien | 2018-08-19 18:14:00 +0200 |
---|---|---|
committer | pacien | 2018-08-19 18:14:00 +0200 |
commit | daf8d2fe48f1e2d5cef79b978ad73991bf1f0011 (patch) | |
tree | d1be2de6b91dcc6e13e1017a83bc7c70d1534521 /app/src/main/res | |
parent | 483e6634e0621d2100ae11cbcd8cba6d21a76c4e (diff) | |
download | tincapp-daf8d2fe48f1e2d5cef79b978ad73991bf1f0011.tar.gz |
Display current network name in activity action bar
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/status_network_info_fragment.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 1 insertions, 16 deletions
diff --git a/app/src/main/res/layout/status_network_info_fragment.xml b/app/src/main/res/layout/status_network_info_fragment.xml index 8038180..2dfe1bc 100644 --- a/app/src/main/res/layout/status_network_info_fragment.xml +++ b/app/src/main/res/layout/status_network_info_fragment.xml | |||
@@ -25,10 +25,6 @@ | |||
25 | <import type="android.view.View"/> | 25 | <import type="android.view.View"/> |
26 | 26 | ||
27 | <variable | 27 | <variable |
28 | name="netName" | ||
29 | type="String"/> | ||
30 | |||
31 | <variable | ||
32 | name="vpnInterfaceConfiguration" | 28 | name="vpnInterfaceConfiguration" |
33 | type="org.pacien.tincapp.data.VpnInterfaceConfiguration"/> | 29 | type="org.pacien.tincapp.data.VpnInterfaceConfiguration"/> |
34 | 30 | ||
@@ -44,18 +40,6 @@ | |||
44 | 40 | ||
45 | <TextView | 41 | <TextView |
46 | style="@style/AppTheme.BlockTitle" | 42 | style="@style/AppTheme.BlockTitle" |
47 | android:text="@string/status_network_info_network_name_label"/> | ||
48 | |||
49 | <TextView | ||
50 | style="@style/AppTheme.BlockContent" | ||
51 | android:text="@{netName ?? @string/status_network_info_yes_value}"/> | ||
52 | |||
53 | </LinearLayout> | ||
54 | |||
55 | <LinearLayout style="@style/AppTheme.ListBlock"> | ||
56 | |||
57 | <TextView | ||
58 | style="@style/AppTheme.BlockTitle" | ||
59 | android:text="@string/status_network_info_ip_addresses_label"/> | 43 | android:text="@string/status_network_info_ip_addresses_label"/> |
60 | 44 | ||
61 | <TextView | 45 | <TextView |
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a9bf3ee..98a6905 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml | |||
@@ -112,6 +112,7 @@ | |||
112 | <string name="configure_tools_private_keys_encryption_encrypting">Encrypting/decrypting private keys</string> | 112 | <string name="configure_tools_private_keys_encryption_encrypting">Encrypting/decrypting private keys</string> |
113 | 113 | ||
114 | <!-- Status activity --> | 114 | <!-- Status activity --> |
115 | <string name="status_activity_state_connected_to_format">Connected to %s</string> | ||
115 | <string name="status_activity_title_node_list">Nodes</string> | 116 | <string name="status_activity_title_node_list">Nodes</string> |
116 | <string name="status_activity_title_network_info">Network info</string> | 117 | <string name="status_activity_title_network_info">Network info</string> |
117 | 118 | ||