Skip to content

Commit e3d0a3a

Browse files
author
pabloscloud
committed
v.0.13.0
- fixes issue where dates weren't readable #65 by @pabloscloud
1 parent e424788 commit e3d0a3a

File tree

8 files changed

+32
-28
lines changed

8 files changed

+32
-28
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# built application files
77
*.apk
88
*.ap_
9+
*.aab
910

1011
# files for the dex VM
1112
*.dex

app/build.gradle.kts

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
applicationId = "cloud.pablos.overload"
1313
minSdk = 26
1414
targetSdk = 34
15-
versionCode = 124
16-
versionName = "0.12.4"
15+
versionCode = 130
16+
versionName = "0.13.0"
1717
vectorDrawables.useSupportLibrary = true
1818
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1919

@@ -36,19 +36,21 @@ android {
3636
}
3737

3838
buildTypes {
39-
getByName("debug") {
39+
named("debug") {
4040
signingConfig = signingConfigs.getByName("debug")
4141
applicationIdSuffix = ".debug"
4242
versionNameSuffix = ".debug"
43+
resValue("string", "app_name", "Overload Debug")
4344
}
4445

45-
getByName("release") {
46+
named("release") {
4647
isMinifyEnabled = true
4748
signingConfig = signingConfigs.getByName("debug")
4849
proguardFiles(
4950
getDefaultProguardFile("proguard-android-optimize.txt"),
5051
"proguard-rules.pro",
5152
)
53+
resValue("string", "app_name", "Overload")
5254
}
5355
}
5456

app/release/output-metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 124,
15-
"versionName": "0.12.4",
14+
"versionCode": 130,
15+
"versionName": "0.13.0",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

app/src/main/java/cloud/pablos/overload/ui/tabs/calendar/CalendarTab.kt

+6-7
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import androidx.compose.foundation.layout.Column
1111
import androidx.compose.foundation.layout.Row
1212
import androidx.compose.foundation.layout.fillMaxSize
1313
import androidx.compose.foundation.layout.fillMaxWidth
14-
import androidx.compose.foundation.layout.height
1514
import androidx.compose.foundation.layout.padding
16-
import androidx.compose.foundation.layout.width
15+
import androidx.compose.foundation.layout.requiredHeight
16+
import androidx.compose.foundation.layout.requiredSize
1717
import androidx.compose.foundation.pager.HorizontalPager
1818
import androidx.compose.foundation.pager.rememberPagerState
1919
import androidx.compose.material3.BottomSheetScaffold
@@ -236,9 +236,8 @@ fun WeekDaysHeader() {
236236
fun DayOfWeekHeaderCell(text: String) {
237237
Box(
238238
modifier = Modifier
239-
.padding(4.dp)
240-
.width(36.dp)
241-
.height(36.dp),
239+
.padding()
240+
.requiredSize(36.dp),
242241
contentAlignment = Alignment.Center,
243242
) {
244243
TextView(
@@ -253,8 +252,8 @@ fun DateHeader(date: LocalDate) {
253252
val text = getFormattedDate(date, true)
254253
Box(
255254
modifier = Modifier
256-
.padding(4.dp)
257-
.height(36.dp)
255+
.padding()
256+
.requiredHeight(36.dp)
258257
.fillMaxWidth(),
259258
) {
260259
TextView(

app/src/main/java/cloud/pablos/overload/ui/views/YearView.kt

+11-9
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import androidx.compose.foundation.layout.Box
1212
import androidx.compose.foundation.layout.Row
1313
import androidx.compose.foundation.layout.fillMaxSize
1414
import androidx.compose.foundation.layout.fillMaxWidth
15-
import androidx.compose.foundation.layout.height
1615
import androidx.compose.foundation.layout.padding
17-
import androidx.compose.foundation.layout.width
16+
import androidx.compose.foundation.layout.requiredSize
1817
import androidx.compose.foundation.lazy.LazyColumn
1918
import androidx.compose.foundation.shape.CircleShape
2019
import androidx.compose.material.ripple.rememberRipple
@@ -95,7 +94,12 @@ fun WeekRow(firstDayOfMonth: LocalDate, weekOfMonth: Int, state: ItemState, onEv
9594
startOfWeek = if (weekOfMonth == 0) startOfWeek else startOfWeek.minusDays((emptyCells).toLong())
9695
val endDayOfWeek = if (weekOfMonth == 0) startOfWeek.plusDays((7 - emptyCells).toLong()) else startOfWeek.plusDays((7).toLong())
9796

98-
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
97+
Row(
98+
modifier = Modifier
99+
.fillMaxWidth()
100+
.padding(vertical = 4.dp),
101+
horizontalArrangement = Arrangement.SpaceBetween,
102+
) {
99103
if (weekOfMonth == 0) {
100104
repeat(emptyCells) {
101105
EmptyDayCell()
@@ -141,9 +145,8 @@ fun DayCell(
141145
) {
142146
Box(
143147
modifier = Modifier
144-
.padding(4.dp)
145-
.width(36.dp)
146-
.height(36.dp)
148+
.padding()
149+
.requiredSize(36.dp)
147150
.background(backgroundColor, shape = CircleShape)
148151
.combinedClickable(
149152
enabled = clickable,
@@ -171,9 +174,8 @@ fun DayCell(
171174
fun EmptyDayCell() {
172175
Box(
173176
modifier = Modifier
174-
.padding(4.dp)
175-
.width(36.dp)
176-
.height(36.dp)
177+
.padding()
178+
.requiredSize(36.dp)
177179
.background(Color.Transparent, shape = CircleShape)
178180
.clip(CircleShape)
179181
.border(2.dp, Color.Transparent, CircleShape),

app/src/main/res/values/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
or implied. See the License for the specific language governing permissions and limitations under
1010
the License.
1111
--><resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
12-
<string name="app_name" translatable="false">Overload</string>
1312
<string name="navigation_drawer">Navigation Drawer</string>
1413
<!-- cloud.pablos.overload.ui.tabs.home.HomeTab -->
1514
<string name="home">Home</string>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- fixes issue where dates weren't readable

gradle/libs.versions.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[versions]
66
accompanist = "0.32.0"
77
androidGradlePlugin = "8.2.0"
8-
androidx-activity-compose = "1.8.1"
8+
androidx-activity-compose = "1.8.2"
99
androidx-appcompat = "1.6.1"
1010
androidx-benchmark = "1.2.0"
1111
androidx-benchmark-junit4 = "1.2.0"
@@ -14,7 +14,7 @@ androidx-constraintlayout = "1.0.1"
1414
androidx-corektx = "1.12.0"
1515
androidx-lifecycle-compose = "2.6.2"
1616
androidx-lifecycle-runtime-compose = "2.6.2"
17-
androidx-navigation = "2.7.5"
17+
androidx-navigation = "2.7.6"
1818
androidx-palette = "1.0.0"
1919
androidx-test = "1.5.0"
2020
androidx-test-espresso = "3.5.1"
@@ -43,9 +43,9 @@ kotlin = "1.9.21"
4343
kotlinx_immutable = "0.3.5"
4444
ksp = "1.9.10-1.0.13"
4545
maps-compose = "2.5.3"
46-
material = "1.10.0"
46+
material = "1.11.0"
4747
# @keep
48-
material3 = "1.2.0-alpha12"
48+
material3 = "1.2.0-beta01"
4949
minSdk = "21"
5050
okhttp = "4.11.0"
5151
robolectric = "4.10.3"
@@ -70,7 +70,7 @@ androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-mani
7070
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
7171
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
7272
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
73-
androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0-rc01"
73+
androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0-rc02"
7474
androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" }
7575
androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" }
7676
androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }

0 commit comments

Comments
 (0)