Merge pull request #8 from DogusTeknoloji/feature/button_text_size

Adding button text size parameter
DogusTeknoloji · Mar 3, 2022 · cc4782a · cc4782a
2 parents d5f58fd + 4d18f7c
commit cc4782a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/com/dt/calendarwork/MainActivity.kt b/app/src/main/java/com/dt/calendarwork/MainActivity.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.sp
 import com.dt.calendarwork.ui.theme.CalendarWorkTheme
 import com.dt.composedatepicker.ComposeCalendar
 import com.dt.composedatepicker.MonthViewType
@@ -71,6 +72,7 @@ fun MainScreen() {
                     initialDate = initialCalendar.time,
                     locale = Locale("en"),
                     title = "Select Date",
+                    buttonTextSize = 15.sp,
                     monthViewType = MonthViewType.ONLY_NUMBER_ONE_COLUMN,
                     listener = object : SelectDateListener {
                         override fun onDateSelected(date: Date) {

diff --git a/library/src/main/java/com/dt/composedatepicker/CalendarBottom.kt b/library/src/main/java/com/dt/composedatepicker/CalendarBottom.kt
@@ -10,6 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 
 @Composable
@@ -18,7 +19,8 @@ fun CalendarBottom(
     onCancelClick: () -> Unit,
     themeColor: Color,
     negativeButtonTitle: String,
-    positiveButtonTitle: String
+    positiveButtonTitle: String,
+    buttonTextSize: TextUnit
 ) {
     Row(
         modifier = Modifier
@@ -29,11 +31,13 @@ fun CalendarBottom(
     ) {
         Text(text = negativeButtonTitle,
             color = themeColor,
+            fontSize = buttonTextSize,
             modifier = Modifier
                 .padding(end = 20.dp)
                 .clickable { onCancelClick() })
         Text(text = positiveButtonTitle,
             color = themeColor,
+            fontSize = buttonTextSize,
             modifier = Modifier.clickable { onPositiveClick() })
     }
 }
diff --git a/library/src/main/java/com/dt/composedatepicker/ComposeCalendar.kt b/library/src/main/java/com/dt/composedatepicker/ComposeCalendar.kt
@@ -12,8 +12,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.TextUnit
 import java.text.DateFormatSymbols
-import java.time.Year
 import java.util.*
 
 @Composable
@@ -29,6 +29,7 @@ fun ComposeCalendar(
     themeColor: Color = Color(0xFF614FF0),
     negativeButtonTitle: String = "CANCEL",
     positiveButtonTitle: String = "OK",
+    buttonTextSize: TextUnit = TextUnit.Unspecified,
     monthViewType: MonthViewType? = MonthViewType.ONLY_MONTH
 ) {
     if (showOnlyMonth && showOnlyYear) {
@@ -175,6 +176,7 @@ fun ComposeCalendar(
                     onPositiveClick = { listener.onDateSelected(selectedDate) },
                     onCancelClick = { listener.onCanceled() },
                     themeColor = themeColor,
+                    buttonTextSize = buttonTextSize,
                     negativeButtonTitle = negativeButtonTitle,
                     positiveButtonTitle = positiveButtonTitle
                 )