Ivan Valkou 5 лет назад
Родитель
Сommit
ce388ea963
27 измененных файлов с 22024 добавлено и 4 удалено
  1. 6 0
      FreeAPS/Resources/Assets.xcassets/Colors/Contents.json
  2. 0 0
      FreeAPS/Resources/Assets.xcassets/Colors/LoopGray.colorset/Contents.json
  3. 0 0
      FreeAPS/Resources/Assets.xcassets/Colors/LoopGreen.colorset/Contents.json
  4. 0 0
      FreeAPS/Resources/Assets.xcassets/Colors/LoopRed.colorset/Contents.json
  5. 0 0
      FreeAPS/Resources/Assets.xcassets/Colors/LoopYellow.colorset/Contents.json
  6. 6 0
      FreeAPS/Resources/Assets.xcassets/icons/Contents.json
  7. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/bolus.imageset/Contents.json
  8. 2198 0
      FreeAPS/Resources/Assets.xcassets/icons/bolus.imageset/bolus.pdf
  9. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/bolus1.imageset/Contents.json
  10. 2174 0
      FreeAPS/Resources/Assets.xcassets/icons/bolus1.imageset/bolus1.pdf
  11. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/carbs.imageset/Contents.json
  12. 2218 0
      FreeAPS/Resources/Assets.xcassets/icons/carbs.imageset/carbs.pdf
  13. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/carbs1.imageset/Contents.json
  14. 2173 0
      FreeAPS/Resources/Assets.xcassets/icons/carbs1.imageset/carbs1.pdf
  15. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/premeal.imageset/Contents.json
  16. 2163 0
      FreeAPS/Resources/Assets.xcassets/icons/premeal.imageset/premeal.pdf
  17. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/premeal1.imageset/Contents.json
  18. 2227 0
      FreeAPS/Resources/Assets.xcassets/icons/premeal1.imageset/premeal1.pdf
  19. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/settings.imageset/Contents.json
  20. 2236 0
      FreeAPS/Resources/Assets.xcassets/icons/settings.imageset/settings.pdf
  21. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/settings1.imageset/Contents.json
  22. 2156 0
      FreeAPS/Resources/Assets.xcassets/icons/settings1.imageset/settings1.pdf
  23. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/target.imageset/Contents.json
  24. 2175 0
      FreeAPS/Resources/Assets.xcassets/icons/target.imageset/target.pdf
  25. 12 0
      FreeAPS/Resources/Assets.xcassets/icons/target1.imageset/Contents.json
  26. 2156 0
      FreeAPS/Resources/Assets.xcassets/icons/target1.imageset/target1.pdf
  27. 16 4
      FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

+ 6 - 0
FreeAPS/Resources/Assets.xcassets/Colors/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FreeAPS/Resources/Assets.xcassets/LoopGray.colorset/Contents.json → FreeAPS/Resources/Assets.xcassets/Colors/LoopGray.colorset/Contents.json


FreeAPS/Resources/Assets.xcassets/LoopGreen.colorset/Contents.json → FreeAPS/Resources/Assets.xcassets/Colors/LoopGreen.colorset/Contents.json


FreeAPS/Resources/Assets.xcassets/LoopRed.colorset/Contents.json → FreeAPS/Resources/Assets.xcassets/Colors/LoopRed.colorset/Contents.json


FreeAPS/Resources/Assets.xcassets/LoopYellow.colorset/Contents.json → FreeAPS/Resources/Assets.xcassets/Colors/LoopYellow.colorset/Contents.json


+ 6 - 0
FreeAPS/Resources/Assets.xcassets/icons/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/bolus.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "bolus.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2198 - 0
FreeAPS/Resources/Assets.xcassets/icons/bolus.imageset/bolus.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/bolus1.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "bolus1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2174 - 0
FreeAPS/Resources/Assets.xcassets/icons/bolus1.imageset/bolus1.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/carbs.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "carbs.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2218 - 0
FreeAPS/Resources/Assets.xcassets/icons/carbs.imageset/carbs.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/carbs1.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "carbs1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2173 - 0
FreeAPS/Resources/Assets.xcassets/icons/carbs1.imageset/carbs1.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/premeal.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "premeal.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2163 - 0
FreeAPS/Resources/Assets.xcassets/icons/premeal.imageset/premeal.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/premeal1.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "premeal1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2227 - 0
FreeAPS/Resources/Assets.xcassets/icons/premeal1.imageset/premeal1.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/settings.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "settings.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2236 - 0
FreeAPS/Resources/Assets.xcassets/icons/settings.imageset/settings.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/settings1.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "settings1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2156 - 0
FreeAPS/Resources/Assets.xcassets/icons/settings1.imageset/settings1.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/target.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "target.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2175 - 0
FreeAPS/Resources/Assets.xcassets/icons/target.imageset/target.pdf


+ 12 - 0
FreeAPS/Resources/Assets.xcassets/icons/target1.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "target1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2156 - 0
FreeAPS/Resources/Assets.xcassets/icons/target1.imageset/target1.pdf


+ 16 - 4
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -73,17 +73,26 @@ extension Home {
                         HStack {
                             Button { viewModel.showModal(for: .addCarbs) }
                             label: {
-                                Image(systemName: "circlebadge.2.fill")
+                                Image("carbs")
+                                    .renderingMode(.template)
+                                    .resizable()
+                                    .frame(width: 24, height: 24)
                             }.foregroundColor(.green)
                             Spacer()
                             Button { viewModel.showModal(for: .addTempTarget) }
                             label: {
-                                Image(systemName: "target")
+                                Image("target")
+                                    .renderingMode(.template)
+                                    .resizable()
+                                    .frame(width: 24, height: 24)
                             }.foregroundColor(.green)
                             Spacer()
                             Button { viewModel.showModal(for: .bolus) }
                             label: {
-                                Image(systemName: "drop.fill")
+                                Image("bolus")
+                                    .renderingMode(.template)
+                                    .resizable()
+                                    .frame(width: 24, height: 24)
                             }.foregroundColor(.orange)
                             Spacer()
                             if viewModel.allowManualTemp {
@@ -95,7 +104,10 @@ extension Home {
                             }
                             Button { viewModel.showModal(for: .settings) }
                             label: {
-                                Image(systemName: "gearshape")
+                                Image("settings1")
+                                    .renderingMode(.template)
+                                    .resizable()
+                                    .frame(width: 24, height: 24)
                             }.foregroundColor(.gray)
                         }
                         .padding(.horizontal, 24)