Skip to content

Commit f3acec5

Browse files
authored
Merge pull request #1545 from joreilly/update_dependencies
UI updates
2 parents 3a881af + 7619f07 commit f3acec5

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

fastlane/Fastfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ default_platform :android
44

55
platform :android do
66

7-
androidVersionNum = 253
8-
wearVersionNum = 328
7+
androidVersionNum = 254
8+
wearVersionNum = 329
99

1010
before_all do
1111
end

iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,10 +487,11 @@
487487
buildSettings = {
488488
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
489489
CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements;
490-
CODE_SIGN_STYLE = Manual;
490+
CODE_SIGN_IDENTITY = "Apple Development";
491+
CODE_SIGN_STYLE = Automatic;
491492
CURRENT_PROJECT_VERSION = 1.0.2;
492493
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
493-
DEVELOPMENT_TEAM = "";
494+
DEVELOPMENT_TEAM = NT77748GS8;
494495
ENABLE_PREVIEWS = YES;
495496
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
496497
INFOPLIST_FILE = iosApp/Info.plist;

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/sessions/SessionItemView.kt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,14 @@ fun SessionItemView(
4343
) {
4444

4545
var modifier = Modifier.fillMaxSize()
46-
val tonalElevation = if (!session.isService() && !session.isBreak()) {
47-
0.dp
48-
} else {
49-
2.dp
50-
}
51-
if (!session.isBreak()) {
46+
if (!session.isService() && !session.isBreak()) {
5247
modifier = modifier.clickable(onClick = {
5348
sessionSelected(session.id)
5449
})
5550
}
5651

5752

58-
Surface(
59-
tonalElevation = tonalElevation
60-
) {
53+
Surface {
6154
Row(modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
6255
Column(modifier = Modifier.weight(1f)) {
6356
Row(verticalAlignment = Alignment.CenterVertically) {
@@ -108,7 +101,7 @@ fun SessionItemView(
108101

109102
var showDialog by remember { mutableStateOf(false) }
110103

111-
if (!session.isBreak()) {
104+
if (!session.isBreak() && !session.isService()) {
112105
Bookmark(
113106
isBookmarked = isBookmarked,
114107
onBookmarkChange = { shouldAdd ->

0 commit comments

Comments
 (0)