From 96e5db80d9a949435df32d2d0c46497b86d1fff4 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 14 Feb 2018 16:00:13 +0100
Subject: #8846 remove legacy code and files: Dashboard, LogWindow,
 UserStatusFragment, FabButton library etc.

---
 app/src/main/res/layout-sw600dp-port/f_log.xml     |  2 +-
 .../main/res/layout-sw600dp-port/log_fragment.xml  | 45 -------------
 app/src/main/res/layout-sw600dp/f_log.xml          |  2 +-
 app/src/main/res/layout-sw600dp/log_fragment.xml   | 37 -----------
 app/src/main/res/layout-xlarge/about.xml           |  2 +-
 app/src/main/res/layout-xlarge/dashboard.xml       | 38 -----------
 .../res/layout-xlarge/user_session_fragment.xml    | 54 ----------------
 app/src/main/res/layout/about.xml                  |  2 +-
 app/src/main/res/layout/dashboard.xml              | 34 ----------
 app/src/main/res/layout/log_fragment.xml           | 37 -----------
 app/src/main/res/layout/log_silders.xml            | 73 ----------------------
 app/src/main/res/layout/log_window.xml             | 12 ----
 app/src/main/res/layout/user_session_fragment.xml  | 45 -------------
 app/src/main/res/menu/client_dashboard.xml         | 19 ------
 app/src/main/res/menu/logmenu.xml                  | 44 -------------
 15 files changed, 4 insertions(+), 442 deletions(-)
 delete mode 100644 app/src/main/res/layout-sw600dp-port/log_fragment.xml
 delete mode 100644 app/src/main/res/layout-sw600dp/log_fragment.xml
 delete mode 100644 app/src/main/res/layout-xlarge/dashboard.xml
 delete mode 100644 app/src/main/res/layout-xlarge/user_session_fragment.xml
 delete mode 100644 app/src/main/res/layout/dashboard.xml
 delete mode 100644 app/src/main/res/layout/log_fragment.xml
 delete mode 100644 app/src/main/res/layout/log_silders.xml
 delete mode 100644 app/src/main/res/layout/log_window.xml
 delete mode 100644 app/src/main/res/layout/user_session_fragment.xml
 delete mode 100644 app/src/main/res/menu/client_dashboard.xml
 delete mode 100644 app/src/main/res/menu/logmenu.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-sw600dp-port/f_log.xml b/app/src/main/res/layout-sw600dp-port/f_log.xml
index 4ee64811..78dc4c62 100644
--- a/app/src/main/res/layout-sw600dp-port/f_log.xml
+++ b/app/src/main/res/layout-sw600dp-port/f_log.xml
@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
 
-        <include layout="@layout/log_silders"/>
+        <include layout="@layout/f_log_sliders"/>
 
         <include layout="@layout/vpnstatus"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp-port/log_fragment.xml b/app/src/main/res/layout-sw600dp-port/log_fragment.xml
deleted file mode 100644
index 7a4b60fe..00000000
--- a/app/src/main/res/layout-sw600dp-port/log_fragment.xml
+++ /dev/null
@@ -1,45 +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"
-              tools:context=".LogWindow">
-
-    <LinearLayout
-        android:background="@drawable/white_rect"
-        android:elevation="1dp"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent">
-
-        <include layout="@layout/log_silders"/>
-
-        <Space
-                android:layout_weight="5"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"/>
-        <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:orientation="vertical">
-            <include layout="@layout/vpnstatus"/>
-        </LinearLayout>
-        <Space
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_weight="1"/>
-    </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-sw600dp/f_log.xml b/app/src/main/res/layout-sw600dp/f_log.xml
index ec66af07..34daf8be 100644
--- a/app/src/main/res/layout-sw600dp/f_log.xml
+++ b/app/src/main/res/layout-sw600dp/f_log.xml
@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent">
 
-        <include layout="@layout/log_silders"/>
+        <include layout="@layout/f_log_sliders"/>
 
         <include layout="@layout/vpnstatus"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp/log_fragment.xml b/app/src/main/res/layout-sw600dp/log_fragment.xml
deleted file mode 100644
index 089bfb9d..00000000
--- a/app/src/main/res/layout-sw600dp/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="horizontal"
-              android:padding="20dp"
-              tools:context=".LogWindow">
-
-
-    <LinearLayout
-        android:background="@drawable/white_rect"
-        android:elevation="1dp"
-            android:minWidth="300dp"
-
-            android:orientation="vertical"
-            android:layout_width="400dp"
-            android:layout_height="match_parent">
-
-        <include layout="@layout/log_silders"/>
-
-        <include layout="@layout/vpnstatus"/>
-    </LinearLayout>
-
-    <ListView
-        android:minWidth="400dp"
-        android:layout_weight="4"
-            android:id="@android:id/list"
-            android:transcriptMode="normal"
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"/>
-</LinearLayout>
diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/about.xml
index fdf823a9..ea2251cf 100644
--- a/app/src/main/res/layout-xlarge/about.xml
+++ b/app/src/main/res/layout-xlarge/about.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:layout_marginLeft="12sp"
-    tools:context=".Dashboard" >
+    tools:context=".MainActivity" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xlarge/dashboard.xml b/app/src/main/res/layout-xlarge/dashboard.xml
deleted file mode 100644
index b9c78b68..00000000
--- a/app/src/main/res/layout-xlarge/dashboard.xml
+++ /dev/null
@@ -1,38 +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"
-    android:layout_marginLeft="10sp"
-    android:layout_marginStart="10sp"
-    android:layout_marginTop="10sp"
-    tools:context=".Dashboard" >
-
-    <TextView
-        android:id="@+id/providerName"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="32dp"
-        android:layout_marginStart="32dp"
-        android:textSize="48sp"
-        android:ellipsize="marquee"
-        android:gravity="center_vertical"
-        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>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout-xlarge/user_session_fragment.xml b/app/src/main/res/layout-xlarge/user_session_fragment.xml
deleted file mode 100644
index df72f615..00000000
--- a/app/src/main/res/layout-xlarge/user_session_fragment.xml
+++ /dev/null
@@ -1,54 +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="30dp"
-    android:layout_marginLeft="60dp"
-    android:layout_marginStart="60dp"
-    android:orientation="vertical"
-    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="30dp"
-        android:layout_gravity="center"
-        android:textSize="46sp"
-        android:text="@string/default_username"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <LinearLayout
-        android:id="@+id/user.status.buttonAndIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center">
-
-        <Button
-            android:id="@+id/user.status.button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="32sp"
-            />
-
-        <se.leap.bitmaskclient.userstatus.FabButton
-            android:id="@+id/user.status.icon"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_marginStart="24dp"
-            android:layout_marginLeft="24dp"
-            android:shadowRadius="0"
-            android:src="@drawable/icon_user"
-            android:color="@android:color/holo_blue_dark"
-            android:layout_gravity="center"
-            android:visibility="visible"
-            android:indeterminate="true"
-            android:max="100"
-            fbb_autoStart="true"
-            app:fbb_progressColor="@android:color/holo_green_dark"
-            app:fbb_progressWidthRatio="0.2"
-            />
-
-    </LinearLayout>
-</LinearLayout>
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>
diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml
deleted file mode 100644
index e0336cc0..00000000
--- a/app/src/main/res/menu/client_dashboard.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:id="@+id/about_leap"
-        android:orderInCategory="110"
-        android:title="@string/about"/>
-    <item
-        android:id="@+id/log_window"
-        android:title="@string/show_log_window"
-        android:visible="true"/>
-    <item
-        android:id="@+id/switch_provider"
-        android:orderInCategory="501"
-        android:title="@string/switch_provider_menu_option"/>
-    <item
-        android:id="@+id/signup_button"
-        android:title="@string/signup_button"
-        android:visible="false"/>
-
-</menu>
diff --git a/app/src/main/res/menu/logmenu.xml b/app/src/main/res/menu/logmenu.xml
deleted file mode 100644
index 4c8daf35..00000000
--- a/app/src/main/res/menu/logmenu.xml
+++ /dev/null
@@ -1,44 +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
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-
-    <item
-            android:id="@+id/toggle_time"
-            android:alphabeticShortcut="t"
-            android:icon="@drawable/ic_menu_view"
-            android:showAsAction="ifRoom"
-            android:title="@string/logview_options" />
-
-    <item
-            android:id="@+id/clearlog"
-            android:icon="@drawable/ic_menu_delete"
-            android:showAsAction="ifRoom"
-            android:title="@string/clear_log"
-            android:titleCondensed="@string/clear"/>
-    <item
-            android:id="@+id/send"
-            android:icon="@drawable/ic_menu_share"
-            android:showAsAction="ifRoom"
-            android:title="@string/send_logfile"
-            android:titleCondensed="@string/send"/>
-
-    <item
-            android:id="@+id/cancel"
-            android:icon="@drawable/ic_menu_close_clear_cancel"
-            android:showAsAction="ifRoom"
-            android:title="@string/cancel_connection_long"
-            android:titleCondensed="@string/cancel_connection"/>
-    <item
-            android:id="@+id/edit_vpn"
-            android:alphabeticShortcut="e"
-            android:icon="@drawable/ic_menu_edit"
-            android:showAsAction="withText|ifRoom"
-            android:title="@string/edit_vpn"
-	    android:visible="false"/>
-
-</menu>
-- 
cgit v1.2.3