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

Feat: App display name, BundleID and reset of version number #31

Merged
merged 9 commits into from
Apr 2, 2024

Conversation

Sjoerd-Bo3
Copy link
Contributor

@Sjoerd-Bo3 Sjoerd-Bo3 commented Mar 28, 2024

BundleID changed in line with the requests:

org.nightscout.[TEAMID].openiaps

Als the version numbering reset to 0.1.0, with the initial release this should be on 1.0.0

@Sjoerd-Bo3 Sjoerd-Bo3 changed the base branch from main to dev March 28, 2024 10:54
@bjornoleh
Copy link
Contributor

bjornoleh commented Mar 28, 2024

This is not complete unless also editing Fastfile. I suggest to incorporate this: #17

Edit: #17 is merged now

@Sjoerd-Bo3
Copy link
Contributor Author

This is not complete unless also editing Fastfile. I suggest to incorporate this: #17

Okay it should be based on that then, I will rebase. But I my opinion it is a seperate issue.

@dnzxy
Copy link
Contributor

dnzxy commented Mar 28, 2024

it is a seperate issue.

Not a separate issue as your changes only change the bundle ID for Xcode and that would essentially break browser build. As Bjørn has mentioned, this file needs to be changed too: ./fastlane/Fastfile
Additionally, ./fastlane/testflight.md also will need changing, so will the documentation.

@Sjoerd-Bo3
Copy link
Contributor Author

Not a separate issue as your changes only change the bundle ID for Xcode and that would essentially break browser build. As Bjørn has mentioned, this file needs to be changed too: ./fastlane/Fastfile Additionally, ./fastlane/testflight.md also will need changing, so will the documentation.

Yeah okay, I will change the docs and testflight part. But it is dependant on the fastfile change, but shouldn't be in here though right? Otherwise we need to merge these.

@marionbarker
Copy link
Contributor

I tested this on the Mac and it almost works. The problem should have been fixed in PR #26, which has already been merged.

Tagging @avouspierre or @bjornoleh who worked that PR which missed this change in FreeAPS.xcodeproj/project.pbxproj, needed to allow PR 31 to work properly. There are too many branches . . .

Just the diffs: lines 3307 and 3328 for main and dev or 3184 and 3205 for loopkit_dev_submodules

-                               PRODUCT_BUNDLE_IDENTIFIER = ru.artpancreas.FreeAPSTests;
+                               PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER).FreeAPSTests";

and

-                               PRODUCT_BUNDLE_IDENTIFIER = ru.artpancreas.FreeAPSTests;
+                               PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";

Making this change was required for automatic signing to work for a Mac build with changed from PR 31.

bjornoleh and others added 3 commits March 30, 2024 19:51
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER).FreeAPSTests"

- Update plist keys with Open-iAPS:
INFOPLIST_KEY_CFBundleDisplayName = Open-iAPS
INFOPLIST_KEY_CFBundleDisplayName = "Open-iAPS WatchKit Extension"
@bjornoleh
Copy link
Contributor

bjornoleh commented Mar 30, 2024

I tested this on the Mac and it almost works. The problem should have been fixed in PR #26, which has already been merged.

Tagging @avouspierre or @bjornoleh who worked that PR which missed this change in FreeAPS.xcodeproj/project.pbxproj, needed to allow PR 31 to work properly. There are too many branches . . .

Just the diffs: lines 3307 and 3328 for main and dev or 3184 and 3205 for loopkit_dev_submodules

-                               PRODUCT_BUNDLE_IDENTIFIER = ru.artpancreas.FreeAPSTests;
+                               PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER).FreeAPSTests";

and

-                               PRODUCT_BUNDLE_IDENTIFIER = ru.artpancreas.FreeAPSTests;
+                               PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";

Making this change was required for automatic signing to work for a Mac build with changed from PR 31.

This should be sorted now, as well as displaying Open-iAPS under Settings.

@bjornoleh
Copy link
Contributor

bjornoleh commented Mar 30, 2024

Somehow, I do not get any matches for Open-iAPS or OiAPS when searching for the app in iOS settings, although it is listed as OiAPS.
Edit: resolved after rebooting the phone (and waiting a bit??)

@marionbarker
Copy link
Contributor

The APP_DISPLAY_NAME = OiAPS found in Config.xconfig only shows up as the display name on the phone.
When I changed that to Open-iAPS in my local clone, the app on the phone shows up as Open-iAPS instead of OiAPS.

At first - in Apple Health - it still showed up as OiAPS, but after reboot, that showed up as Open-iAPS as well.

@bjornoleh
Copy link
Contributor

bjornoleh commented Mar 31, 2024

The APP_DISPLAY_NAME = OiAPS found in Config.xconfig only shows up as the display name on the phone. When I changed that to Open-iAPS in my local clone, the app on the phone shows up as Open-iAPS instead of OiAPS.

At first - in Apple Health - it still showed up as OiAPS, but after reboot, that showed up as Open-iAPS as well.

Thanks. Does the app name show up when you search for it in iOS settings after rebooting?

I think we should change OiAPS to Open-iAPS anyways. Does it display ok under the icon?

Edit: App display name was changed to Open-iAPD in 64fb31d

bjornoleh and others added 2 commits March 31, 2024 22:42
- Config.xconfig: APP_URL_SCHEME = Open-iAPS
- remove hardcoded "freeaps-x", leaving $(APP_URL_SCHEME)
- CGMType.swift: libreTransmitter: URL(string: "Open-iAPS://libre-transmitter"
- AlertEntry.swift: static let manual = "Open-iAPS"
- CarbsEntry.swift: static let manual = "Open-iAPS"
- NightscoutTreatment.swift: static let local = "Open-iAPS"
- Sources/Models/TempTarget.swift: static let manual = "Open-iAPS"
- NightscoutAPI.swift: var enteredBy = "Open-iAPS", var notes = "Open-iAPS connected"
- GarminManager.swift: connectIQ?.initialize(withUrlScheme: "Open-iAPS", uiOverrideDelegate: self)
Changing the app display name from `OiAPS` (as introduced in #19) to `Open-iAPS`, after having discussed this in Discord.
@bjornoleh bjornoleh changed the title Feat: BundleID and reset of versionnumber Feat: App display name, BundleID and reset of version number Apr 1, 2024
Copy link
Contributor

@bjornoleh bjornoleh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Edit: lets include #41 here as well

@bjornoleh bjornoleh self-requested a review April 1, 2024 21:21
Copy link
Contributor

@bjornoleh bjornoleh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now this PR is complete, please merge into dev!

Copy link
Contributor Author

@Sjoerd-Bo3 Sjoerd-Bo3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀 Let the Merge commence!

@Sjoerd-Bo3 Sjoerd-Bo3 merged commit 8cd27c3 into dev Apr 2, 2024
@Sjoerd-Bo3 Sjoerd-Bo3 deleted the feat-bundleid-versionnumber branch April 2, 2024 19:06
@bjornoleh bjornoleh mentioned this pull request Apr 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants