diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/about.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/dashboard.xml | 34 | ||||
| -rw-r--r-- | app/src/main/res/layout/log_fragment.xml | 37 | ||||
| -rw-r--r-- | app/src/main/res/layout/log_silders.xml | 73 | ||||
| -rw-r--r-- | app/src/main/res/layout/log_window.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/layout/user_session_fragment.xml | 45 |
6 files changed, 1 insertions, 202 deletions
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index e26629ab..abc12566 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:layout_marginLeft="8sp" - tools:context=".Dashboard" > + tools:context=".MainActivity" > <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml deleted file mode 100644 index 1b294fb1..00000000 --- a/app/src/main/res/layout/dashboard.xml +++ /dev/null @@ -1,34 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/dashboardLayout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - tools:context=".Dashboard" > - - <TextView - android:id="@+id/providerName" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginStart="10dp" - android:textSize="26sp" - android:ellipsize="marquee" - android:gravity="center_vertical" - android:maxLines="1" - android:text="@string/provider_label_none" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <LinearLayout - android:id="@+id/user.status.fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"/> - - <LinearLayout - android:id="@+id/servicesCollection" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.11" - android:orientation="vertical" /> -</LinearLayout> diff --git a/app/src/main/res/layout/log_fragment.xml b/app/src/main/res/layout/log_fragment.xml deleted file mode 100644 index ab070117..00000000 --- a/app/src/main/res/layout/log_fragment.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?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 - --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <LinearLayout - android:background="@drawable/white_rect" - android:elevation="1dp" - android:orientation="vertical" - android:layout_height="wrap_content" - android:layout_width="match_parent"> - - <include layout="@layout/log_silders"/> - - <TextView - android:text="@string/speed_waiting" - android:singleLine="true" - android:id="@+id/speed" - tools:ignore="InconsistentLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - </LinearLayout> - - <ListView - android:id="@android:id/list" - android:transcriptMode="normal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/log_silders.xml b/app/src/main/res/layout/log_silders.xml deleted file mode 100644 index 4196e243..00000000 --- a/app/src/main/res/layout/log_silders.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?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 - --> - -<LinearLayout - xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:id="@+id/logOptionsLayout" - android:visibility="gone" - tools:visibility="visible" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/log_verbosity_level"/> - - - <de.blinkt.openvpn.views.SeekBarTicks - android:id="@+id/LogLevelSlider" - android:layout_width="300dp" - android:layout_height="wrap_content" - tools:max="5" - android:indeterminate="false"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/timestamps"/> - - <RadioGroup - android:id="@+id/timeFormatRadioGroup" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <RadioButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/timestamps_none" - android:id="@+id/radioNone" - /> - - <RadioButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/timestamp_short" - android:id="@+id/radioShort" - /> - - <RadioButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/timestamp_iso" - android:id="@+id/radioISO" - /> - - - </RadioGroup> - - <CheckBox - tools:checked="true" - android:id="@+id/clearlogconnect" - android:text="@string/clear_log_on_connect" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/log_window.xml b/app/src/main/res/layout/log_window.xml deleted file mode 100644 index 7c25dcfa..00000000 --- a/app/src/main/res/layout/log_window.xml +++ /dev/null @@ -1,12 +0,0 @@ -<!-- - ~ Copyright (c) 2012-2016 Arne Schwabe - ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt - --> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".LogWindow" - tools:ignore="MergeRootFrame" />
\ No newline at end of file diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml deleted file mode 100644 index 2d38d140..00000000 --- a/app/src/main/res/layout/user_session_fragment.xml +++ /dev/null @@ -1,45 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginLeft="20dp" - android:layout_marginStart="20dp" - tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment"> - - <TextView - android:id="@+id/user.status.username" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="10dp" - android:layout_marginRight="15dp" - android:layout_marginEnd="20dp" - android:textSize="20sp" - android:text="@string/default_username" - android:textAppearance="?android:attr/textAppearanceMedium"/> - - <Button - android:id="@+id/user.status.button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - /> - - <se.leap.bitmaskclient.userstatus.FabButton - android:id="@+id/user.status.icon" - android:layout_width="32dp" - android:layout_height="32dp" - android:layout_marginLeft="9dp" - android:layout_marginStart="9dp" - android:shadowRadius="0" - android:src="@drawable/icon_user" - android:color="@android:color/holo_blue_dark" - android:layout_gravity="center" - android:indeterminate="true" - app:fbb_progressColor="@android:color/holo_green_dark" - app:fbb_progressWidthRatio="0.2" - app:fbb_showShadow="false" - /> - -</LinearLayout> |