final fixes

iOS-vk-education · May 21, 2024 · d0e5984 · d0e5984
1 parent d6ff9a8
commit d0e5984
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/LiveRecipes/Localizable.xcstrings b/LiveRecipes/Localizable.xcstrings
@@ -2967,6 +2967,9 @@
     },
     "Очистить мои рецепты?" : {
 
+    },
+    "Очистить недавние?" : {
+
     },
     "Первое блюдо" : {
       "extractionState" : "manual",

diff --git a/LiveRecipes/Modules/Cooking/AnimatedElements/BlinkingText + TimerView.swift b/LiveRecipes/Modules/Cooking/AnimatedElements/BlinkingText + TimerView.swift
@@ -238,7 +238,7 @@ struct TimerView: View {
                     }
                     else {
                         Text(hours == 0 ? "\(minutes)m:\(seconds)s" : "\(hours)h:\(minutes)m:\(seconds)s")
-                            .foregroundColor(Color(uiColor: .label))
+                            .foregroundColor(Color(uiColor: .black))
                             .font(.system(size: 19, weight: .semibold))
                             .padding(.top, 2)
 

diff --git a/LiveRecipes/Modules/Cooking/AnimatedElements/IngredientRunningTextView.swift b/LiveRecipes/Modules/Cooking/AnimatedElements/IngredientRunningTextView.swift
@@ -82,7 +82,7 @@ struct IngredientRunningTextView2: View {
                 .background(.white)
                 .clipShape(RoundedRectangle(cornerRadius: 20))
                 .font(.system(size: 18, weight: .regular))
-                .foregroundColor(Color(uiColor: .label))
+                .foregroundColor(Color(uiColor: .black))
                 .offset(x: computedFinishX, y: 0)
             Spacer()
         }

diff --git a/LiveRecipes/Modules/Cooking/Components/OneStep/OneStepView.swift b/LiveRecipes/Modules/Cooking/Components/OneStep/OneStepView.swift
@@ -115,7 +115,7 @@ struct OneStepView: View {
                                     Spacer()
                                 }
                             }.buttonStyle(.borderedProminent)
-                                .tint(Color(uiColor: .label))
+                                .tint(Color(uiColor: .black))
                                 .padding(.bottom, 20)
                                 .frame(width: UIScreen.main.bounds.width - 20)
                                 .offset(y: model.isTimerOnView ? 10 : -100)

diff --git a/LiveRecipes/Modules/Settings/SettingsView.swift b/LiveRecipes/Modules/Settings/SettingsView.swift
@@ -13,6 +13,7 @@ struct SettingsView: View {
     @StateObject var creationViewModel = CreationViewModel(creationModel: CreationModel())
     @State var isClearMyRecipes = false
     @State var isClearFavorites = false
+    @State var isClearRecents = false
 
     var body: some View {
         List {
@@ -57,11 +58,18 @@ struct SettingsView: View {
 //                        .tint(Color(uiColor: .label))
 //                }
                 Button(action: {
-                    viewState.clearRecents()
+                    isClearRecents = true
                 })
                 {
                     Text("settings.clearRecents".localized)
                         .tint(Color(uiColor: .label))
+                }.alert(isPresented: $isClearRecents) {
+                    Alert(title: Text("Очистить недавние?"), primaryButton: .default(Text("Да")){
+                        viewState.clearRecents()
+                        isClearFavorites = false
+                    }, secondaryButton: .default(Text("Отмена")) {
+                        isClearFavorites = false
+                    })
                 }
                 NavigationLink(destination: CreationView(viewState: creationViewModel), isActive: $isShowingCreationView, label: {
                     Text("settings.publishMyRecipe".localized)