Merge pull request #3 from DogusTeknoloji/feature/months_as_number_wi…

…th_header Feature/months as number with header
DogusTeknoloji · Jan 10, 2022 · e141398 · e141398
2 parents eec4045 + 7f37f21
commit e141398
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/app/src/main/java/com/dt/calendarwork/MainActivity.kt b/app/src/main/java/com/dt/calendarwork/MainActivity.kt
@@ -52,7 +52,7 @@ fun MainScreen() {
                 maxDate = calendarMax.time,
                 locale = Locale("en"),
                 title = "Select Date",
-                monthViewType = null,
+                monthViewType = MonthViewType.ONLY_NUMBER_ONE_COLUMN,
                 listener = object : SelectDateListener {
                     override fun onDateSelected(date: Date) {
                         Log.i("DENEME", date.toString())

diff --git a/library/src/main/java/com/dt/composedatepicker/CalendarHeader.kt b/library/src/main/java/com/dt/composedatepicker/CalendarHeader.kt
@@ -16,15 +16,18 @@ import androidx.compose.ui.unit.sp
 
 @Composable
 fun CalendarHeader(
-    selectedMonth: String,
+    selectedMonth: MonthData,
     selectedYear: Int,
     showMonths: Boolean,
     setShowMonths: (Boolean) -> Unit,
     title: String,
     showOnlyMonth: Boolean,
     showOnlyYear: Boolean,
-    themeColor:Color
+    themeColor:Color,
+    monthViewType: MonthViewType?
 ) {
+    val monthAsNumber = String.format("%02d",selectedMonth.index.plus(1))
+    val monthText = if (monthViewType==MonthViewType.ONLY_MONTH) selectedMonth.name.uppercase() else monthAsNumber
     Column(modifier = Modifier
         .fillMaxWidth()
         .background(themeColor),
@@ -35,7 +38,8 @@ fun CalendarHeader(
             color = Color.White)
         Row() {
             if (!showOnlyYear) {
-                Text(text = selectedMonth.uppercase(),
+                Text(
+                    text = monthText,
                     fontSize = 35.sp,
                     modifier = Modifier
                         .padding(bottom = 20.dp,
@@ -44,6 +48,9 @@ fun CalendarHeader(
                         .clickable { setShowMonths(true) },
                     color = if (showMonths) Color.White else Color.LightGray)
             }
+            if (!showOnlyMonth && !showOnlyYear){
+                Text(text = "/",fontSize = 35.sp,color = Color.White)
+            }
             if (!showOnlyMonth) {
                 Text(text = selectedYear.toString(),
                     fontSize = 35.sp,

diff --git a/library/src/main/java/com/dt/composedatepicker/ComposeCalendar.kt b/library/src/main/java/com/dt/composedatepicker/ComposeCalendar.kt
@@ -106,14 +106,17 @@ fun ComposeCalendar(
         Card(modifier = Modifier
             .fillMaxWidth(0.9f)) {
             Column(modifier = Modifier.fillMaxWidth()) {
-                CalendarHeader(selectedMonth = selectedMonth.name,
+                CalendarHeader(
+                    selectedMonth = selectedMonth,
                     selectedYear = selectedYear,
                     showMonths = showMonths,
                     setShowMonths = setShowMonths,
                     title = title,
                     showOnlyMonth = showOnlyMonth,
                     showOnlyYear = showOnlyYear,
-                    themeColor=themeColor)
+                    themeColor=themeColor,
+                    monthViewType  = monthViewType
+                )
                 Crossfade(targetState = showMonths) {
                     when (it) {
                         true -> {