Răsfoiți Sursa

Fixed https://github.com/afollestad/material-dialogs/issues/693

Aidan Follestad 10 ani în urmă
părinte
comite
ea22553560

+ 7 - 49
commons/src/main/java/com/afollestad/materialdialogs/simplelist/MaterialSimpleListAdapter.java

@@ -1,19 +1,12 @@
 package com.afollestad.materialdialogs.simplelist;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.CompoundButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.commons.R;
 import com.afollestad.materialdialogs.internal.MDAdapter;
@@ -61,50 +54,15 @@ public class MaterialSimpleListAdapter extends ArrayAdapter<MaterialSimpleListIt
             tv.setTextColor(dialog.getBuilder().getItemColor());
             tv.setText(item.getContent());
             dialog.setTypeface(tv, dialog.getBuilder().getRegularFont());
-            setupGravity((ViewGroup) view);
         }
         return view;
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    private void setupGravity(ViewGroup view) {
-        final LinearLayout itemRoot = (LinearLayout) view;
-        final GravityEnum gravity = dialog.getBuilder().getItemsGravity();
-        final int gravityInt = gravity.getGravityInt();
-        itemRoot.setGravity(gravityInt | Gravity.CENTER_VERTICAL);
-
-        if (view.getChildCount() == 2) {
-            if (dialog.getBuilder().getItemsGravity() == GravityEnum.END && !isRTL() && view.getChildAt(0) instanceof ImageView) {
-                CompoundButton first = (CompoundButton) view.getChildAt(0);
-                view.removeView(first);
-
-                TextView second = (TextView) view.getChildAt(0);
-                view.removeView(second);
-                second.setPadding(second.getPaddingRight(), second.getPaddingTop(),
-                        second.getPaddingLeft(), second.getPaddingBottom());
-
-                view.addView(second);
-                view.addView(first);
-            } else if (gravity == GravityEnum.START && isRTL() && view.getChildAt(1) instanceof ImageView) {
-                CompoundButton first = (CompoundButton) view.getChildAt(1);
-                view.removeView(first);
-
-                TextView second = (TextView) view.getChildAt(0);
-                view.removeView(second);
-                second.setPadding(second.getPaddingRight(), second.getPaddingTop(),
-                        second.getPaddingRight(), second.getPaddingBottom());
-
-                view.addView(first);
-                view.addView(second);
-            }
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    private boolean isRTL() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)
-            return false;
-        Configuration config = getContext().getResources().getConfiguration();
-        return config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
-    }
+//    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+//    private boolean isRTL() {
+//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)
+//            return false;
+//        Configuration config = getContext().getResources().getConfiguration();
+//        return config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
+//    }
 }

+ 0 - 33
commons/src/main/res/layout-ldrtl/md_simplelist_item.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="@dimen/md_dialog_frame_margin"
-    android:paddingStart="@dimen/md_dialog_frame_margin"
-    android:paddingRight="@dimen/md_dialog_frame_margin"
-    android:paddingEnd="@dimen/md_dialog_frame_margin"
-    android:paddingTop="@dimen/md_simplelistitem_padding_top"
-    android:paddingBottom="@dimen/md_simplelistitem_padding_top"
-    android:gravity="start|center_vertical"
-    android:minHeight="@dimen/md_listitem_height">
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/md_content_textsize"
-        tools:text="Title" />
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="@dimen/md_simplelist_icon"
-        android:layout_height="@dimen/md_simplelist_icon"
-        tools:background="#f5f5f5"
-        android:layout_marginLeft="@dimen/md_simplelist_icon_margin"
-        android:layout_marginStart="@dimen/md_simplelist_icon_margin"
-        android:scaleType="fitXY"
-        tools:ignore="ContentDescription" />
-
-</LinearLayout>

+ 15 - 12
commons/src/main/res/layout/md_simplelist_item.xml

@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="start|center_vertical"
+    android:minHeight="@dimen/md_listitem_height"
+    android:paddingEnd="@dimen/md_dialog_frame_margin"
     android:paddingLeft="@dimen/md_dialog_frame_margin"
-    android:paddingStart="@dimen/md_dialog_frame_margin"
     android:paddingRight="@dimen/md_dialog_frame_margin"
-    android:paddingEnd="@dimen/md_dialog_frame_margin"
-    android:paddingTop="@dimen/md_simplelistitem_padding_top"
-    android:paddingBottom="@dimen/md_simplelistitem_padding_top"
-    android:gravity="start|center_vertical"
-    android:minHeight="@dimen/md_listitem_height">
+    android:paddingStart="@dimen/md_dialog_frame_margin">
 
     <ImageView
         android:id="@android:id/icon"
         android:layout_width="@dimen/md_simplelist_icon"
         android:layout_height="@dimen/md_simplelist_icon"
-        tools:background="#f5f5f5"
-        android:layout_marginRight="@dimen/md_simplelist_icon_margin"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
         android:layout_marginEnd="@dimen/md_simplelist_icon_margin"
+        android:layout_marginRight="@dimen/md_simplelist_icon_margin"
         android:scaleType="fitXY"
+        tools:background="#f5f5f5"
         tools:ignore="ContentDescription" />
 
     <TextView
         android:id="@android:id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@android:id/icon"
+        android:layout_toRightOf="@android:id/icon"
         android:textSize="@dimen/md_content_textsize"
         tools:text="Title" />
 
-</LinearLayout>
+</RelativeLayout>