From 646e2ec7b868920f71c29243d2bbeb13deb811e3 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 23 Jan 2018 14:08:26 +0100 Subject: add tablet design for ConfigWizard based upon !28 I could not check this - starting emulator freezes my system and I have no tablet. --- app/build.gradle | 1 + .../res/layout-xlarge/a_provider_credentials.xml | 111 ++++++++++++++++++ .../main/res/layout-xlarge/a_provider_detail.xml | 124 ++++++++++++++++----- .../configuration_wizard_activity.xml | 109 +++++++++++++----- app/src/main/res/layout/a_provider_credentials.xml | 1 + app/src/main/res/layout/a_provider_detail.xml | 1 + .../res/layout/configuration_wizard_activity.xml | 1 + app/src/main/res/values/styles.xml | 1 - 8 files changed, 289 insertions(+), 60 deletions(-) create mode 100644 app/src/main/res/layout-xlarge/a_provider_credentials.xml (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index b28d9f35..4a99ad98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,6 +93,7 @@ dependencies { compile 'com.android.support:appcompat-v7:26.1.0' compile 'com.android.support:design:26.1.0' compile 'com.android.support:support-fragment:26.1.0' + compile 'com.android.support.constraint:constraint-layout:1.0.2' } // Ensure the no-op dependency is always used in JVM tests. diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml new file mode 100644 index 00000000..e259d4ed --- /dev/null +++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 31538f9f..d49e3129 100644 --- a/app/src/main/res/layout-xlarge/a_provider_detail.xml +++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml @@ -1,32 +1,98 @@ - - - - - - - - - - - \ No newline at end of file + tools:context=".ConfigurationWizard"> + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml index f82377cb..ba2b7ce4 100644 --- a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml +++ b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml @@ -1,34 +1,83 @@ - - - - - - - - - + tools:context=".ConfigurationWizard"> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml index 85d9d3cb..9a8955f2 100644 --- a/app/src/main/res/layout/a_provider_credentials.xml +++ b/app/src/main/res/layout/a_provider_credentials.xml @@ -4,6 +4,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" + android:padding="@dimen/stdpadding" style="@style/BitmaskActivity"> diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml index 5f07b87c..018d4ee8 100644 --- a/app/src/main/res/layout/a_provider_detail.xml +++ b/app/src/main/res/layout/a_provider_detail.xml @@ -3,6 +3,7 @@ android:id="@+id/provider_detail_fragment" android:layout_width="match_parent" android:layout_height="match_parent" + android:padding="@dimen/stdpadding" android:orientation="vertical" style="@style/BitmaskActivity" > diff --git a/app/src/main/res/layout/configuration_wizard_activity.xml b/app/src/main/res/layout/configuration_wizard_activity.xml index 25da8612..277a248d 100644 --- a/app/src/main/res/layout/configuration_wizard_activity.xml +++ b/app/src/main/res/layout/configuration_wizard_activity.xml @@ -4,6 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".ConfigurationWizard" + android:padding="@dimen/stdpadding" style="@style/BitmaskActivity" > diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3b1150ea..230f52ba 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -65,6 +65,5 @@ \ No newline at end of file -- cgit v1.2.3