소스 검색

fix issues with double close menu and seems fix issues on greyed buttons

fix issues with double "close" menu and seems fix issues on greyed buttons.

https://github.com/nightscout/Open-iAPS/issues/69
Pierre L 2 년 전
부모
커밋
e778233509
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() {
         router.mainModalScreen.send(nil)
+        router.mainSecondaryModalView.send(nil)
     }
 
     func view(for screen: Screen) -> AnyView {

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

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