Lint + max width for wizard

This commit is contained in:
serso
2016-03-03 16:10:30 +01:00
parent e9343e3b6b
commit 001888973a
12 changed files with 124 additions and 93 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

View File

@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/WizardFragment"
a:orientation="vertical">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical"
a:gravity="center"
a:paddingLeft="10dp"
a:paddingRight="10dp">
<ScrollView
a:id="@+id/wizard_content"
@@ -14,6 +17,29 @@
a:layout_weight="1"
a:fillViewport="true" />
<include layout="@layout/fragment_wizard_buttons" />
<LinearLayout
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="center_horizontal|bottom"
a:layout_marginTop="@dimen/control_margin"
a:orientation="horizontal">
<org.solovyev.android.material.MaterialButton
a:id="@+id/wizard_prev"
style="@style/MaterialButton.Wizard"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:visibility="gone" />
<org.solovyev.android.material.MaterialButton
a:id="@+id/wizard_next"
style="@style/MaterialButton.Wizard"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:visibility="gone" />
</LinearLayout>
</LinearLayout>

View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/WizardButtons"
a:layout_gravity="center_horizontal|bottom"
a:gravity="center">
<org.solovyev.android.material.MaterialButton
a:id="@+id/wizard_prev"
style="@style/MaterialButton.Wizard"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:visibility="gone" />
<org.solovyev.android.material.MaterialButton
a:id="@+id/wizard_next"
style="@style/MaterialButton.Wizard"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:visibility="gone" />
</LinearLayout>

View File

@@ -161,15 +161,6 @@
<item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
</style>
<style name="BaseWizardButtons">
<item name="android:background">@null</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">@dimen/control_margin</item>
<item name="android:layout_gravity">top|center_horizontal</item>
<item name="android:orientation">horizontal</item>
</style>
<style name="WizardPrimaryButton" parent="PrimaryButton">
<item name="android:singleLine">true</item>
<item name="android:maxLines">1</item>
@@ -178,19 +169,8 @@
<item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
</style>
<style name="WizardButtons" parent="BaseWizardButtons" />
<style name="PrimaryButton" parent="MaterialButton"/>
<style name="WizardFragment">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:orientation">vertical</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingRight">10dp</item>
<item name="android:gravity">center</item>
</style>
<style name="MaterialButton.Wizard" parent="MaterialButton">
<item name="android:textColor">@color/cpp_button_text</item>
<item name="materialColor">?attr/cpp_wizard_button_bg</item>