v.0.13.0

- fixes issue where dates weren't readable #65 by @pabloscloud
pablo03v · Jan 1, 2024 · e3d0a3a · e3d0a3a
1 parent e424788
commit e3d0a3a
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 # built application files
 *.apk
 *.ap_
+*.aab
 
 # files for the dex VM
 *.dex

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "cloud.pablos.overload"
         minSdk = 26
         targetSdk = 34
-        versionCode = 124
-        versionName = "0.12.4"
+        versionCode = 130
+        versionName = "0.13.0"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -36,19 +36,21 @@ android {
     }
 
     buildTypes {
-        getByName("debug") {
+        named("debug") {
             signingConfig = signingConfigs.getByName("debug")
             applicationIdSuffix = ".debug"
             versionNameSuffix = ".debug"
+            resValue("string", "app_name", "Overload Debug")
         }
 
-        getByName("release") {
+        named("release") {
             isMinifyEnabled = true
             signingConfig = signingConfigs.getByName("debug")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
+            resValue("string", "app_name", "Overload")
         }
     }
 

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 124,
-      "versionName": "0.12.4",
+      "versionCode": 130,
+      "versionName": "0.13.0",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/cloud/pablos/overload/ui/tabs/calendar/CalendarTab.kt b/app/src/main/java/cloud/pablos/overload/ui/tabs/calendar/CalendarTab.kt
@@ -11,9 +11,9 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.BottomSheetScaffold
@@ -236,9 +236,8 @@ fun WeekDaysHeader() {
 fun DayOfWeekHeaderCell(text: String) {
     Box(
         modifier = Modifier
-            .padding(4.dp)
-            .width(36.dp)
-            .height(36.dp),
+            .padding()
+            .requiredSize(36.dp),
         contentAlignment = Alignment.Center,
     ) {
         TextView(
@@ -253,8 +252,8 @@ fun DateHeader(date: LocalDate) {
     val text = getFormattedDate(date, true)
     Box(
         modifier = Modifier
-            .padding(4.dp)
-            .height(36.dp)
+            .padding()
+            .requiredHeight(36.dp)
             .fillMaxWidth(),
     ) {
         TextView(

diff --git a/app/src/main/java/cloud/pablos/overload/ui/views/YearView.kt b/app/src/main/java/cloud/pablos/overload/ui/views/YearView.kt
@@ -12,9 +12,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.ripple.rememberRipple
@@ -95,7 +94,12 @@ fun WeekRow(firstDayOfMonth: LocalDate, weekOfMonth: Int, state: ItemState, onEv
     startOfWeek = if (weekOfMonth == 0) startOfWeek else startOfWeek.minusDays((emptyCells).toLong())
     val endDayOfWeek = if (weekOfMonth == 0) startOfWeek.plusDays((7 - emptyCells).toLong()) else startOfWeek.plusDays((7).toLong())
 
-    Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 4.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
         if (weekOfMonth == 0) {
             repeat(emptyCells) {
                 EmptyDayCell()
@@ -141,9 +145,8 @@ fun DayCell(
 ) {
     Box(
         modifier = Modifier
-            .padding(4.dp)
-            .width(36.dp)
-            .height(36.dp)
+            .padding()
+            .requiredSize(36.dp)
             .background(backgroundColor, shape = CircleShape)
             .combinedClickable(
                 enabled = clickable,
@@ -171,9 +174,8 @@ fun DayCell(
 fun EmptyDayCell() {
     Box(
         modifier = Modifier
-            .padding(4.dp)
-            .width(36.dp)
-            .height(36.dp)
+            .padding()
+            .requiredSize(36.dp)
             .background(Color.Transparent, shape = CircleShape)
             .clip(CircleShape)
             .border(2.dp, Color.Transparent, CircleShape),

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
   or implied. See the License for the specific language governing permissions and limitations under
   the License.
   --><resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name" translatable="false">Overload</string>
     <string name="navigation_drawer">Navigation Drawer</string>
     <!-- cloud.pablos.overload.ui.tabs.home.HomeTab -->
     <string name="home">Home</string>

diff --git a/fastlane/metadata/android/en-US/changelogs/130.txt b/fastlane/metadata/android/en-US/changelogs/130.txt
@@ -0,0 +1 @@
+- fixes issue where dates weren't readable
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 [versions]
 accompanist = "0.32.0"
 androidGradlePlugin = "8.2.0"
-androidx-activity-compose = "1.8.1"
+androidx-activity-compose = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.2.0"
 androidx-benchmark-junit4 = "1.2.0"
@@ -14,7 +14,7 @@ androidx-constraintlayout = "1.0.1"
 androidx-corektx = "1.12.0"
 androidx-lifecycle-compose = "2.6.2"
 androidx-lifecycle-runtime-compose = "2.6.2"
-androidx-navigation = "2.7.5"
+androidx-navigation = "2.7.6"
 androidx-palette = "1.0.0"
 androidx-test = "1.5.0"
 androidx-test-espresso = "3.5.1"
@@ -43,9 +43,9 @@ kotlin = "1.9.21"
 kotlinx_immutable = "0.3.5"
 ksp = "1.9.10-1.0.13"
 maps-compose = "2.5.3"
-material = "1.10.0"
+material = "1.11.0"
 # @keep
-material3 = "1.2.0-alpha12"
+material3 = "1.2.0-beta01"
 minSdk = "21"
 okhttp = "4.11.0"
 robolectric = "4.10.3"
@@ -70,7 +70,7 @@ androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-mani
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
-androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0-rc01"
+androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0-rc02"
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" }
 androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" }
 androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     # built application files
     *.apk
     *.ap_
+    *.aab
     # files for the dex VM
     *.dex
@@ Expand Down @@