summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout-xlarge
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-05-12 01:58:20 +0200
committercyBerta <cyberta@riseup.net>2018-05-12 01:58:20 +0200
commit974a1d28fce969489c0cd4a401f1b51ce0b9cd94 (patch)
tree17b9c90bed8b3cbb02a56be5b84675f8094e30f0 /app/src/main/res/layout-xlarge
parentc5f445fabcbfa6f045aa5f3e5341909468259aed (diff)
parent5122945a6860caeb46359540ae2a1382f8aab415 (diff)
Merge branch 'master' into #8889_revise_NavigationDrawer
Diffstat (limited to 'app/src/main/res/layout-xlarge')
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_credentials.xml6
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_detail.xml4
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_list.xml (renamed from app/src/main/res/layout-xlarge/provider_list_activity.xml)4
-rw-r--r--app/src/main/res/layout-xlarge/f_about.xml (renamed from app/src/main/res/layout-xlarge/about.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/f_eip.xml (renamed from app/src/main/res/layout-xlarge/eip_service_fragment.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/session_dialog.xml39
-rw-r--r--app/src/main/res/layout-xlarge/v_loading_screen.xml (renamed from app/src/main/res/layout-xlarge/loading_screen.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/v_provider_header.xml (renamed from app/src/main/res/layout-xlarge/provider_header.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/v_provider_list_item.xml (renamed from app/src/main/res/layout-xlarge/provider_list_item.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/v_single_list_item.xml (renamed from app/src/main/res/layout-xlarge/single_list_item.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/v_vpn_status.xml (renamed from app/src/main/res/layout-xlarge/vpnstatus.xml)0
11 files changed, 7 insertions, 46 deletions
diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
index 2184aeb8..79045082 100644
--- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
@@ -57,7 +57,7 @@
app:layout_constraintTop_toTopOf="@+id/guideline_top"
app:layout_constraintWidth_min="731dp">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:layout_width="match_parent"
@@ -66,7 +66,7 @@
android:orientation="vertical">
<include
- layout="@layout/provider_header"
+ layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -82,7 +82,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<include
- layout="@layout/provider_credentials"
+ layout="@layout/v_provider_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-xlarge/a_provider_detail.xml b/app/src/main/res/layout-xlarge/a_provider_detail.xml
index 18098079..c1eeb0e0 100644
--- a/app/src/main/res/layout-xlarge/a_provider_detail.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml
@@ -58,7 +58,7 @@
app:layout_constraintTop_toTopOf="@+id/guideline_top"
app:layout_constraintWidth_min="731dp">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -67,7 +67,7 @@
android:layout_height="wrap_content">
<include
- layout="@layout/provider_header"
+ layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-xlarge/provider_list_activity.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml
index cdffc24e..9150466a 100644
--- a/app/src/main/res/layout-xlarge/provider_list_activity.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_list.xml
@@ -58,7 +58,7 @@
app:layout_constraintTop_toTopOf="@+id/guideline_top"
app:layout_constraintWidth_min="731dp">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -66,7 +66,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <include layout="@layout/provider_header"
+ <include layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index c7896917..c7896917 100644
--- a/app/src/main/res/layout-xlarge/about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index 2326ffe8..2326ffe8 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
diff --git a/app/src/main/res/layout-xlarge/session_dialog.xml b/app/src/main/res/layout-xlarge/session_dialog.xml
deleted file mode 100644
index 3a9eebb8..00000000
--- a/app/src/main/res/layout-xlarge/session_dialog.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- tools:context=".LogInDialog" >
-
- <TextView
- android:id="@+id/user_message"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <EditText
- android:id="@+id/username_entered"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="4dp"
- android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
- android:layout_marginTop="16dp"
- android:ems="10"
- android:hint="@string/username_hint"
- android:inputType="textUri" >
-
- <requestFocus />
- </EditText>
-
- <EditText
- android:id="@+id/password_entered"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="@string/password_hint"
- android:inputType="textPassword" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml
index 2af6b411..2af6b411 100644
--- a/app/src/main/res/layout-xlarge/loading_screen.xml
+++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml
diff --git a/app/src/main/res/layout-xlarge/provider_header.xml b/app/src/main/res/layout-xlarge/v_provider_header.xml
index 45f8302b..45f8302b 100644
--- a/app/src/main/res/layout-xlarge/provider_header.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_header.xml
diff --git a/app/src/main/res/layout-xlarge/provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml
index ec1e1242..ec1e1242 100644
--- a/app/src/main/res/layout-xlarge/provider_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml
diff --git a/app/src/main/res/layout-xlarge/single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml
index ad3de093..ad3de093 100644
--- a/app/src/main/res/layout-xlarge/single_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml
diff --git a/app/src/main/res/layout-xlarge/vpnstatus.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml
index 3b464b62..3b464b62 100644
--- a/app/src/main/res/layout-xlarge/vpnstatus.xml
+++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml