diff options
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/res/layout-sw600dp-port/f_log.xml | 29 | ||||
| -rw-r--r-- | app/src/main/res/layout-sw600dp/f_log.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/about.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/eip_service_fragment.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/about.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_main.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/f_log.xml | 4 |
8 files changed, 39 insertions, 18 deletions
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 da46450c..4ee64811 100644 --- a/app/src/main/res/layout-sw600dp-port/f_log.xml +++ b/app/src/main/res/layout-sw600dp-port/f_log.xml @@ -5,9 +5,30 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_margin"> + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:padding="@dimen/activity_margin" + android:id="@+id/log_layout"> + + <LinearLayout + android:background="@drawable/white_rect" + android:elevation="1dp" + android:minWidth="300dp" + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="match_parent"> + + <include layout="@layout/log_silders"/> + + <include layout="@layout/vpnstatus"/> + </LinearLayout> + + <ListView + android:id="@android:id/list" + android:transcriptMode="normal" + android:layout_width="fill_parent" + android:layout_height="match_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 9ad30208..ec66af07 100644 --- a/app/src/main/res/layout-sw600dp/f_log.xml +++ b/app/src/main/res/layout-sw600dp/f_log.xml @@ -5,12 +5,12 @@ --> <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" > - + android:padding="20dp" + android:id="@+id/log_layout" + > <LinearLayout android:background="@drawable/white_rect" diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/about.xml index 227da8b0..fdf823a9 100644 --- a/app/src/main/res/layout-xlarge/about.xml +++ b/app/src/main/res/layout-xlarge/about.xml @@ -1,6 +1,6 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/dashboardLayout" + android:id="@+id/aboutLayout" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index 28ac3b9a..c99d83bc 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -4,7 +4,9 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginLeft="20dp" - android:layout_marginStart="20dp"> + android:layout_marginStart="20dp" + android:id="@+id/eipServiceFragment" + > <TextView android:id="@+id/eipLabel" diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 62e858cb..e26629ab 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -1,6 +1,6 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/dashboardLayout" + android:id="@+id/aboutLayout" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index 20d826b3..41498617 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -24,12 +24,7 @@ android:id="@+id/mask" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerInParent="true" - android:layout_centerVertical="true" app:srcCompat="@drawable/mask" /> - - </FrameLayout> <RelativeLayout diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index aa7ba514..497d2c0b 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -2,9 +2,10 @@ <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/relativeLayout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:id="@+id/eipServiceFragment" + > <android.support.constraint.Guideline android:id="@+id/guideline_horizontal_top" diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml index 41c72d99..47a80e50 100644 --- a/app/src/main/res/layout/f_log.xml +++ b/app/src/main/res/layout/f_log.xml @@ -9,7 +9,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp"> + android:padding="16dp" + android:id="@+id/log_layout" + > <LinearLayout android:elevation="1dp" |