Merge branch '#8846_remove_Dashboard' into '0.9.8'

#8846 remove legacy code and files: Dashboard, LogWindow, UserStatusFragment,…

See merge request leap/bitmask_android!44

3 files changed, 1 insertions, 93 deletions

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>