From a6375c5f79979ffb07f40f337c49cb2fa0fdac7f Mon Sep 17 00:00:00 2001 From: Vishnu Tejas Date: Tue, 20 Aug 2024 13:54:29 +0530 Subject: [PATCH] Fixed the time slot bug --- .idea/other.xml | 252 ------------------ .../baselineProfiles/0/phone-release.dm | Bin 5114 -> 5112 bytes .../baselineProfiles/1/phone-release.dm | Bin 5062 -> 5061 bytes phone/src/main/AndroidManifest.xml | 6 +- .../java/com/vte/timetable/CreateScreen.kt | 14 +- .../baselineProfiles/0/wear-release.dm | Bin 5631 -> 5787 bytes .../baselineProfiles/1/wear-release.dm | Bin 5594 -> 5739 bytes .../timetable/presentation/MainActivity.kt | 13 +- .../com/vte/timetable/tile/MainTileService.kt | 61 +++-- 9 files changed, 70 insertions(+), 276 deletions(-) delete mode 100644 .idea/other.xml diff --git a/.idea/other.xml b/.idea/other.xml deleted file mode 100644 index 4604c44..0000000 --- a/.idea/other.xml +++ /dev/null @@ -1,252 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/phone/release/baselineProfiles/0/phone-release.dm b/phone/release/baselineProfiles/0/phone-release.dm index 1a82bbd0bade4ac1b41b42227f6b8525f4ee4700..373a3601174329b2183beaf41e0f45709597350d 100644 GIT binary patch literal 5112 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 diff --git a/phone/release/baselineProfiles/1/phone-release.dm b/phone/release/baselineProfiles/1/phone-release.dm index 8affd3bee8213df9a37a331ae7f4610ccbc56fc2..0e4d1bddf6596f3d03884e63156b400505022112 100644 GIT binary patch literal 5061 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 literal 5062 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 diff --git a/phone/src/main/AndroidManifest.xml b/phone/src/main/AndroidManifest.xml index 380b76d..150e010 100644 --- a/phone/src/main/AndroidManifest.xml +++ b/phone/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - + - + diff --git a/phone/src/main/java/com/vte/timetable/CreateScreen.kt b/phone/src/main/java/com/vte/timetable/CreateScreen.kt index 9fa1d5f..b0adc69 100644 --- a/phone/src/main/java/com/vte/timetable/CreateScreen.kt +++ b/phone/src/main/java/com/vte/timetable/CreateScreen.kt @@ -241,11 +241,19 @@ fun AddItemList() { showDialExample = false }, onConfirm = { time -> - selectedTime = time + var rawTimeStart = time.split(":")[0] + var rawTimeEnd = time.split(":")[1] val index = items.size - 1 if (index >= 0 && index < buttonTexts.size) { buttonTexts[index] = time } + if (rawTimeStart.length == 1) { + rawTimeStart = "0$rawTimeStart" + } + if (rawTimeEnd.length == 1) { + rawTimeEnd = "0$rawTimeEnd" + } + timeRangeList.add("$rawTimeStart:$rawTimeEnd") showDialExample = false } ) @@ -290,7 +298,7 @@ fun RangePicker( } Button(onClick = { val selectedTime = "${timePickerState.hour}:${timePickerState.minute}" - timeRangeList.add(selectedTime) + // timeRangeList.add(selectedTime) Log.d("smth", "Above list add") Log.d("TimeRangeList", timeRangeList.toList().toString()) onConfirm(selectedTime) @@ -369,5 +377,7 @@ fun saveAsJson(context: Context) { val jsonData = readConfigFromFile(context = context, "time-table.json") Log.d("tableJSON", jsonData.toString()) sendMessageToWear(context) + finalDayList = mutableStateListOf() + timeRangeList = mutableStateListOf() Log.d("CreateScreenToWear", "Data sent to wear") } \ No newline at end of file diff --git a/wear/release/baselineProfiles/0/wear-release.dm b/wear/release/baselineProfiles/0/wear-release.dm index ee4e36464ae10b198f8ce5ba797f2e64c18d5dd2..44d67fd510d50bbad5494b60302b2239185f6afa 100644 GIT binary patch literal 5787 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 Q&-JChE9CDEX8-5(AM*DBp8x;= diff --git a/wear/src/main/java/com/vte/timetable/presentation/MainActivity.kt b/wear/src/main/java/com/vte/timetable/presentation/MainActivity.kt index a4f8afe..09cccec 100644 --- a/wear/src/main/java/com/vte/timetable/presentation/MainActivity.kt +++ b/wear/src/main/java/com/vte/timetable/presentation/MainActivity.kt @@ -64,6 +64,7 @@ import java.io.File import java.io.FileInputStream import java.io.FileOutputStream import java.io.IOException +import java.time.LocalTime class MainActivity : AppCompatActivity(), DataClient.OnDataChangedListener { @@ -118,13 +119,17 @@ class MainActivity : AppCompatActivity(), DataClient.OnDataChangedListener { @Composable fun TextForTableDay(dayText: String){ - Text(text = dayText, fontSize = 20.sp) + Text(text = dayText, fontSize = 22.sp) } @Composable fun TextForTablePeriod(tableText: String, subText: String){ - Text(text = tableText, fontSize = 20.sp) - Text(text = subText, fontSize = 16.sp) + Log.d(TAG, "Table Text: $tableText, Sub Text: $subText") + val subTextStart = LocalTime.parse(subText.split("-")[0].replace(" ","")).format(java.time.format.DateTimeFormatter.ofPattern("hh:mm a")) + + val subTextEnd = LocalTime.parse(subText.split("-")[1].replace(" ","")).format(java.time.format.DateTimeFormatter.ofPattern("hh:mm a")) + Text(text = tableText, fontSize = 22.sp) + Text(text = "$subTextStart - $subTextEnd", fontSize = 14.sp, color = Color(0xFFA0A0A0)) } @Composable @@ -180,6 +185,7 @@ class MainActivity : AppCompatActivity(), DataClient.OnDataChangedListener { nodeClient.connectedNodes.addOnSuccessListener { node -> if (node.isNotEmpty()) { + Log.d(TAG, "Sending message to node: ${node}") val nodeId = node[node.lastIndex].id Log.d(TAG, "Sending message to node: $nodeId") val path = "/open-phone-app" @@ -241,6 +247,7 @@ class MainActivity : AppCompatActivity(), DataClient.OnDataChangedListener { .border(1.dp, Color.DarkGray, shape = RoundedCornerShape(20.dp)), backgroundPainter = CardDefaults.cardBackgroundPainter(startBackgroundColor = Color.Black, endBackgroundColor = Color.Black) ){ + Log.d(TAG, "Period: ${listOfHours.toString()}") TextForTablePeriod(periodList.get(it).toString(),"${listOfHours.get(it)} - ${listOfHours.get(it+1)}") } } diff --git a/wear/src/main/java/com/vte/timetable/tile/MainTileService.kt b/wear/src/main/java/com/vte/timetable/tile/MainTileService.kt index a39b2a6..6ab1889 100644 --- a/wear/src/main/java/com/vte/timetable/tile/MainTileService.kt +++ b/wear/src/main/java/com/vte/timetable/tile/MainTileService.kt @@ -21,7 +21,9 @@ import androidx.wear.protolayout.material.Button import androidx.wear.protolayout.material.ButtonColors import androidx.wear.protolayout.material.ButtonDefaults import androidx.wear.protolayout.material.Chip +import androidx.wear.protolayout.material.ChipColors import androidx.wear.protolayout.material.ChipDefaults +import androidx.wear.protolayout.material.Colors import androidx.wear.protolayout.material.CompactChip import androidx.wear.protolayout.material.Text import androidx.wear.protolayout.material.layouts.MultiButtonLayout @@ -87,13 +89,13 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { LayoutElementBuilders.Box.Builder() .setHorizontalAlignment(LayoutElementBuilders.HORIZONTAL_ALIGN_LEFT) .setWidth(DimensionBuilders.dp(170f)) - .setHeight(DimensionBuilders.dp(50f)) + .setHeight(DimensionBuilders.dp(55f)) .setModifiers( Modifiers.Builder() .setBorder( ModifiersBuilders.Border.Builder() .setWidth(DimensionBuilders.dp(0f)) - .setColor(ColorBuilders.argb(0xffffffff.toInt())) + .setColor(ColorBuilders.argb(0xff383838.toInt())) //0xffffffff .build() ) .setPadding( @@ -104,7 +106,7 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { ) .setBackground( ModifiersBuilders.Background.Builder() - .setColor(ColorBuilders.argb(0xff0E1013.toInt())) + .setColor(ColorBuilders.argb(0xff000000.toInt())) //0xff0E1013 .setCorner(Corner.Builder().setRadius(DimensionBuilders.dp(15f)).build()) .build() ) @@ -117,8 +119,11 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { .setText("Now") .setFontStyle( LayoutElementBuilders.FontStyle.Builder() - .setItalic(true) - .setSize(DimensionBuilders.sp(8f)) + //.setItalic(true) + .setColor( + ColorBuilders.argb(0xffc5c5c5.toInt()) + ) + .setSize(DimensionBuilders.sp(10f)) .build() ) .build() @@ -142,7 +147,6 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { .setText(getCurrentPeriod(context)) .setFontStyle( LayoutElementBuilders.FontStyle.Builder() - .setItalic(true) .setSize(DimensionBuilders.sp(25f)) .build() ) @@ -199,13 +203,13 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { LayoutElementBuilders.Box.Builder() .setHorizontalAlignment(LayoutElementBuilders.HORIZONTAL_ALIGN_LEFT) .setWidth(DimensionBuilders.dp(170f)) - .setHeight(DimensionBuilders.dp(50f)) + .setHeight(DimensionBuilders.dp(55f)) .setModifiers( Modifiers.Builder() .setBorder( ModifiersBuilders.Border.Builder() .setWidth(DimensionBuilders.dp(0f)) - .setColor(ColorBuilders.argb(0xffffffff.toInt())) + .setColor(ColorBuilders.argb(0xff383838.toInt())) // 0xffffffff .build() ) .setPadding( @@ -216,7 +220,7 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { ) .setBackground( ModifiersBuilders.Background.Builder() - .setColor(ColorBuilders.argb(0xff0E1013.toInt())) + .setColor(ColorBuilders.argb(0xff000000.toInt())) //0xff0E1013 .setCorner(Corner.Builder().setRadius(DimensionBuilders.dp(15f)).build()) .build() ) @@ -226,11 +230,14 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { LayoutElementBuilders.Column.Builder() .addContent( LayoutElementBuilders.Text.Builder() - .setText("Next") + .setText("Next") //c2c4c4 .setFontStyle( LayoutElementBuilders.FontStyle.Builder() - .setItalic(true) - .setSize(DimensionBuilders.sp(8f)) + //.setItalic(true) + .setColor( + ColorBuilders.argb(0xffc5c5c5.toInt()) + ) + .setSize(DimensionBuilders.sp(10f)) .build() ) .build() @@ -254,7 +261,6 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { .setText(getNextPeriod(context)) .setFontStyle( LayoutElementBuilders.FontStyle.Builder() - .setItalic(true) .setSize(DimensionBuilders.sp(25f)) .build() ) @@ -271,6 +277,16 @@ private fun tileLayout(context: Context): LayoutElementBuilders.LayoutElement { PrimaryLayout.Builder(emptyPar) .setPrimaryChipContent( CompactChip.Builder(context, "Refresh", emptyClickable, emptyPar) + .setChipColors( + ChipColors.secondaryChipColors( + Colors( + 0xff2f2f2f.toInt(), + 0xffffffff.toInt(), + 0xff2f2f2f.toInt(), + 0xffffffff.toInt() + ) + ) + ) .build() ) .build() @@ -333,7 +349,11 @@ fun getCurrentPeriod(context: Context): String { if (periodMap[currentDay]?.get(0)?.toString() == "Nothing!") { return "Nothing!" - } else { + } + else if (cPeriod == -1) { + return "Nothing!" + } + else { if (cPeriod >= periodMap[currentDay]?.length()!!) { return "Nothing!" } else { @@ -370,12 +390,16 @@ fun getNextPeriod(context: Context): String { val nextPeriod = when (cPeriod) { in 0..classes.length() -> cPeriod + 1 - else -> 0 + else -> -1 } if (periodMap[currentDay]?.get(0)?.toString() == "Nothing!") { return "Nothing!" - } else { + } + else if (nextPeriod == -1) { + return "Nothing!" + } + else { if (nextPeriod >= periodMap[currentDay]?.length()!!) { return "Nothing!" } else { @@ -434,10 +458,13 @@ fun getPeriodIndex(context: Context): Int { for ((range, index) in periods) { + Log.d("Current Time",LocalTime.now().toString()) + Log.d("Start Time",range.first.toString()) + Log.d("End Time",range.second.toString()) if (isCurrentTimeInRange(range.first, range.second)) { return index } } - return 0 + return -1 } \ No newline at end of file