diff options
author | pacien | 2018-02-24 01:50:02 +0100 |
---|---|---|
committer | pacien | 2018-02-24 01:50:02 +0100 |
commit | 10fae9e4f5b4bc00580f7972ad0a3e07bb680bfb (patch) | |
tree | b06128e526ce76a3794a1dece41eaa909499b1eb /app/src | |
parent | 3c1a29e2b8717a20948773bbc21abdc723ce5dee (diff) | |
download | tincapp-10fae9e4f5b4bc00580f7972ad0a3e07bb680bfb.tar.gz |
Replace node list loading placeholder
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_network_status_header.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rHK/strings.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rTW/strings.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
6 files changed, 3 insertions, 6 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt index c4873d8..0726ee9 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | |||
@@ -137,7 +137,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef | |||
137 | 137 | ||
138 | private fun writeNodeList(nodeList: List<String>) = runOnUiThread { | 138 | private fun writeNodeList(nodeList: List<String>) = runOnUiThread { |
139 | nodeListAdapter?.setElements(nodeList) | 139 | nodeListAdapter?.setElements(nodeList) |
140 | node_list_placeholder.visibility = if (nodeListAdapter?.isEmpty != false) View.VISIBLE else View.GONE | 140 | node_list_placeholder.visibility = View.GONE |
141 | list_wrapper.isRefreshing = false | 141 | list_wrapper.isRefreshing = false |
142 | } | 142 | } |
143 | 143 | ||
diff --git a/app/src/main/res/layout/fragment_network_status_header.xml b/app/src/main/res/layout/fragment_network_status_header.xml index cde547c..e550c5a 100644 --- a/app/src/main/res/layout/fragment_network_status_header.xml +++ b/app/src/main/res/layout/fragment_network_status_header.xml | |||
@@ -122,6 +122,6 @@ | |||
122 | <TextView | 122 | <TextView |
123 | android:id="@+id/node_list_placeholder" | 123 | android:id="@+id/node_list_placeholder" |
124 | style="@style/AppTheme.ListBlock.Placeholder" | 124 | style="@style/AppTheme.ListBlock.Placeholder" |
125 | android:text="@string/message_no_known_node"/> | 125 | android:text="@string/message_loading"/> |
126 | 126 | ||
127 | </LinearLayout> | 127 | </LinearLayout> |
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c413afb..ce0a854 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml | |||
@@ -63,7 +63,6 @@ | |||
63 | <string name="action_encrypt_decrypt_private_keys">加密或解密私钥</string> | 63 | <string name="action_encrypt_decrypt_private_keys">加密或解密私钥</string> |
64 | 64 | ||
65 | <string name="message_no_network_configuration_found">未找到网络配置。</string> | 65 | <string name="message_no_network_configuration_found">未找到网络配置。</string> |
66 | <string name="message_no_known_node">没有已知的节点</string> | ||
67 | <string name="message_generating_configuration">生成节点配置…</string> | 66 | <string name="message_generating_configuration">生成节点配置…</string> |
68 | <string name="message_joining_network">加入网络…</string> | 67 | <string name="message_joining_network">加入网络…</string> |
69 | <string name="message_network_configuration_written">网络配置写入成功。</string> | 68 | <string name="message_network_configuration_written">网络配置写入成功。</string> |
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 0301fda..6879117 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml | |||
@@ -63,7 +63,6 @@ | |||
63 | <string name="action_encrypt_decrypt_private_keys">加密或解密私鑰</string> | 63 | <string name="action_encrypt_decrypt_private_keys">加密或解密私鑰</string> |
64 | 64 | ||
65 | <string name="message_no_network_configuration_found">未找到網絡配置。</string> | 65 | <string name="message_no_network_configuration_found">未找到網絡配置。</string> |
66 | <string name="message_no_known_node">沒有已知的節點</string> | ||
67 | <string name="message_generating_configuration">生成節點配置…</string> | 66 | <string name="message_generating_configuration">生成節點配置…</string> |
68 | <string name="message_joining_network">加入網絡…</string> | 67 | <string name="message_joining_network">加入網絡…</string> |
69 | <string name="message_network_configuration_written">網絡配置寫入成功。</string> | 68 | <string name="message_network_configuration_written">網絡配置寫入成功。</string> |
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 68787d7..3c9927f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml | |||
@@ -63,7 +63,6 @@ | |||
63 | <string name="action_encrypt_decrypt_private_keys">加密或解密私鑰</string> | 63 | <string name="action_encrypt_decrypt_private_keys">加密或解密私鑰</string> |
64 | 64 | ||
65 | <string name="message_no_network_configuration_found">未找到網路配置。</string> | 65 | <string name="message_no_network_configuration_found">未找到網路配置。</string> |
66 | <string name="message_no_known_node">沒有已知的節點</string> | ||
67 | <string name="message_generating_configuration">生成節點配置…</string> | 66 | <string name="message_generating_configuration">生成節點配置…</string> |
68 | <string name="message_joining_network">加入網路…</string> | 67 | <string name="message_joining_network">加入網路…</string> |
69 | <string name="message_network_configuration_written">網路配置寫入成功。</string> | 68 | <string name="message_network_configuration_written">網路配置寫入成功。</string> |
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fed15f0..14d1180 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml | |||
@@ -64,7 +64,6 @@ | |||
64 | <string name="action_dismiss">Dismiss</string> | 64 | <string name="action_dismiss">Dismiss</string> |
65 | 65 | ||
66 | <string name="message_no_network_configuration_found">No network configuration has been found.</string> | 66 | <string name="message_no_network_configuration_found">No network configuration has been found.</string> |
67 | <string name="message_no_known_node">No known node</string> | ||
68 | <string name="message_generating_configuration">Generating node configuration…</string> | 67 | <string name="message_generating_configuration">Generating node configuration…</string> |
69 | <string name="message_joining_network">Joining network…</string> | 68 | <string name="message_joining_network">Joining network…</string> |
70 | <string name="message_network_configuration_written">Network configuration successfully written.</string> | 69 | <string name="message_network_configuration_written">Network configuration successfully written.</string> |
@@ -80,6 +79,7 @@ | |||
80 | <string name="message_disconnecting_vpn">Disconnecting VPN…</string> | 79 | <string name="message_disconnecting_vpn">Disconnecting VPN…</string> |
81 | <string name="message_passphrase_required">A passphrase is required to unlock the keyring.</string> | 80 | <string name="message_passphrase_required">A passphrase is required to unlock the keyring.</string> |
82 | <string name="message_daemon_exited">Tinc daemon exited during startup:\n%1$s\n\nCheck the logs for more details.</string> | 81 | <string name="message_daemon_exited">Tinc daemon exited during startup:\n%1$s\n\nCheck the logs for more details.</string> |
82 | <string name="message_loading">Loading…</string> | ||
83 | 83 | ||
84 | <string name="value_none">none</string> | 84 | <string name="value_none">none</string> |
85 | <string name="value_yes">yes</string> | 85 | <string name="value_yes">yes</string> |