ManagedDialog: layout changed, icon removed, toolbar used for title.

app/src/main/java/com/xabber/android/ui/helper/ManagedDialog.java

@@ -15,10 +15,10 @@
 package com.xabber.android.ui.helper;
 
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.TextView;
 
 import com.xabber.androiddev.R;
@@ -35,11 +35,13 @@ public abstract class ManagedDialog extends SingleActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setTheme(android.R.style.Theme_Dialog);
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.dialog);
+
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
+        getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+
         findViewById(android.R.id.button1).setOnClickListener(
                 new OnClickListener() {
                     @Override
@@ -64,11 +66,11 @@ public abstract class ManagedDialog extends SingleActivity {
     }
 
     public void setDialogTitle(CharSequence title) {
-        ((TextView) findViewById(android.R.id.title)).setText(title);
+        getSupportActionBar().setTitle(title);
     }
 
     public void setDialogTitle(int resid) {
-        ((TextView) findViewById(android.R.id.title)).setText(resid);
+        getSupportActionBar().setTitle(resid);
     }
 
     public void setDialogMessage(CharSequence title) {
@@ -81,9 +83,10 @@ public abstract class ManagedDialog extends SingleActivity {
 
     public void setCustomView(View view, boolean hideContainer) {
         ((ViewGroup) findViewById(android.R.id.custom)).addView(view);
-        if (hideContainer)
+        if (hideContainer) {
             findViewById(R.id.container).setVisibility(View.GONE);
         }
+    }
 
     /**
      * Click on first button.

app/src/main/res/layout/dialog.xml

@@ -16,65 +16,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingTop="9dip"
-    android:paddingBottom="3dip"
-    android:paddingLeft="3dip"
-    android:paddingRight="1dip"
     >
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="54dip"
-        android:orientation="vertical"
-        >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:layout_marginTop="6dip"
-            android:layout_marginBottom="9dip"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            >
-
-            <ImageView
-				android:id="@android:id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top"
-                android:paddingTop="6dip"
-                android:paddingRight="10dip"
-                android:src="@android:drawable/ic_dialog_info"
-				/>
-
-            <TextView
-				android:id="@android:id/title"
-                style="?android:attr/textAppearanceLarge"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-				/>
-
-        </LinearLayout>
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:visibility="gone"
-            android:scaleType="fitXY"
-            android:gravity="fill_horizontal"
-            android:src="@android:drawable/divider_horizontal_dark"
-			/>
-    </LinearLayout>
+    <include layout="@layout/toolbar_default" />
 
     <ScrollView
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_weight="1"
         android:paddingTop="2dip"
         android:paddingBottom="12dip"
@@ -85,7 +34,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical" >
 
             <TextView
@@ -115,7 +64,6 @@
             />
 
         <LinearLayout
-            style="@android:style/ButtonBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -127,7 +75,6 @@
 
             <Button
                android:id="@android:id/button1"
-                style="?android:attr/buttonStyle"
                 android:layout_width="0dip"
                 android:layout_gravity="left"
                 android:layout_weight="1"
@@ -138,7 +85,6 @@
 
             <Button
                 android:id="@android:id/button3"
-                style="?android:attr/buttonStyle"
                 android:layout_width="0dip"
                 android:layout_gravity="center_horizontal"
                 android:layout_weight="1"
@@ -148,7 +94,6 @@
 
             <Button
                 android:id="@android:id/button2"
-                style="?android:attr/buttonStyle"
                 android:layout_width="0dip"
                 android:layout_gravity="right"
                 android:layout_weight="1"