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.

Sign up for GitHub

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

[iOS] Version 4.1 / 1465 #261

Merged
merged 1 commit into from
Apr 15, 2024
+21 −8
Merged

[iOS] Version 4.1 / 1465 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions iosApp/Android Makers.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,12 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AndroidMakers/AndroidMakers.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 13;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1465;
DEVELOPMENT_ASSET_PATHS = "\"AndroidMakers/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 57MV6634WZ;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
Expand All @@ -404,13 +406,15 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 4.1;
OTHER_LDFLAGS = (
"-framework",
shared,
);
PRODUCT_BUNDLE_IDENTIFIER = com.paug.RobotConf;
PRODUCT_NAME = "Android Makers";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Robot 2024";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand All @@ -421,10 +425,12 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AndroidMakers/AndroidMakers.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 13;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1465;
DEVELOPMENT_ASSET_PATHS = "\"AndroidMakers/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 57MV6634WZ;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
Expand All @@ -434,13 +440,15 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 4.1;
OTHER_LDFLAGS = (
"-framework",
shared,
);
PRODUCT_BUNDLE_IDENTIFIER = com.paug.RobotConf;
PRODUCT_NAME = "Android Makers";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Robot 2024";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down
9 changes: 7 additions & 2 deletions shared/ui/src/iosMain/kotlin/com/androidmakers/ui/MainLayoutViewController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@ package com.androidmakers.ui
import androidx.compose.ui.window.ComposeUIViewController
import com.androidmakers.ui.common.SigninCallbacks
import com.androidmakers.ui.theme.AndroidMakersTheme
import kotlinx.cinterop.ExperimentalForeignApi
import platform.Foundation.NSBundle
import platform.UIKit.UIViewController


fun MainLayoutViewController(): UIViewController =
ComposeUIViewController {
val versionName = NSBundle.mainBundle.objectForInfoDictionaryKey("CFBundleShortVersionString")
val versionCode = NSBundle.mainBundle.objectForInfoDictionaryKey("CFBundleVersion")

AndroidMakersTheme {
MainLayout(
versionName = "1.0.0",
versionCode = "1.0",
versionName = versionName.toString(),
versionCode = versionCode.toString(),
signinCallbacks = SigninCallbacks(
signin = {},
signout = {}
Expand Down
Loading