Skip to content

Use environment for appName and replace hardcoded Loop with appName #120

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

Merged
marionbarker merged 6 commits into from
Apr 24, 2024
Merged

Use environment for appName and replace hardcoded Loop with appName #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62d9cc7
use environment for appName and replace hardcoded Loop with appName
marionbarker Apr 10, 2024
8324796
reformat and add missing localization to uncertainty recovery
marionbarker Apr 11, 2024
ef31d82
restore files that will be modified by PR 118
marionbarker Apr 12, 2024
e4540b6
Merge branch 'dev' into enable_appName
marionbarker Apr 13, 2024
9b5eed0
wip for using appName for BeepPreference aka Confidence Reminders
marionbarker Apr 13, 2024
00ebe59
wip work-around for appName in BeepPreference
marionbarker Apr 14, 2024
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
15 changes: 15 additions & 0 deletions Common/Bundle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Bundle.swift
// OmniBLE
//
// Created by Darin Krauss on 1/23/21.
// Copyright © 2021 LoopKit Authors. All rights reserved.
//

import Foundation

extension Bundle {
var bundleDisplayName: String {
return object(forInfoDictionaryKey: "CFBundleDisplayName") as! String
}
}
4 changes: 4 additions & 0 deletions OmniBLE.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
A9A5BCF5276C1E6D00B02C86 /* PayloadSplitJoinTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D054D627651D4F00FAFEFB /* PayloadSplitJoinTests.swift */; };
A9A5BCF6276C1E6D00B02C86 /* MessagePacketTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D054CC2764FDB700FAFEFB /* MessagePacketTests.swift */; };
A9A5BCF7276C1E7000B02C86 /* KeyExchangeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D054DB27655F9C00FAFEFB /* KeyExchangeTests.swift */; };
B60BB2E62BC6E74100D2BB39 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60BB2E52BC6E74000D2BB39 /* Bundle.swift */; };
C10D6D6C27A2393800F53D58 /* OmniBLETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C10D6D6B27A2393800F53D58 /* OmniBLETests.swift */; };
C10D6D6E27A2395700F53D58 /* OmniBLEPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = C10D6D6D27A2395700F53D58 /* OmniBLEPlugin.swift */; };
C187C191278FCEC9006E3557 /* InsulinTypeConfirmation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C187C190278FCEC9006E3557 /* InsulinTypeConfirmation.swift */; };
Expand Down Expand Up @@ -379,6 +380,7 @@
A9D054DB27655F9C00FAFEFB /* KeyExchangeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyExchangeTests.swift; sourceTree = "<group>"; };
A9D3492F2764F5780037F77C /* EnDecryptTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnDecryptTests.swift; sourceTree = "<group>"; };
A9D349312764F5D30037F77C /* PayloadJoinerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayloadJoinerTest.swift; sourceTree = "<group>"; };
B60BB2E52BC6E74000D2BB39 /* Bundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bundle.swift; sourceTree = "<group>"; };
C10D6D6B27A2393800F53D58 /* OmniBLETests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OmniBLETests.swift; sourceTree = "<group>"; };
C10D6D6D27A2395700F53D58 /* OmniBLEPlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OmniBLEPlugin.swift; sourceTree = "<group>"; };
C121D8D829C7866D00DA0520 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -742,6 +744,7 @@
8475314F26EDA193009FD801 /* TimeZone.swift */,
8475314C26EDA193009FD801 /* UIColor.swift */,
C1F67EB927975EB70017487F /* FrameworkLocalText.swift */,
B60BB2E52BC6E74000D2BB39 /* Bundle.swift */,
C1F67EDD2797AFF10017487F /* Image.swift */,
);
path = Common;
Expand Down Expand Up @@ -1215,6 +1218,7 @@
10389A2A26FF7841002115E9 /* MessageBlock.swift in Sources */,
C1F67ECA27975F360017487F /* OmniBLESettingsViewModel.swift in Sources */,
C1F67EBA27975EB70017487F /* FrameworkLocalText.swift in Sources */,
B60BB2E62BC6E74100D2BB39 /* Bundle.swift in Sources */,
C1F67E9227975B830017487F /* BasalStateView.swift in Sources */,
1024E32B27446DB000DE01F2 /* MessagePacket.swift in Sources */,
10289E7B2739F886000339E6 /* EapMessage.swift in Sources */,
Expand Down
10 changes: 8 additions & 2 deletions OmniBLE/OmnipodCommon/BeepPreference.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import Foundation
import SwiftUI

public enum BeepPreference: Int, CaseIterable {
case silent
Expand All @@ -25,13 +26,18 @@ public enum BeepPreference: Int, CaseIterable {
}

var description: String {
// This picks up the DefaultValue from LoopKit, not the CFBundleDisplayName
//@Environment(\.appName) var appName
// ToDo - insert the appName properly
let appName: String = "the app"

@ps2 ps2 Apr 30, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Why not use the environment with the real app name? If you have questions about how to set it, I can help. If you want to use "the app", it would be better just to hard code it.

@marionbarker marionbarker Apr 30, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Please help. I prefer appName.


switch self {
case .silent:
return LocalizedString("No confidence reminders are used.", comment: "Description for BeepPreference.silent")
case .manualCommands:
return LocalizedString("Confidence reminders will sound for commands you initiate, like bolus, cancel bolus, suspend, resume, save notification reminders, etc. When Loop automatically adjusts delivery, no confidence reminders are used.", comment: "Description for BeepPreference.manualCommands")
return String(format: LocalizedString("Confidence reminders will sound for commands you initiate, like bolus, cancel bolus, suspend, resume, save notification reminders, etc. When %1$@ automatically adjusts delivery, no confidence reminders are used.", comment: "Description for BeepPreference.manualCommands (1: appName)"), appName)
case .extended:
return LocalizedString("Confidence reminders will sound when Loop automatically adjusts delivery as well as for commands you initiate.", comment: "Description for BeepPreference.extended")
return String(format: LocalizedString("Confidence reminders will sound when %1$@ automatically adjusts delivery as well as for commands you initiate.", comment: "Description for BeepPreference.extended (1: appName)"), appName)
}
}

Expand Down
2 changes: 2 additions & 0 deletions OmniBLE/PumpManagerUI/ViewControllers/DashUICoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,8 @@ class DashUICoordinator: UINavigationController, PumpManagerOnboarding, Completi
}

private func hostingController<Content: View>(rootView: Content, onDisappear: @escaping () -> Void = {}) -> DismissibleHostingController<some View> {
let rootView = rootView
.environment(\.appName, Bundle.main.bundleDisplayName)
return DismissibleHostingController(content: rootView, onDisappear: onDisappear, colorPalette: colorPalette)
}

Expand Down