Skip to content

Commit 8e599e5

Browse files
marionbarkermarionbarker
committed
Merge branch 'dev'
2 parents 59f3913 + 582b29a commit 8e599e5

File tree

4 files changed

+64
-31
lines changed

4 files changed

+64
-31
lines changed

‎Config.xcconfig‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
11
#include? "LoopFollowConfigOverride.xcconfig"
22
#include? "../../LoopFollowConfigOverride.xcconfig"
3+
#include? "LoopFollowDisplayNameConfig.xcconfig"
4+
#include? "../../LoopFollowDisplayNameConfig.xcconfig"
35

4-
//
5-
// Config.xcconfig
6-
// nsapple
7-
//
8-
// Created by Kenneth Stack on 4/12/18.
9-
// Copyright © 2018 Perceptus.org. All rights reserved.
10-
//
116
unique_id = ${DEVELOPMENT_TEAM}
127

138
//Version (DEFAULT)
14-
LOOP_FOLLOW_MARKETING_VERSION = 2.0.02
15-
16-
// Custom Display Name for Your LoopFollow App
17-
// ---------------------------------------------
18-
// The 'display_name' field allows you to personalize the name of this LoopFollow app instance.
19-
// This name appears on your device and helps to distinguish between different LoopFollow instances.
20-
//
21-
// How to Set:
22-
// 1. Replace 'LoopFollow' with the desired name of your app.
23-
// 2. Save the file and build the app for the changes to take effect.
24-
//
25-
display_name = LoopFollow
9+
LOOP_FOLLOW_MARKETING_VERSION = 2.1.0

‎LoopFollow.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
DDCF979A24C14DB4002C9752 /* WatchSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979924C14DB4002C9752 /* WatchSettingsViewController.swift */; };
3434
DDCF979C24C14EFB002C9752 /* AdvancedSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979B24C14EFB002C9752 /* AdvancedSettingsViewController.swift */; };
3535
DDCF979E24C2382A002C9752 /* AppStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979D24C2382A002C9752 /* AppStateController.swift */; };
36+
DDCFCAF22B17273200BE5751 /* LoopFollowDisplayNameConfig.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = DDCFCAF12B17273200BE5751 /* LoopFollowDisplayNameConfig.xcconfig */; };
3637
DDF9676E2AD08C6E00C5EB95 /* SiteChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF9676D2AD08C6E00C5EB95 /* SiteChange.swift */; };
3738
FC16A97A24996673003D6245 /* NightScout.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC16A97924996673003D6245 /* NightScout.swift */; };
3839
FC16A97B249966A3003D6245 /* AlarmSound.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC7CE589248ABEA3001F83B8 /* AlarmSound.swift */; };
@@ -217,6 +218,7 @@
217218
DDCF979924C14DB4002C9752 /* WatchSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchSettingsViewController.swift; sourceTree = "<group>"; };
218219
DDCF979B24C14EFB002C9752 /* AdvancedSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsViewController.swift; sourceTree = "<group>"; };
219220
DDCF979D24C2382A002C9752 /* AppStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStateController.swift; sourceTree = "<group>"; };
221+
DDCFCAF12B17273200BE5751 /* LoopFollowDisplayNameConfig.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = LoopFollowDisplayNameConfig.xcconfig; sourceTree = "<group>"; };
220222
DDF9676D2AD08C6E00C5EB95 /* SiteChange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteChange.swift; sourceTree = "<group>"; };
221223
ECA3EFB4037410B4973BB632 /* Pods-LoopFollow.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LoopFollow.debug.xcconfig"; path = "Target Support Files/Pods-LoopFollow/Pods-LoopFollow.debug.xcconfig"; sourceTree = "<group>"; };
222224
FC16A97924996673003D6245 /* NightScout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightScout.swift; sourceTree = "<group>"; };
@@ -630,6 +632,7 @@
630632
FC97880B2485969B00A7906C = {
631633
isa = PBXGroup;
632634
children = (
635+
DDCFCAF12B17273200BE5751 /* LoopFollowDisplayNameConfig.xcconfig */,
633636
FC3AE7B3249E8E0E00AAE1E0 /* LoopFollow.xcdatamodeld */,
634637
FC5A5C3C2497B229009C550E /* Config.xcconfig */,
635638
FC8DEEE32485D1680075863F /* LoopFollow */,
@@ -833,6 +836,7 @@
833836
FC7CE518248ABE37001F83B8 /* Siri_Alert_Calibration_Needed.caf in Resources */,
834837
FC5A5C3D2497B229009C550E /* Config.xcconfig in Resources */,
835838
FC7CE550248ABE37001F83B8 /* Siri_Alert_High_Glucose.caf in Resources */,
839+
DDCFCAF22B17273200BE5751 /* LoopFollowDisplayNameConfig.xcconfig in Resources */,
836840
FC7CE525248ABE37001F83B8 /* Sci-Fi_Warning.caf in Resources */,
837841
FC7CE556248ABE37001F83B8 /* Sci-Fi_Console_Alarm.caf in Resources */,
838842
FC7CE55C248ABE37001F83B8 /* Big_Clock_Ticking.caf in Resources */,

‎LoopFollowDisplayNameConfig.xcconfig‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// LoopFollowDisplayNameConfig.xcconfig
3+
//
4+
// Use this file to configure instance-specific settings for LoopFollow.
5+
//
6+
7+
// App Suffix: Used to differentiate AppGroupIdentifier between different app instances.
8+
app_suffix =
9+
10+
// Custom Display Name for Your LoopFollow App
11+
// ---------------------------------------------
12+
// The 'display_name' field allows you to personalize the name of this LoopFollow app instance.
13+
// This name appears on your device and helps to distinguish between different LoopFollow instances.
14+
//
15+
// How to Set:
16+
// 1. Replace 'LoopFollow' with the desired name of your app.
17+
// 2. Save the file and build the app for the changes to take effect.
18+
//
19+
display_name = LoopFollow

‎README.md‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,34 @@ low alert for the BG you want to wake up to and close Loop.
4141

4242
Please see [Loop and Learn: Loop Follow](https://www.loopandlearn.org/loop-follow/) for all the building options.
4343

44+
With the release of version 2.1.0, there is now an easy option for building up to three instances of the Loop Follow app for multiple Loopers in your family. Each instance can be configured to have the display name you choose with these names being the default:
45+
46+
* LoopFollow
47+
* LoopFollow_Second
48+
* LoopFollow_Third
49+
50+
#### Display Name Updates
51+
52+
The _display_name_ is found in a single file.
53+
54+
* Suggestion if you customize the name: use LF {unique name} so you can find the apps easily in iOS Settings screen
55+
56+
Summary instructions by build method:
57+
58+
* Browser Build:
59+
* Commit the desired _display_name_ in the LoopFollowDisplayNameConfig.xcconfig file of your forked repository for LoopFollow, LoopFollow_Second or LoopFollow_Third
60+
* Mac-Xcode Build
61+
* First build with script, you will be prompted to enter the desired _display_name_
62+
* This _display_name_ is used each time you select a fresh download for LoopFollow 1, 2 or 3
63+
* To modify the _display_name_ for subsequent script builds, edit the appropriate file in the ~/Downloads/BuildLoopFollow folder
64+
* LoopFollowDisplayNameConfig.xcconfig
65+
* LoopFollowDisplayNameConfig_Second.xcconfig
66+
* LoopFollowDisplayNameConfig_Third.xcconfig
67+
68+
#### Updates
69+
70+
When modifications and versions are updated, there might be a slight delay for getting the second and third forks updated as well, so if you are using this feature, wait until all three repositories are updated.
71+
4472
### General feature list
4573

4674
Please review the list on [Loop and Learn: Loop Follow](https://www.loopandlearn.org/loop-follow/) which may be updated more frequently than this README.md file.
@@ -67,7 +95,7 @@ Please review the list on [Loop and Learn: Loop Follow](https://www.loopandlearn
6795
6896
### Versions
6997

70-
We added version numbers that are incremented with each pull request that is merged.
98+
We added version numbers that are incremented with each pull request (or group of pull requests) merged.
7199

72100
New PR are directed to the dev branch. If you direct one to main, we will move it to point to dev. So always start with your code aligned with dev.
73101

@@ -76,28 +104,26 @@ The versioning is:
76104
* major.minor.micro
77105
* For example our first version is 2.0.0
78106

79-
After that we made a decision to make the micro numbering be 2 digits.
80-
81-
After a PR is merged to dev, the repository maintainers will bump up the micro verion number - please do not modify the version in your branch.
107+
After a PR is merged to dev, the repository maintainers will bump up the verion number before merging to main - please do not modify the version in your branch.
82108

83109
For the most part, the deveopers keep main and dev branches at the same level. But sometimes we want modification to remain in dev for additional testing.
84110

85111
#### Version Example
86112

87-
Starting with version 2.0.01
113+
Starting with version 2.1.0
88114

89115
* PR with Feature A gets merged to dev
90-
* Maintainers, bump dev to 2.0.02
116+
* Maintainers, bump dev to 2.1.0
91117
* Maintainers merge dev into main
92-
* both main and dev are at 2.0.02
118+
* both main and dev are at 2.1.0
93119
* PR with Feature B gets merged to dev
94-
* Maintainers, bump dev to 2.0.03
95-
* main is still at 2.0.02
120+
* Maintainers, bump dev to 2.1.1
121+
* main is still at 2.1.0
96122
* PR with Feature C gets merged to dev
97-
* Maintainers, bump dev to 2.0.04
98-
* main is still at 2.0.02
123+
* Maintainers, bump dev to 2.1.2
124+
* main is still at 2.1.0
99125
* Maintainers merge dev into main
100-
* both main and dev are at 2.0.04
126+
* both main and dev are at 2.1.2
101127

102128
#### Version Updates
103129

0 commit comments

Comments
 (0)