Code refactoring

marcoscgdev · Sep 23, 2020 · d921def · d921def
1 parent 8cbde9c
commit d921def
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet.kt b/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet.kt
@@ -473,7 +473,7 @@ class DialogSheet(private val context: Context, private var useNewStyle: Boolean
             posButtonTextColor = getTextColor(accentColor)
         } else bottomSheetDialog = ExpandedBottomSheetDialog(context, R.style.DialogSheetTheme)
 
-        bottomSheetDialog?.setContentView(if (useNewStyle) R.layout.layout_bottom_sheet_v2 else R.layout.layout_bottom_sheet)
+        bottomSheetDialog?.setContentView(if (useNewStyle) R.layout.layout_dialog_sheet_v2 else R.layout.layout_dialog_sheet)
 
         if (bottomSheetDialog?.window != null)
             bottomSheetDialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)

diff --git a/...n/res/layout-land/layout_bottom_sheet.xml → ...n/res/layout-land/layout_dialog_sheet.xml b/...n/res/layout-land/layout_bottom_sheet.xml → ...n/res/layout-land/layout_dialog_sheet.xml
@@ -4,6 +4,6 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal">
 
-    <include layout="@layout/layout_bottom_sheet_content"/>
+    <include layout="@layout/layout_dialog_sheet_content"/>
 
 </FrameLayout>
diff --git a/...es/layout-land/layout_bottom_sheet_v2.xml → ...es/layout-land/layout_dialog_sheet_v2.xml b/...es/layout-land/layout_bottom_sheet_v2.xml → ...es/layout-land/layout_dialog_sheet_v2.xml
@@ -4,6 +4,6 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal">
 
-    <include layout="@layout/layout_bottom_sheet_content_v2"/>
+    <include layout="@layout/layout_dialog_sheet_content_v2"/>
 
 </FrameLayout>
diff --git a/...c/main/res/layout/layout_bottom_sheet.xml → ...c/main/res/layout/layout_dialog_sheet.xml b/...c/main/res/layout/layout_bottom_sheet.xml → ...c/main/res/layout/layout_dialog_sheet.xml
@@ -3,6 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <include layout="@layout/layout_bottom_sheet_content"/>
+    <include layout="@layout/layout_dialog_sheet_content"/>
 
 </FrameLayout>
diff --git a/...es/layout/layout_bottom_sheet_content.xml → ...es/layout/layout_dialog_sheet_content.xml b/...es/layout/layout_bottom_sheet_content.xml → ...es/layout/layout_dialog_sheet_content.xml
diff --git a/...layout/layout_bottom_sheet_content_v2.xml → ...layout/layout_dialog_sheet_content_v2.xml b/...layout/layout_bottom_sheet_content_v2.xml → ...layout/layout_dialog_sheet_content_v2.xml
diff --git a/...ain/res/layout/layout_bottom_sheet_v2.xml → ...ain/res/layout/layout_dialog_sheet_v2.xml b/...ain/res/layout/layout_bottom_sheet_v2.xml → ...ain/res/layout/layout_dialog_sheet_v2.xml
@@ -3,6 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <include layout="@layout/layout_bottom_sheet_content_v2"/>
+    <include layout="@layout/layout_dialog_sheet_content_v2"/>
 
 </FrameLayout>