|
@@ -1,9 +1,9 @@
|
|
|
-<?xml version="1.0" encoding="utf-8"?>
|
|
|
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
- xmlns:tools="http://schemas.android.com/tools"
|
|
|
+<LinearLayout
|
|
|
android:orientation="vertical"
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent">
|
|
|
+ android:layout_height="match_parent"
|
|
|
+ xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
+ xmlns:tools="http://schemas.android.com/tools">
|
|
|
|
|
|
<LinearLayout
|
|
|
android:id="@+id/mainFrame"
|
|
@@ -33,8 +33,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:scaleType="fitXY"
|
|
|
android:layout_marginRight="@dimen/md_icon_margin"
|
|
|
- android:layout_marginEnd="@dimen/md_icon_margin"
|
|
|
- />
|
|
|
+ android:layout_marginEnd="@dimen/md_icon_margin" />
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/title"
|
|
@@ -42,7 +41,6 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:textSize="@dimen/md_title_textsize"
|
|
|
tools:text="Title" />
|
|
|
-
|
|
|
</LinearLayout>
|
|
|
|
|
|
<com.afollestad.materialdialogs.views.MeasureCallbackScrollView
|
|
@@ -57,9 +55,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:textSize="@dimen/md_content_textsize"
|
|
|
tools:text="Content" />
|
|
|
-
|
|
|
</com.afollestad.materialdialogs.views.MeasureCallbackScrollView>
|
|
|
-
|
|
|
</LinearLayout>
|
|
|
|
|
|
<LinearLayout
|
|
@@ -102,8 +98,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:scaleType="fitXY"
|
|
|
android:layout_marginRight="@dimen/md_icon_margin"
|
|
|
- android:layout_marginEnd="@dimen/md_icon_margin"
|
|
|
- />
|
|
|
+ android:layout_marginEnd="@dimen/md_icon_margin" />
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/titleCustomView"
|
|
@@ -111,11 +106,8 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:textSize="@dimen/md_title_textsize"
|
|
|
tools:text="Title" />
|
|
|
-
|
|
|
</LinearLayout>
|
|
|
-
|
|
|
</LinearLayout>
|
|
|
-
|
|
|
</com.afollestad.materialdialogs.views.MeasureCallbackScrollView>
|
|
|
|
|
|
<LinearLayout
|
|
@@ -130,12 +122,9 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:scrollbarStyle="outsideOverlay"
|
|
|
-
|
|
|
android:divider="@null"
|
|
|
android:dividerHeight="0dp" />
|
|
|
-
|
|
|
</LinearLayout>
|
|
|
-
|
|
|
</LinearLayout>
|
|
|
|
|
|
<View
|
|
@@ -158,9 +147,7 @@
|
|
|
android:layout_alignParentLeft="true"
|
|
|
android:layout_alignParentStart="true"
|
|
|
android:layout_marginLeft="@dimen/md_neutral_button_margin"
|
|
|
- android:layout_marginStart="@dimen/md_neutral_button_margin"
|
|
|
- />
|
|
|
-
|
|
|
+ android:layout_marginStart="@dimen/md_neutral_button_margin" />
|
|
|
<!-- toLeftOf rule added from invalidateActions() -->
|
|
|
<Button
|
|
|
android:id="@+id/buttonDefaultNegative"
|
|
@@ -170,9 +157,7 @@
|
|
|
android:id="@+id/buttonDefaultPositive"
|
|
|
style="@style/MD_ActionButton"
|
|
|
android:layout_alignParentRight="true"
|
|
|
- android:layout_alignParentEnd="true"
|
|
|
- />
|
|
|
-
|
|
|
+ android:layout_alignParentEnd="true" />
|
|
|
</RelativeLayout>
|
|
|
|
|
|
<LinearLayout
|
|
@@ -193,7 +178,5 @@
|
|
|
<Button
|
|
|
android:id="@+id/buttonStackedNeutral"
|
|
|
style="@style/MD_ActionButtonStacked" />
|
|
|
-
|
|
|
</LinearLayout>
|
|
|
-
|
|
|
</LinearLayout>
|