Gender picker improvements in profile edit

Author: Xialtal

Modules/Sources/Models/Profile/User.swift

@@ -206,21 +206,12 @@ public extension User {
 
     // MARK: Gender
 
-    enum Gender: Int, Codable, Hashable, Sendable {
+    enum Gender: Int, CaseIterable, Codable, Hashable, Sendable, Identifiable {
         case unknown = 0
         case male
         case female
 
-        public var title: LocalizedStringKey {
-            switch self {
-            case .unknown:
-                "Not set"
-            case .male:
-                "Male"
-            case .female:
-                "Female"
-            }
-        }
+        public var id: Self { self }
     }
 
     // MARK: Device

Modules/Sources/Models/Resources/Localizable.xcstrings

@@ -41,16 +41,6 @@
         }
       }
     },
-    "Female" : {
-      "localizations" : {
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Женский"
-          }
-        }
-      }
-    },
     "First page" : {
       "localizations" : {
         "ru" : {
@@ -81,16 +71,6 @@
         }
       }
     },
-    "Male" : {
-      "localizations" : {
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Мужской"
-          }
-        }
-      }
-    },
     "No comment text" : {
       "localizations" : {
         "ru" : {
@@ -101,16 +81,6 @@
         }
       }
     },
-    "Not set" : {
-      "localizations" : {
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Не указан"
-          }
-        }
-      }
-    },
     "Profile" : {
       "localizations" : {
         "ru" : {

Modules/Sources/ProfileFeature/Edit/EditFeature.swift

@@ -100,7 +100,6 @@ public struct EditFeature: Reducer, Sendable {
 
             case wipeBirthdayDate
             case setBirthdayDate
-            case selectGenderType(User.Gender)
 
             case saveButtonTapped
             case cancelButtonTapped
@@ -153,10 +152,6 @@ public struct EditFeature: Reducer, Sendable {
             case .view(.avatarBadFileSizeTooBig):
                 return showToast(ToastMessage(text: Localization.avatarFileSizeError, haptic: .error))
 
-            case .view(.selectGenderType(let type)):
-                state.draftUser.gender = type
-                return .none
-                
             case .view(.setBirthdayDate):
                 state.birthdayDate = state.draftUser.birthdayDate ?? Date()
                 return .none

Modules/Sources/ProfileFeature/Edit/EditScreen.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 import ComposableArchitecture
 import NukeUI
+import Models
 import SharedUI
 import PhotosUI
 
@@ -168,47 +169,18 @@ public struct EditScreen: View {
 
     @ViewBuilder
     private func UserGender() -> some View {
-        Menu {
-            Button {
-                send(.selectGenderType(.unknown))
-            } label: {
-                Text("Not set", bundle: .module)
-            }
-            
-            Button {
-                send(.selectGenderType(.male))
-            } label: {
-                Text("Male", bundle: .module)
+        Picker(
+            LocalizedStringResource("Gender", bundle: .module),
+            selection: Binding(unwrapping: $store.draftUser.gender, default: .unknown)
+        ) {
+            ForEach(User.Gender.allCases) { gender in
+                Text(gender.title, bundle: .module)
+                    .tag(gender)
             }
-            
-            Button {
-                send(.selectGenderType(.female))
-            } label: {
-                Text("Female", bundle: .module)
-            }
-        } label: {
-            HStack {
-                Text("Gender", bundle: .module)
-                    .font(.body)
-                    .foregroundStyle(Color(.Labels.primary))
-                
-                Spacer()
-                
-                HStack {
-                    let gender = store.draftUser.gender ?? .unknown
-                    Text(gender.title, bundle: .module)
-                        .font(.body)
-                        .foregroundStyle(Color(.Labels.quaternary))
-                        .padding(.leading, 16)
-                    
-                    Image(systemSymbol: .chevronUpChevronDown)
-                        .foregroundStyle(Color(.Labels.quaternary))
-                }
-            }
-            .padding(12)
-            .frame(height: 60)
-            .cornerRadius(10)
         }
+        .padding(12)
+        .frame(height: 60)
+        .cornerRadius(10)
     }
 
     // MARK: - Avatar

Modules/Sources/ProfileFeature/Models/Extensions/User.Gender+Extension.swift

@@ -0,0 +1,22 @@
+//
+//  User.Gender+Extension.swift
+//  ForPDA
+//
+//  Created by Xialtal on 9.11.25.
+//
+
+import SwiftUI
+import Models
+
+extension User.Gender {
+    var title: LocalizedStringKey {
+        switch self {
+        case .unknown:
+            "Not set"
+        case .male:
+            "Male"
+        case .female:
+            "Female"
+        }
+    }
+}