ホーム エクスプローラ ヘルプ
サインイン
mgtech
/
BaseLibrary
15
0
Fork 0
ファイル 課題 0 プルリクエスト 0 Wiki
ソースを参照

CustomDialog.java 修改

niusongtao@dl-cg.com 5 年 前
親
6e9452324c
コミット
3b3ddcfc96
2 ファイル変更、21 行追加、15 行削除
分割表示 差分情報を表示
  1. 4 3
      base_library/src/main/java/com/mgtech/base_library/util/CustomDialog.java
  2. 17 12
      base_library/src/main/res/layout/dialog_update.xml

+ 4 - 3
base_library/src/main/java/com/mgtech/base_library/util/CustomDialog.java
ファイルの表示 

@@ -6,6 +6,7 @@ import android.content.Context;
 
 import android.content.DialogInterface;
 
 import android.graphics.drawable.ColorDrawable;
 
 import android.text.Html;
 
+import android.text.TextUtils;
 
 import android.text.method.ScrollingMovementMethod;
 
 import android.view.LayoutInflater;
 
 import android.view.View;
 
@@ -146,7 +147,7 @@ public class CustomDialog extends Dialog {
 
             // set the dialog title
 
             ((TextView) contentView.findViewById(R.id.dialog_title)).setText(title);
 
             // set the confirm button
 
-            if (positiveButtonText != null) {
 
+            if (!TextUtils.isEmpty(positiveButtonText)) {
 
                 ((SuperTextView) contentView.findViewById(R.id.dialog_positive))
 
                         .setText(positiveButtonText);
 
                 if (positiveButtonClickListener != null) {
 
@@ -164,7 +165,7 @@ public class CustomDialog extends Dialog {
 
                         View.GONE);
 
             }
 
             // set the cancel button
 
-            if (negativeButtonText != null) {
 
+            if (!TextUtils.isEmpty(negativeButtonText)) {
 
                 ((SuperTextView) contentView.findViewById(R.id.dialog_negative))
 
                         .setText(negativeButtonText);
 
                 if (negativeButtonClickListener != null) {
 
@@ -184,7 +185,7 @@ public class CustomDialog extends Dialog {
 
             // set the content message
 
             if (message != null) {
 
                 ((TextView) contentView.findViewById(R.id.dialog_message)).setMovementMethod(ScrollingMovementMethod.getInstance());
 
-                if (message.startsWith("<html>"))
 
+                if (message.startsWith("<"))
 
                     ((TextView) contentView.findViewById(R.id.dialog_message)).setText(Html.fromHtml(message));
 
                 else
 
                     ((TextView) contentView.findViewById(R.id.dialog_message)).setText(message);

+ 17 - 12
base_library/src/main/res/layout/dialog_update.xml
ファイルの表示 

@@ -12,12 +12,13 @@
 
         android:layout_marginStart="@dimen/dp_40"
 
         android:layout_marginTop="@dimen/dp_50"
 
         android:layout_marginEnd="@dimen/dp_40"
 
+        app:layout_constraintBottom_toBottomOf="parent"
 
+        app:layout_constraintDimensionRatio="H,284:386"
 
         app:layout_constraintEnd_toEndOf="parent"
 
         app:layout_constraintStart_toStartOf="parent"
 
         app:layout_constraintTop_toTopOf="parent"
 
-        app:layout_constraintBottom_toBottomOf="@id/dialog_negative"
 
-        app:stv_solid="@color/white"
 
-        app:stv_corner="@dimen/dp_20" />
 
+        app:stv_corner="@dimen/dp_20"
 
+        app:stv_solid="@color/white" />
 
 
 
     <ImageView
 
@@ -25,20 +26,21 @@
 
         android:layout_width="wrap_content"
 
         android:layout_height="wrap_content"
 
         android:src="@drawable/update_img"
 
+        app:layout_constraintBottom_toTopOf="@id/dialog_bg"
 
         app:layout_constraintEnd_toEndOf="@id/dialog_bg"
 
         app:layout_constraintStart_toStartOf="@id/dialog_bg"
 
-        app:layout_constraintTop_toTopOf="parent" />
 
+        app:layout_constraintTop_toTopOf="@id/dialog_bg" />
 
 
     <TextView
 
         android:id="@+id/dialog_title"
 
         android:layout_width="@dimen/dp_0"
 
         android:layout_height="wrap_content"
 
+        android:layout_marginStart="@dimen/dp_20"
 
         android:layout_marginTop="@dimen/dp_5"
 
+        android:layout_marginEnd="@dimen/dp_20"
 
         android:gravity="center"
 
         android:textColor="#FFB717"
 
         android:textSize="@dimen/sp_18"
 
-        android:layout_marginStart="@dimen/dp_20"
 
-        android:layout_marginEnd="@dimen/dp_20"
 
         android:textStyle="bold"
 
         app:layout_constraintEnd_toEndOf="@id/dialog_bg"
 
         app:layout_constraintStart_toStartOf="@id/dialog_bg"
 
@@ -48,15 +50,16 @@
 
     <TextView
 
         android:id="@+id/dialog_message"
 
         android:layout_width="@dimen/dp_0"
 
-        android:layout_height="wrap_content"
 
+        android:layout_height="@dimen/dp_0"
 
         android:layout_marginStart="@dimen/dp_20"
 
         android:layout_marginTop="@dimen/dp_15"
 
         android:layout_marginEnd="@dimen/dp_20"
 
+        android:layout_marginBottom="@dimen/dp_30"
 
         android:gravity="center"
 
         android:scrollbars="vertical"
 
-        android:maxHeight="@dimen/dp_80"
 
         android:textColor="@color/black_alpha_50"
 
         android:textSize="@dimen/sp_13"
 
+        app:layout_constraintBottom_toTopOf="@id/dialog_positive"
 
         app:layout_constraintEnd_toEndOf="@id/dialog_bg"
 
         app:layout_constraintStart_toStartOf="@id/dialog_bg"
 
         app:layout_constraintTop_toBottomOf="@id/dialog_title" />
 
@@ -66,13 +69,15 @@
 
         android:layout_width="@dimen/dp_0"
 
         android:layout_height="@dimen/dp_40"
 
         android:layout_marginStart="@dimen/dp_20"
 
+        android:layout_marginTop="@dimen/dp_30"
 
         android:layout_marginEnd="@dimen/dp_20"
 
+        android:layout_marginBottom="@dimen/dp_10"
 
         android:gravity="center"
 
         android:textColor="@color/black"
 
-        android:layout_marginTop="@dimen/dp_30"
 
-        app:layout_constraintTop_toBottomOf="@id/dialog_message"
 
+        app:layout_constraintBottom_toTopOf="@id/dialog_negative"
 
         app:layout_constraintEnd_toEndOf="@id/dialog_bg"
 
         app:layout_constraintStart_toStartOf="@id/dialog_bg"
 
+        app:layout_goneMarginBottom="@dimen/dp_20"
 
         app:stv_corner="@dimen/dp_25"
 
         app:stv_solid="#FFAA00" />
 
 
@@ -81,12 +86,12 @@
 
         android:layout_width="@dimen/dp_0"
 
         android:layout_height="@dimen/dp_40"
 
         android:layout_marginStart="@dimen/dp_20"
 
+        android:layout_marginTop="@dimen/dp_10"
 
         android:layout_marginEnd="@dimen/dp_20"
 
         android:layout_marginBottom="@dimen/dp_20"
 
         android:gravity="center"
 
-        android:layout_marginTop="@dimen/dp_10"
 
         android:textColor="@color/black_alpha_50"
 
-        app:layout_constraintTop_toBottomOf="@id/dialog_positive"
 
+        app:layout_constraintBottom_toBottomOf="@id/dialog_bg"
 
         app:layout_constraintEnd_toEndOf="@id/dialog_bg"
 
         app:layout_constraintStart_toStartOf="@id/dialog_bg"
 
         app:stv_corner="@dimen/dp_25"