فهرست منبع

Merge pull request #81 from avouspierre/alpha

fix issues with double close menu and seems fix issues on greyed buttons
bjornoleh 2 سال پیش
والد
کامیت
adede048db
2فایلهای تغییر یافته به همراه2 افزوده شده و 1 حذف شده
  1. 1 0
      FreeAPS/Sources/Modules/Base/BaseStateModel.swift
  2. 1 1
      FreeAPS/Sources/Modules/Home/HomeStateModel.swift

+ 1 - 0
FreeAPS/Sources/Modules/Base/BaseStateModel.swift

@@ -37,6 +37,7 @@ class BaseStateModel<Provider>: StateModel, Injectable where Provider: FreeAPS.P
 
 
     func hideModal() {
     func hideModal() {
         router.mainModalScreen.send(nil)
         router.mainModalScreen.send(nil)
+        router.mainSecondaryModalView.send(nil)
     }
     }
 
 
     func view(for screen: Screen) -> AnyView {
     func view(for screen: Screen) -> AnyView {

+ 1 - 1
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -353,7 +353,7 @@ extension Home {
         }
         }
 
 
         func openCGM() {
         func openCGM() {
-            showModal(for: .cgmDirect)
+            router.mainSecondaryModalView.send(router.view(for: .cgmDirect))
         }
         }
 
 
         func infoPanelTTPercentage(_ hbt_: Double, _ target: Decimal) -> Decimal {
         func infoPanelTTPercentage(_ hbt_: Double, _ target: Decimal) -> Decimal {