UI bug fixes (regarding recipe servings adjustment)

Nextcloud Cookbook iOS Client.xcodeproj/project.pbxproj

@@ -58,7 +58,6 @@
 		A97B4D322B80B3E900EC1A88 /* RecipeModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97B4D312B80B3E900EC1A88 /* RecipeModels.swift */; };
 		A97B4D352B80B82A00EC1A88 /* ShareView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97B4D342B80B82A00EC1A88 /* ShareView.swift */; };
 		A9805BED2BAAC70E003B7231 /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9805BEC2BAAC70E003B7231 /* NumberFormatter.swift */; };
-		A9A43AE12B963150003D95CA /* SwipeActions in Frameworks */ = {isa = PBXBuildFile; productRef = A9A43AE02B963150003D95CA /* SwipeActions */; };
 		A9BBB38C2B8D3B0C002DA7FF /* ParallaxHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BBB38B2B8D3B0C002DA7FF /* ParallaxHeaderView.swift */; };
 		A9BBB38E2B8E44B3002DA7FF /* BottomClipper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BBB38D2B8E44B3002DA7FF /* BottomClipper.swift */; };
 		A9BBB3902B91BE31002DA7FF /* ObservableRecipeDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BBB38F2B91BE31002DA7FF /* ObservableRecipeDetail.swift */; };
@@ -157,7 +156,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				A74D33BE2AF82AAE00D06555 /* SwiftSoup in Frameworks */,
-				A9A43AE12B963150003D95CA /* SwipeActions in Frameworks */,
 				A9CA6CF62B4C63F200F78AB5 /* TPPDF in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -442,7 +440,6 @@
 			packageProductDependencies = (
 				A74D33BD2AF82AAE00D06555 /* SwiftSoup */,
 				A9CA6CF52B4C63F200F78AB5 /* TPPDF */,
-				A9A43AE02B963150003D95CA /* SwipeActions */,
 			);
 			productName = "Nextcloud Cookbook iOS Client";
 			productReference = A701717E2AA8E71900064C43 /* Nextcloud Cookbook iOS Client.app */;
@@ -522,7 +519,6 @@
 			packageReferences = (
 				A74D33BC2AF82AAE00D06555 /* XCRemoteSwiftPackageReference "SwiftSoup" */,
 				A9CA6CF42B4C63F200F78AB5 /* XCRemoteSwiftPackageReference "TPPDF" */,
-				A9A43ADF2B963150003D95CA /* XCRemoteSwiftPackageReference "SwipeActions" */,
 			);
 			productRefGroup = A701717F2AA8E71900064C43 /* Products */;
 			projectDirPath = "";
@@ -1001,14 +997,6 @@
 				minimumVersion = 2.6.1;
 			};
 		};
-		A9A43ADF2B963150003D95CA /* XCRemoteSwiftPackageReference "SwipeActions" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/aheze/SwipeActions";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.1.0;
-			};
-		};
 		A9CA6CF42B4C63F200F78AB5 /* XCRemoteSwiftPackageReference "TPPDF" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/techprimate/TPPDF.git";
@@ -1025,11 +1013,6 @@
 			package = A74D33BC2AF82AAE00D06555 /* XCRemoteSwiftPackageReference "SwiftSoup" */;
 			productName = SwiftSoup;
 		};
-		A9A43AE02B963150003D95CA /* SwipeActions */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A9A43ADF2B963150003D95CA /* XCRemoteSwiftPackageReference "SwipeActions" */;
-			productName = SwipeActions;
-		};
 		A9CA6CF52B4C63F200F78AB5 /* TPPDF */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = A9CA6CF42B4C63F200F78AB5 /* XCRemoteSwiftPackageReference "TPPDF" */;

Nextcloud Cookbook iOS Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -9,15 +9,6 @@
         "version" : "2.6.1"
       }
     },
-    {
-      "identity" : "swipeactions",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/aheze/SwipeActions",
-      "state" : {
-        "revision" : "41e6f6dce02d8cfa164f8c5461a41340850ca3ab",
-        "version" : "1.1.0"
-      }
-    },
     {
       "identity" : "tppdf",
       "kind" : "remoteSourceControl",

Nextcloud Cookbook iOS Client/Data/ObservableRecipeDetail.swift

@@ -68,7 +68,7 @@ class ObservableRecipeDetail: ObservableObject {
         recipeInstructions = recipeDetail.recipeInstructions
         nutrition = recipeDetail.nutrition
         
-        ingredientMultiplier = Double(recipeDetail.recipeYield)
+        ingredientMultiplier = Double(recipeDetail.recipeYield == 0 ? 1 : recipeDetail.recipeYield)
     }
     
     func toRecipeDetail() -> RecipeDetail {

Nextcloud Cookbook iOS Client/Localizable.xcstrings

@@ -354,12 +354,6 @@
           }
         }
       }
-    },
-    "1,42 (Comma)" : {
-
-    },
-    "1.42 (Point)" : {
-
     },
     "A recipe with that name already exists." : {
       "localizations" : {
@@ -846,6 +840,9 @@
     },
     "cl" : {
 
+    },
+    "Comma (e.g. 1,42)" : {
+
     },
     "Configure what is stored on your device." : {
       "localizations" : {
@@ -1103,9 +1100,6 @@
     },
     "Decimal number format" : {
 
-    },
-    "Decimal Separator" : {
-
     },
     "Delete" : {
       "localizations" : {
@@ -2222,6 +2216,9 @@
           }
         }
       }
+    },
+    "Marked ingredients could not be adjusted!" : {
+
     },
     "mg" : {
 
@@ -2764,6 +2761,9 @@
           }
         }
       }
+    },
+    "Point (e.g. 1.42)" : {
+
     },
     "pound" : {
 
@@ -3885,9 +3885,6 @@
     },
     "tsp" : {
 
-    },
-    "Unable to adjust some ingredients!" : {
-
     },
     "Unable to complete action." : {
       "localizations" : {

Nextcloud Cookbook iOS Client/Views/Recipes/RecipeViewSections/RecipeIngredientSection.swift

@@ -67,10 +67,10 @@ struct RecipeIngredientSection: View {
             if viewModel.observableRecipeDetail.ingredientMultiplier != Double(viewModel.observableRecipeDetail.recipeYield) {
                 HStack() {
                     Image(systemName: "exclamationmark.triangle.fill")
-                        .foregroundStyle(.red)
-                    Text("Unable to adjust some ingredients!")
                         .foregroundStyle(.secondary)
-                }
+                    Text("Marked ingredients could not be adjusted!")
+                        .foregroundStyle(.secondary)
+                }.padding(.top)
             }
             
             if viewModel.editMode {

Nextcloud Cookbook iOS Client/Views/SettingsView.swift

@@ -80,9 +80,9 @@ struct SettingsView: View {
                 HStack {
                     Text("Decimal number format")
                     Spacer()
-                    Picker("Decimal Separator", selection: $userSettings.decimalNumberSeparator) {
+                    Picker("", selection: $userSettings.decimalNumberSeparator) {
-                        Text("1.42 (Point)").tag(".")
+                        Text("Point (e.g. 1.42)").tag(".")
-                        Text("1,42 (Comma)").tag(",")
+                        Text("Comma (e.g. 1,42)").tag(",")
                     }
                     .pickerStyle(.menu)
                 }