diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 0f78b7f..b9865d5 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/marcoscg/dialogsheetsample/MainActivity.kt b/app/src/main/java/com/marcoscg/dialogsheetsample/MainActivity.kt index 2676b5a..d985574 100644 --- a/app/src/main/java/com/marcoscg/dialogsheetsample/MainActivity.kt +++ b/app/src/main/java/com/marcoscg/dialogsheetsample/MainActivity.kt @@ -26,7 +26,7 @@ class MainActivity : AppCompatActivity() { private fun createAndShowDialog() { val useNewDialogStyle = newStyleCheckBox.isChecked - val dialogSheet = DialogSheet(this@MainActivity, useNewDialogStyle) + val dialogSheet = DialogSheet(this@MainActivity, useNewDialogStyle) // you can also use DialogSheet2 if you want the new style //.setNewDialogStyle() // You can also set new style by this method, but put it on the first line .setTitle(R.string.app_name) .setMessage(R.string.lorem) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..52fa900 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 21dp + \ No newline at end of file diff --git a/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet.kt b/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet.kt index de87938..0ac625c 100644 --- a/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet.kt +++ b/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet.kt @@ -35,7 +35,7 @@ import com.marcoscg.dialogsheet.Utils.orDefault /** * Created by @MarcosCGdev on 01/12/2017. */ -class DialogSheet(private val context: Context, private var useNewStyle: Boolean = false) { +open class DialogSheet(private val context: Context, private var useNewStyle: Boolean = false) { private var bottomSheetDialog: ExpandedBottomSheetDialog? = null private var roundedCorners = true diff --git a/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet2.kt b/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet2.kt new file mode 100644 index 0000000..7ddee5a --- /dev/null +++ b/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet2.kt @@ -0,0 +1,5 @@ +package com.marcoscg.dialogsheet + +import android.content.Context + +class DialogSheet2(context: Context) : DialogSheet(context, true) \ No newline at end of file diff --git a/dialogsheet/src/main/res/drawable/dialog_sheet_main_background_margin.xml b/dialogsheet/src/main/res/drawable/dialog_sheet_main_background_margin.xml index 7727ec1..bc67751 100644 --- a/dialogsheet/src/main/res/drawable/dialog_sheet_main_background_margin.xml +++ b/dialogsheet/src/main/res/drawable/dialog_sheet_main_background_margin.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/dialogsheet/src/main/res/drawable/dialog_sheet_main_background_round_margin.xml b/dialogsheet/src/main/res/drawable/dialog_sheet_main_background_round_margin.xml index 0c61935..7484e71 100644 --- a/dialogsheet/src/main/res/drawable/dialog_sheet_main_background_round_margin.xml +++ b/dialogsheet/src/main/res/drawable/dialog_sheet_main_background_round_margin.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/dialogsheet/src/main/res/layout/layout_dialog_sheet_content_v2.xml b/dialogsheet/src/main/res/layout/layout_dialog_sheet_content_v2.xml index 0b89781..a04a276 100644 --- a/dialogsheet/src/main/res/layout/layout_dialog_sheet_content_v2.xml +++ b/dialogsheet/src/main/res/layout/layout_dialog_sheet_content_v2.xml @@ -49,7 +49,7 @@ android:textColor="#000000" android:ellipsize="end" android:gravity="center_horizontal" - style="@style/TextAppearance.AppCompat.Title" + android:textSize="22sp" tools:text="Title" android:layout_marginBottom="12dp" android:visibility="gone"/> @@ -75,7 +75,7 @@ android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:textColor="#757575" - style="@style/TextAppearance.AppCompat.Subhead" + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" tools:text="Looooooooooooooooong and loooooooong message here." android:visibility="gone"/> @@ -109,7 +109,9 @@ android:layout_marginStart="8dp" android:layout_marginRight="24dp" android:layout_marginEnd="24dp" + android:textAllCaps="false" android:letterSpacing="0" + android:textSize="@dimen/dialog_sheet_button_text_size" android:textAppearance="@style/TextAppearance.MaterialComponents.Button" style="@style/Widget.MaterialComponents.Button.TextButton"/> @@ -127,7 +129,9 @@ android:layout_marginStart="24dp" android:layout_marginRight="8dp" android:layout_marginEnd="8dp" + android:textAllCaps="false" android:letterSpacing="0" + android:textSize="@dimen/dialog_sheet_button_text_size" android:textAppearance="@style/TextAppearance.MaterialComponents.Button" style="@style/Widget.MaterialComponents.Button.TextButton"/> @@ -143,7 +147,9 @@ android:layout_marginBottom="20dp" android:layout_marginRight="16dp" android:layout_marginEnd="16dp" + android:textAllCaps="false" android:letterSpacing="0" + android:textSize="@dimen/dialog_sheet_button_text_size" android:textAppearance="@style/TextAppearance.MaterialComponents.Button" style="@style/Widget.MaterialComponents.Button"/> diff --git a/dialogsheet/src/main/res/values/dimens.xml b/dialogsheet/src/main/res/values/dimens.xml index e092554..24321a7 100644 --- a/dialogsheet/src/main/res/values/dimens.xml +++ b/dialogsheet/src/main/res/values/dimens.xml @@ -2,5 +2,7 @@ 16dp 56dp - 64dp + 60dp + 16dp + 15sp \ No newline at end of file diff --git a/dialogsheet/src/main/res/values/public.xml b/dialogsheet/src/main/res/values/public.xml new file mode 100644 index 0000000..7ff35b4 --- /dev/null +++ b/dialogsheet/src/main/res/values/public.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/screenshots/sc_4.png b/screenshots/sc_4.png index f1ddc76..5e93ff4 100644 Binary files a/screenshots/sc_4.png and b/screenshots/sc_4.png differ