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

Update app name to Trio #157

Merged
merged 13 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 4. Build Open-iAPS
run-name: Build Open-iAPS (${{ github.ref_name }})
name: 4. Build Trio
run-name: Build Trio (${{ github.ref_name }})
on:
workflow_dispatch:

Expand All @@ -12,7 +12,7 @@ on:
- cron: '0 6 1 * *' # Builds the app on the 1st of every month at 06:00 UTC

env:
UPSTREAM_REPO: nightscout/Open-iAPS
UPSTREAM_REPO: nightscout/Trio
UPSTREAM_BRANCH: ${{ github.ref_name }} # branch on upstream repository to sync from (replace with specific branch name if needed)
TARGET_BRANCH: ${{ github.ref_name }} # target branch on fork to be kept in sync, and target branch on upstream to be kept alive (replace with specific branch name if needed)
ALIVE_BRANCH: alive
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
run: |
# get ref for nightscout/Open-iAPS:main
# get ref for nightscout/Trio:main
response=$(curl --request GET \
--url "https://api.github.com/repos/${{ env.UPSTREAM_REPO }}/git/refs/heads/main" \
--header "Authorization: Bearer $GITHUB_TOKEN" \
Expand All @@ -82,7 +82,7 @@ jobs:
fi
echo "SHA of main branch: $SHA";

# Create alive branch based on nightscout/Open-iAPS:main
# Create alive branch based on nightscout/Trio:main
gh api \
--method POST \
-H "Authorization: token $GITHUB_TOKEN" \
Expand Down Expand Up @@ -155,13 +155,13 @@ jobs:
if: needs.check_alive_and_permissions.outputs.WORKFLOW_PERMISSION != 'true'
run: |
echo "### :calendar: Scheduled Sync and Build Disabled :mobile_phone_off:" >> $GITHUB_STEP_SUMMARY
echo "You have not yet configured the scheduled sync and build for Open-iAPS's browser build." >> $GITHUB_STEP_SUMMARY
echo "Synchronizing your fork of <code>Open-iAPS</code> with the upstream repository <code>nightscout/Open-iAPS</code> will be skipped." >> $GITHUB_STEP_SUMMARY
echo "If you want to enable automatic builds and updates for your Open-iAPS, please follow the instructions \
under the following path <code>Open-iAPS/fastlane/testflight.md</code>." >> $GITHUB_STEP_SUMMARY
echo "You have not yet configured the scheduled sync and build for Trio's browser build." >> $GITHUB_STEP_SUMMARY
echo "Synchronizing your fork of <code>Trio</code> with the upstream repository <code>nightscout/Trio</code> will be skipped." >> $GITHUB_STEP_SUMMARY
echo "If you want to enable automatic builds and updates for your Trio, please follow the instructions \
under the following path <code>Trio/fastlane/testflight.md</code>." >> $GITHUB_STEP_SUMMARY


# Builds Open-iAPS
# Builds Trio
build:
name: Build
needs: [validate, check_alive_and_permissions, check_latest_from_upstream]
Expand Down Expand Up @@ -237,9 +237,9 @@ jobs:
- name: Install project dependencies
run: bundle install

# Build signed Open-iAPS IPA file
# Build signed Trio IPA file
- name: Fastlane Build & Archive
run: bundle exec fastlane build_open_iaps
run: bundle exec fastlane build_trio
env:
TEAMID: ${{ secrets.TEAMID }}
GH_PAT: ${{ secrets.GH_PAT }}
Expand Down
8 changes: 4 additions & 4 deletions Config.xcconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
APP_DISPLAY_NAME = Open-iAPS
APP_DISPLAY_NAME = Trio
APP_VERSION = 0.1.0
APP_BUILD_NUMBER = 1
COPYRIGHT_NOTICE =
DEVELOPER_TEAM = ##TEAM_ID##
BUNDLE_IDENTIFIER = org.nightscout.$(DEVELOPMENT_TEAM).openiaps
BUNDLE_IDENTIFIER = org.nightscout.$(DEVELOPMENT_TEAM).trio
APP_GROUP_ID = group.com.$(DEVELOPMENT_TEAM).loopkit.LoopGroup
APP_ICON = oiapsBlack
APP_URL_SCHEME = Open-iAPS
APP_ICON = trioBlack
APP_URL_SCHEME = Trio

#include? "../../ConfigOverride.xcconfig"
#include? "ConfigOverride.xcconfig"
36 changes: 0 additions & 36 deletions FAQ.md

This file was deleted.

36 changes: 0 additions & 36 deletions FAQ_RU.md

This file was deleted.

6 changes: 1 addition & 5 deletions FreeAPS/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
<dict>
<key>AppGroupID</key>
<string>$(APP_GROUP_ID)</string>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>com.freeapsx.background-task.critical-event-log</string>
</array>
<key>CBBundleDisplayName</key>
<string>$(APP_DISPLAY_NAME)</string>
<key>CFBundleDevelopmentRegion</key>
Expand All @@ -32,7 +28,7 @@
<key>CFBundleTypeRole</key>
<string>None</string>
<key>CFBundleURLName</key>
<string>com.artificial-pancreas-iaps</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleURLSchemes</key>
<array>
<string>$(APP_URL_SCHEME)</string>
Expand Down
4 changes: 2 additions & 2 deletions FreeAPS/Sources/APS/FetchGlucoseManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,11 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
private func overcalibrate(entries: [BloodGlucose]) -> [BloodGlucose] {
// overcalibrate
var overcalibration: ((Int) -> (Double))?

if let cal = calibrationService {
overcalibration = cal.calibrate
}

if let overcalibration = overcalibration {
return entries.map { entry in
var entry = entry
Expand Down
2 changes: 1 addition & 1 deletion FreeAPS/Sources/Application/FreeAPSApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import Swinject
init() {
debug(
.default,
"Open-iAPS Started: v\(Bundle.main.releaseVersionNumber ?? "")(\(Bundle.main.buildVersionNumber ?? "")) [buildDate: \(Bundle.main.buildDate)] [buildExpires: \(Bundle.main.profileExpiration)]"
"Trio Started: v\(Bundle.main.releaseVersionNumber ?? "")(\(Bundle.main.buildVersionNumber ?? "")) [buildDate: \(Bundle.main.buildDate)] [buildExpires: \(Bundle.main.profileExpiration)]"
)
loadServices()
}
Expand Down
Loading