summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2017-11-09 14:57:15 +0100
committercyBerta <cyberta@riseup.net>2017-11-09 14:57:15 +0100
commitd7f5c4211ed81dde5c3bb94d54e88e805d576ca9 (patch)
tree4fd52a95a200e88eba9f40d7f2ade79d892d9921 /app/src/main/res/layout
parent380fabcb9af673428d1e223dd2a145bb9d761ebe (diff)
8782 fixes app crashes due to missing layout references, removes unneeded layout files, minor layout clean up
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/eip_service_fragment.xml2
-rw-r--r--app/src/main/res/layout/logwindow.xml17
-rw-r--r--app/src/main/res/layout/user_session_fragment.xml3
3 files changed, 2 insertions, 20 deletions
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index c8370cf1..cef01c18 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -30,7 +30,7 @@
android:textSize="12sp"
/>
- <mbanje.kurt.fabbutton.FabButton
+ <se.leap.bitmaskclient.userstatus.FabButton
android:id="@+id/vpn_status_image"
android:layout_width="32dp"
android:layout_height="32dp"
diff --git a/app/src/main/res/layout/logwindow.xml b/app/src/main/res/layout/logwindow.xml
deleted file mode 100644
index 4051c92c..00000000
--- a/app/src/main/res/layout/logwindow.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView android:text="@string/speed_waiting"
- android:singleLine="true"
- android:id="@+id/speed"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
- <ListView
- android:id="@android:id/list"
- 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/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml
index d33f9b9a..914c8462 100644
--- a/app/src/main/res/layout/user_session_fragment.xml
+++ b/app/src/main/res/layout/user_session_fragment.xml
@@ -26,7 +26,7 @@
android:textSize="14sp"
/>
- <view
+ <se.leap.bitmaskclient.userstatus.FabButton
android:id="@+id/user.status.icon"
android:layout_width="32dp"
android:layout_height="32dp"
@@ -35,7 +35,6 @@
android:shadowRadius="0"
android:src="@drawable/ic_account_circle"
android:color="@android:color/transparent"
- class="se.leap.bitmaskclient.userstatus.FabButton"
android:layout_gravity="center"
android:indeterminate="true"
app:fbb_progressColor="@android:color/holo_green_dark"