Fix polls multiple answers minimum value (#898)

Author: testableapple

.swiftformat

@@ -33,3 +33,6 @@
 --wraparguments before-first
 --wrapparameters before-first
 --wrapcollections before-first
+
+# Exclude paths
+--exclude Sources/StreamChatSwiftUI/Generated,Sources/StreamChatSwiftUI/StreamSwiftyGif,Sources/StreamChatSwiftUI/StreamNuke

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### ✅ Added
 - Add support for showing current poll comment on alert [#891](https://github.com/GetStream/stream-chat-swiftui/pull/891)
 
+### 🐞 Fixed
+- Fix polls multiple answers minimum value being 1 instead of 2 [#898](https://github.com/GetStream/stream-chat-swiftui/pull/898)
+
 ### 🔄 Changed
 - Make `ChatChannelInfoView` subviews public for creating custom info views through composition [#892](https://github.com/GetStream/stream-chat-swiftui/pull/892)
   - `ChannelTitleView`

Sources/StreamChatSwiftUI/ChatChannel/Polls/CreatePollView.swift

@@ -119,7 +119,7 @@ public struct CreatePollView: View {
                         if viewModel.multipleAnswers {
                             HStack(alignment: .textFieldToggle) {
                                 VStack(alignment: .leading, spacing: 6) {
-                                    Text(L10n.Composer.Polls.typeNumberFrom1And10)
+                                    Text(L10n.Composer.Polls.typeNumberMinMaxRange)
                                         .foregroundColor(Color(colors.alert))
                                         .font(fonts.caption1)
                                         .offset(y: viewModel.showsMaxVotesError ? 0 : 6)

Sources/StreamChatSwiftUI/ChatChannel/Polls/CreatePollViewModel.swift

@@ -76,7 +76,7 @@ class CreatePollViewModel: ObservableObject {
             .map { text in
                 guard !text.isEmpty else { return false }
                 let intValue = Int(text) ?? 0
-                return intValue < 1 || intValue > 10
+                return intValue < 2 || intValue > 10
             }
             .combineLatest($maxVotesEnabled)
             .map { $0 && $1 }
@@ -132,6 +132,7 @@ class CreatePollViewModel: ObservableObject {
         guard optionsErrorIndices.isEmpty else { return false }
         guard !showsMaxVotesError else { return false }
         guard options.contains(where: { !$0.trimmed.isEmpty }) else { return false }
+        guard !(maxVotesEnabled && maxVotes.trimmed.isEmpty) else { return false }
         return true
     }
 

Sources/StreamChatSwiftUI/Generated/L10n.swift

@@ -275,8 +275,8 @@ internal enum L10n {
       internal static var question: String { L10n.tr("Localizable", "composer.polls.question") }
       /// Suggest an option
       internal static var suggestOption: String { L10n.tr("Localizable", "composer.polls.suggest-option") }
-      /// Type a number from 1 and 10
-      internal static var typeNumberFrom1And10: String { L10n.tr("Localizable", "composer.polls.type-number-from-1-and-10") }
+      /// Type a number from 2 and 10
+      internal static var typeNumberMinMaxRange: String { L10n.tr("Localizable", "composer.polls.type-number-min-max-range") }
     }
     internal enum Quoted {
       /// Giphy

Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.strings

@@ -148,7 +148,7 @@
 "composer.polls.duplicate-option" = "This is already an option";
 "composer.polls.multiple-answers" = "Multiple answers";
 "composer.polls.suggest-option" = "Suggest an option";
-"composer.polls.type-number-from-1-and-10" = "Type a number from 1 and 10";
+"composer.polls.type-number-min-max-range" = "Type a number from 2 and 10";
 "composer.audio-recording.start" = "Start recording audio message";
 "composer.audio-recording.stop" = "Stop recording audio message";
 

fastlane/Fastfile

@@ -497,8 +497,8 @@ desc 'Run source code formatting/linting'
 lane :run_swift_format do |options|
   Dir.chdir('..') do
     strict = options[:strict] ? '--lint' : nil
-    sources_matrix[:swiftformat_include].each do |path|
-      sh("mint run swiftformat #{strict} --config .swiftformat --exclude #{sources_matrix[:swiftformat_exclude].join(',')} #{path}")
+    sources_matrix[:swiftformat].each do |path|
+      sh("mint run swiftformat #{strict} --config .swiftformat #{path}")
       next if path.include?('Tests')
 
       sh("mint run swiftlint lint --config .swiftlint.yml --fix --progress --quiet --reporter json #{path}") unless strict
@@ -532,8 +532,7 @@ lane :sources_matrix do
     size: ['Sources', xcode_project],
     sonar: ['Sources'],
     public_interface: ['Sources'],
-    swiftformat_include: ['Sources', 'DemoAppSwiftUI', 'StreamChatSwiftUITests'],
-    swiftformat_exclude: ['**/Generated', 'Sources/StreamChatSwiftUI/StreamNuke', 'Sources/StreamChatSwiftUI/StreamSwiftyGif']
+    swiftformat: ['Sources', 'DemoAppSwiftUI', 'StreamChatSwiftUITests']
   }
 end
 

lefthook.yml

@@ -1,23 +1,35 @@
 pre-commit:
   parallel: false
   jobs:
-    - run: mint run swiftformat --config .swiftformat --exclude '**/Generated', 'Sources/StreamChatSwiftUI/StreamNuke', 'Sources/StreamChatSwiftUI/StreamSwiftyGif' {staged_files}
+    - run: mint run swiftformat --config .swiftformat {staged_files}
       glob: "*.{swift}"
       stage_fixed: true
+      exclude:
+        - Sources/StreamChatSwiftUI/Generated/**
+        - Sources/StreamChatSwiftUI/StreamNuke/**
+        - Sources/StreamChatSwiftUI/StreamSwiftyGif/**
       skip:
         - merge
         - rebase
 
     - run: mint run swiftlint lint --config .swiftlint.yml --fix --progress --quiet --reporter json {staged_files}
       glob: "*.{swift}"
       stage_fixed: true
+      exclude:
+        - Sources/StreamChatSwiftUI/Generated/**
+        - Sources/StreamChatSwiftUI/StreamNuke/**
+        - Sources/StreamChatSwiftUI/StreamSwiftyGif/**
       skip:
         - merge
         - rebase
 
-    - run: mint run swiftlint lint --config .swiftlint.yml --strict --progress --quiet --reporter json {staged_files}
+pre-push:
+  jobs:
+    - run: mint run swiftlint lint --config .swiftlint.yml --strict --progress --quiet --reporter json {push_files}
       glob: "*.{swift}"
-      stage_fixed: true
+      exclude:
+        - Sources/StreamChatSwiftUI/Generated/**
+        - Sources/StreamChatSwiftUI/StreamNuke/**
+        - Sources/StreamChatSwiftUI/StreamSwiftyGif/**
       skip:
-        - merge
-        - rebase
+        - merge-commit