diff options
author | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
commit | a95567b4bbb2319636a79cc5e8d6a7921df9f4d1 (patch) | |
tree | 7d5c7c36b141aa98e909f6b99baed769de5cf923 /app/src/main/res/layout/v_vpn_status.xml | |
parent | fda23fc8c5aa916bce4ce985fcdf0aa08b21f1e6 (diff) | |
parent | 54e95a61bc553d985f6c55823da20985b6103aa0 (diff) |
Merge branch 'cleanup' into 'master'
cleanup - rename layout files
See merge request leap/bitmask_android!64
Diffstat (limited to 'app/src/main/res/layout/v_vpn_status.xml')
-rw-r--r-- | app/src/main/res/layout/v_vpn_status.xml | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/app/src/main/res/layout/v_vpn_status.xml b/app/src/main/res/layout/v_vpn_status.xml new file mode 100644 index 00000000..3b464b62 --- /dev/null +++ b/app/src/main/res/layout/v_vpn_status.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2012-2016 Arne Schwabe + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + --> + +<merge xmlns:tools="http://schemas.android.com/tools" + xmlns:android="http://schemas.android.com/apk/res/android"> + + <Space + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + + <TextView + android:text="@string/uploaded_data" + style="@style/logWindowStatusTitle"/> + + <TextView + style="@style/logWindowStatusText" + android:id="@+id/speedUp" + tools:text="4 Mbit/s 6.7 GB"/> + + <TextView + android:text="@string/downloaded_data" + style="@style/logWindowStatusTitle"/> + + <TextView + style="@style/logWindowStatusText" + android:id="@+id/speedDown" + tools:text="2 Mbit/s 4.7 GB"/> + + + <Space + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + + <TextView + android:text="@string/vpn_status" + style="@style/logWindowStatusTitle"/> + + <TextView + + android:id="@+id/speedStatus" + tools:text="Connected to a very long ipv4 and 3483489348238824829482384928" + style="@style/logWindowStatusText"/> + + +</merge>
\ No newline at end of file |