Skip to content

Commit 011db86

Browse files
authored
Merge pull request #75 from psuzn/develop
develop -> main
2 parents 7f54b5f + cca664a commit 011db86

File tree

6 files changed

+8
-16
lines changed

6 files changed

+8
-16
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
 
1313

1414
![Static Badge](https://img.shields.io/badge/License-GPL--v3-brightgreen)
15-
[![Lint and verify](https://github.com/psuzn/App-deals/actions/workflows/lint.yaml/badge.svg?branch=develop)](https://github.com/psuzn/App-deals/actions/workflows/lint.yaml)
15+
[![CI](https://github.com/psuzn/Play-Deals/actions/workflows/CI.yaml/badge.svg)](https://github.com/psuzn/Play-Deals/actions/workflows/CI.yaml)
1616

1717
![Feature](metadata/en-US/images/featureGraphic.png)
1818

androidApp/build.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ android {
4444
targetCompatibility = JavaVersion.VERSION_17
4545
}
4646

47+
composeOptions {
48+
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
49+
}
4750

4851
signingConfigs {
4952
getByName("debug") {

gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sqldelight = "2.0.0"
1111
google-services = "4.4.0"
1212

1313
# Libraries
14-
compose-compiler = "1.5.7"
14+
compose-compiler = "1.5.6"
1515
accompanist-permissions = "0.32.0"
1616
activity-compose = "1.8.2"
1717
appcompat = "1.6.1"

metadata/de/short_description.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Finden Sie die neuesten App-Angebote und Rabatte für kostenpflichtige Apps und Spiele.
1+
Finden Sie die neuesten App-Angebote und Rabatte für kostenpflichtige Apps.

shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/PlayDealApp.kt

+1-12
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ package me.sujanpoudel.playdeals.common
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Box
5-
import androidx.compose.foundation.layout.WindowInsets
6-
import androidx.compose.foundation.layout.navigationBars
7-
import androidx.compose.foundation.layout.statusBars
8-
import androidx.compose.foundation.layout.systemBars
9-
import androidx.compose.foundation.layout.union
10-
import androidx.compose.foundation.layout.windowInsetsPadding
115
import androidx.compose.material3.MaterialTheme
126
import androidx.compose.runtime.Composable
137
import androidx.compose.runtime.CompositionLocalProvider
@@ -97,12 +91,7 @@ fun PlayDealsApp() {
9791
AppTheme(preferences) {
9892
Box(
9993
modifier = Modifier
100-
.background(MaterialTheme.colorScheme.background)
101-
.windowInsetsPadding(
102-
WindowInsets.navigationBars
103-
.union(WindowInsets.statusBars)
104-
.union(WindowInsets.systemBars),
105-
),
94+
.background(MaterialTheme.colorScheme.background),
10695
) {
10796
NavHost(navGraph)
10897
}

shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/ui/components/common/ScaffoldToolbar.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ object ScaffoldToolbar {
8282
) {
8383
val navigator = Navigator.current
8484
CenterAlignedTopAppBar(
85-
modifier = modifier.windowInsetsPadding(WindowInsets(top = 10.dp)),
85+
modifier = modifier.windowInsetsPadding(WindowInsets(top = 20.dp)),
8686
title = { ToolbarTitle(title) },
8787
navigationIcon =
8888
{

0 commit comments

Comments
 (0)