diff --git a/app/src/main/java/net/kaaass/zerotierfix/ui/NetworkListFragment.java b/app/src/main/java/net/kaaass/zerotierfix/ui/NetworkListFragment.java index 39809a4..d343925 100644 --- a/app/src/main/java/net/kaaass/zerotierfix/ui/NetworkListFragment.java +++ b/app/src/main/java/net/kaaass/zerotierfix/ui/NetworkListFragment.java @@ -36,6 +36,7 @@ import com.zerotier.sdk.Version; import com.zerotier.sdk.VirtualNetworkConfig; +import net.kaaass.zerotierfix.BuildConfig; import net.kaaass.zerotierfix.R; import net.kaaass.zerotierfix.ZerotierFixApplication; import net.kaaass.zerotierfix.events.AfterJoinNetworkEvent; @@ -232,6 +233,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa this.nodeStatusView = view.findViewById(R.id.node_status); this.nodeClientVersionView = view.findViewById(R.id.client_version); setNodeIdText(); + TextView appVersionView = view.findViewById(R.id.app_version); + appVersionView.setText(String.format(getString(R.string.app_version_format), + BuildConfig.VERSION_NAME)); // 加载网络数据 updateNetworkListAndNotify(); diff --git a/app/src/main/res/layout/fragment_network_list.xml b/app/src/main/res/layout/fragment_network_list.xml index 632e9e6..019133f 100644 --- a/app/src/main/res/layout/fragment_network_list.xml +++ b/app/src/main/res/layout/fragment_network_list.xml @@ -63,7 +63,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_toRightOf="@+id/node_id" + android:layout_toEndOf="@+id/node_id" android:padding="5dp" android:text="@string/status_offline" android:textColor="?attr/lightGreyText" /> @@ -73,10 +73,19 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_toRightOf="@+id/node_status" + android:layout_toEndOf="@+id/node_status" android:padding="5dp" android:text="@string/unknown_version" android:textColor="?attr/lightGreyText" /> + + diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index b832da2..96a68d3 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -146,4 +146,5 @@ 无法连接至网络 %1$s: 需要授权 VPN 服务发生错误!%1$s 未知 + (APP: %s) \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3295d7c..226df12 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,7 +85,7 @@ Moon Orbit information exists! Moon orbit added successfully. Moon orbit deleted successfully. Disconnect & reconnect for this setting to take effect. - - + -.-.- Connected Connected to %s Network Detail @@ -148,4 +148,5 @@ Cannot connect to network %1$s: Authorization required A VPN service error has occurred! %1$s Unknown + (APP: %s)