Browse Source

Merge branch 'kongzue:master' into master

Alireza Ivaz 1 year ago
parent
commit
416e29511d

+ 5 - 1
DialogX/src/main/java/com/kongzue/dialogx/util/views/FitSystemBarUtils.java

@@ -313,6 +313,7 @@ public class FitSystemBarUtils {
             }
             addListenerWhenImeHeightChanged();
         } else {
+            specialMode = false;
             if (callBack.isEnable(Orientation.Top)) {
                 initialPadding.top += Math.max(systemWindowInsetTop, cutoutPaddingTop);
             }
@@ -359,7 +360,10 @@ public class FitSystemBarUtils {
 
         initialPadding.applyToView(contentView);
         //四边 非安全区 传递回去
-        log("    KONGZUE DEBUG DIALOGX FitSystemBarUtils callBack: left=" + initialPadding.start + " top=" + initialPadding.top + " right=" + initialPadding.end + " bottom=" + initialPadding.bottom);
+        log("    KONGZUE DEBUG DIALOGX FitSystemBarUtils callBack: left=" + initialPadding.start + " top=" + initialPadding.top +
+                " right=" + initialPadding.end + " bottom=" + initialPadding.bottom + " specialMode=" + specialMode +
+                " specialModeImeHeight=" + specialModeImeHeight
+        );
         callBack.unsafeRect(
                 initialPadding.start,
                 initialPadding.top,

+ 1 - 1
app/src/main/java/com/kongzue/dialogxdemo/activity/MainActivity.java

@@ -1288,7 +1288,7 @@ public class MainActivity extends BaseActivity {
                                 dataArrayList.add(new CustomRecycleViewAdapter.Data("Item Text 12"));
                                 dataArrayList.add(new CustomRecycleViewAdapter.Data("Item Text 13"));
                                 dataArrayList.add(new CustomRecycleViewAdapter.Data("Item Text 14"));
-                                RecyclerView recyclerView = (RecyclerView) ((ViewGroup) v).getChildAt(0);
+                                RecyclerView recyclerView = (RecyclerView) v;
                                 LinearLayoutManager layoutManager = new LinearLayoutManager(me);
                                 recyclerView.setLayoutManager(layoutManager);
                                 CustomRecycleViewAdapter adapter = new CustomRecycleViewAdapter(dataArrayList);

+ 1 - 1
gradle.properties

@@ -19,7 +19,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.50.alpha2
+BUILD_VERSION=0.0.50.beta2
 BUILD_VERSION_INT=49
 DIALOGX_STYLE_VERSION=5
 android.nonTransitiveRClass=true