Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

develop -> main #75

Merged
merged 5 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
 

![Static Badge](https://img.shields.io/badge/License-GPL--v3-brightgreen)
[![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)
[![CI](https://github.com/psuzn/Play-Deals/actions/workflows/CI.yaml/badge.svg)](https://github.com/psuzn/Play-Deals/actions/workflows/CI.yaml)

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

Expand Down
3 changes: 3 additions & 0 deletions androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

signingConfigs {
getByName("debug") {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sqldelight = "2.0.0"
google-services = "4.4.0"

# Libraries
compose-compiler = "1.5.7"
compose-compiler = "1.5.6"
accompanist-permissions = "0.32.0"
activity-compose = "1.8.2"
appcompat = "1.6.1"
Expand Down
2 changes: 1 addition & 1 deletion metadata/de/short_description.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Finden Sie die neuesten App-Angebote und Rabatte für kostenpflichtige Apps und Spiele.
Finden Sie die neuesten App-Angebote und Rabatte für kostenpflichtige Apps.
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ package me.sujanpoudel.playdeals.common

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.layout.union
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
Expand Down Expand Up @@ -97,12 +91,7 @@ fun PlayDealsApp() {
AppTheme(preferences) {
Box(
modifier = Modifier
.background(MaterialTheme.colorScheme.background)
.windowInsetsPadding(
WindowInsets.navigationBars
.union(WindowInsets.statusBars)
.union(WindowInsets.systemBars),
),
.background(MaterialTheme.colorScheme.background),
) {
NavHost(navGraph)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ object ScaffoldToolbar {
) {
val navigator = Navigator.current
CenterAlignedTopAppBar(
modifier = modifier.windowInsetsPadding(WindowInsets(top = 10.dp)),
modifier = modifier.windowInsetsPadding(WindowInsets(top = 20.dp)),
title = { ToolbarTitle(title) },
navigationIcon =
{
Expand Down