Ver código fonte

Merge pull request #766 from nightscout/updates_to_medtrumkit

Update feat/dev-medtrum branch to bring in updates from MedtrumKit
Marion Barker 8 meses atrás
pai
commit
986de65f2c

+ 1 - 1
Config.xcconfig

@@ -19,7 +19,7 @@ TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
 
 // The developers set the version numbers, please leave them alone
 APP_VERSION = 0.5.1
-APP_DEV_VERSION = 0.5.1.24
+APP_DEV_VERSION = 0.5.1.25
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 

+ 1 - 1
MedtrumKit

@@ -1 +1 @@
-Subproject commit 5bfb80667c6f7f53381d07822c89dad4ee0ac60c
+Subproject commit 8b46b60835072f02340de351d99b7c1ca2264ec1

+ 2 - 0
Trio/Resources/Info.plist

@@ -107,6 +107,8 @@
 		<string>remote-notification</string>
 		<string>audio</string>
 	</array>
+    <key>UIDesignRequiresCompatibility</key>
+    <true/>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchScreen</key>

+ 2 - 2
Trio/Resources/InfoPlist.xcstrings

@@ -8,7 +8,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Trio Medtrum"
+            "value" : "Trio"
           }
         }
       }
@@ -20,7 +20,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Trio Medtrum"
+            "value" : "Trio"
           }
         }
       }

+ 16 - 1
scripts/swiftformat.sh

@@ -97,4 +97,19 @@ trailingClosures \
 --typeattributes same-line \
 --varattributes same-line \
 --wrapcollections before-first \
---exclude Pods,Generated,R.generated.swift,fastlane/swift,Dependencies, LoopKit, LibreTransmitter,G7SensorKit,OmniKit, dexcom-share-client-swift,CGMBLEKit,RileyLinkKit,OmniBLE,MinimedKit,TidepoolService
+--exclude Pods, Generated, \
+  R.generated.swift, \
+  fastlane/swift, \
+  Dependencies,  \
+  LoopKit,  \
+  LibreTransmitter, \
+  G7SensorKit, \
+  OmniKit,  \
+  dexcom-share-client-swift, \
+  CGMBLEKit, \
+  RileyLinkKit, \
+  OmniBLE, \
+  MinimedKit, \
+  TidepoolService \
+  DanaKit \
+  MedtrumKit