translate

yobble/Resources/Localizable.xcstrings

@@ -2,28 +2,55 @@
   "sourceLanguage" : "ru",
   "strings" : {
     "@%@" : {
-
+      "localizations" : {
-    },
+        "en" : {
-    "@yourusername" : {
+          "stringUnit" : {
-
+            "state" : "translated",
+            "value" : "@%@"
+          }
+        }
+      }
     },
     "🌍" : {
-
+      "localizations" : {
-    },
+        "en" : {
-    "CATEGORY" : {
+          "stringUnit" : {
-
+            "state" : "translated",
+            "value" : "🌍"
+          }
+        }
+      }
     },
     "Fun Fest" : {
-      "comment" : "Fun Fest"
+      "comment" : "Fun Fest",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Fun Fest"
+          }
+        }
+      }
     },
     "Hello, world!" : {
-
+      "localizations" : {
-    },
+        "en" : {
-    "loading_placeholder" : {
+          "stringUnit" : {
-
+            "state" : "translated",
+            "value" : "Hello, world!"
+          }
+        }
+      }
     },
     "OK" : {
-
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "OK"
+          }
+        }
+      }
     },
     "profile_down_text_1" : {
 
@@ -36,15 +63,16 @@
     },
     "Push-уведомления" : {
 
-    },
-    "SERVICES" : {
-
     },
     "Yobble" : {
-
+      "localizations" : {
-    },
+        "en" : {
-    "Your Name" : {
+          "stringUnit" : {
-
+            "state" : "translated",
+            "value" : "Yobble"
+          }
+        }
+      }
     },
     "Активные сессии" : {
 
@@ -53,7 +81,14 @@
 
     },
     "Войти" : {
-
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Log in"
+          }
+        }
+      }
     },
     "Выйти из аккаунта" : {
 
@@ -66,6 +101,17 @@
     },
     "Двухфакторная аутентификация" : {
 
+    },
+    "Добавить друзей" : {
+      "comment" : "Add friends",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Add friends"
+          }
+        }
+      }
     },
     "Другое" : {
 
@@ -90,15 +136,49 @@
     },
     "Заглушка: Хранилище данных" : {
 
+    },
+    "Загрузка..." : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Loading..."
+          }
+        }
+      }
     },
     "Заказы" : {
-      "comment" : "Orders"
+      "comment" : "Orders",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Orders"
+          }
+        }
+      }
     },
     "Закрыть" : {
-      "comment" : "Закрыть"
+      "comment" : "Закрыть",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Close"
+          }
+        }
+      }
     },
     "Зарегистрироваться" : {
-      "comment" : "Зарегистрироваться"
+      "comment" : "Зарегистрироваться",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Register"
+          }
+        }
+      }
     },
     "Здесь будут чаты" : {
 
@@ -107,10 +187,26 @@
 
     },
     "Инвайт-код (необязательно)" : {
-      "comment" : "Инвайт-код"
+      "comment" : "Инвайт-код",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Invite code (optional)"
+          }
+        }
+      }
     },
     "История" : {
-      "comment" : "History"
+      "comment" : "History",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "History"
+          }
+        }
+      }
     },
     "Как сбросить пароль?" : {
       "comment" : "FAQ question: reset password"
@@ -119,10 +215,26 @@
       "comment" : "FAQ question: support"
     },
     "Корзина" : {
-      "comment" : "Cart"
+      "comment" : "Cart",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cart"
+          }
+        }
+      }
     },
     "Кошелёк" : {
-      "comment" : "Wallet"
+      "comment" : "Wallet",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wallet"
+          }
+        }
+      }
     },
     "Лента" : {
 
@@ -131,25 +243,62 @@
 
     },
     "Логин" : {
-      "comment" : "Логин"
+      "comment" : "Логин",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Login"
+          }
+        }
+      }
     },
     "Логин должен быть от 3 до 32 символов (английские буквы, цифры, _)" : {
-      "comment" : "Логин должен быть от 3 до 32 символов (английские буквы, цифры, _)"
+      "comment" : "Логин должен быть от 3 до 32 символов (английские буквы, цифры, _)",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Username must be 3 to 32 characters (letters, digits, or _)"
+          }
+        }
+      }
     },
     "Логин уже занят." : {
 
-    },
-    "Люди, которых вы можете знать" : {
-      "comment" : "People You May Like"
     },
     "Мини-приложения" : {
-      "comment" : "Applets"
+      "comment" : "Applets",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Applets"
+          }
+        }
+      }
     },
     "Мои загрузки" : {
-      "comment" : "My Downloads"
+      "comment" : "My Downloads",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "My Downloads"
+          }
+        }
+      }
     },
     "Мои комментарии" : {
-      "comment" : "My Comments"
+      "comment" : "My Comments",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "My Comments"
+          }
+        }
+      }
     },
     "Мой профиль" : {
 
@@ -158,7 +307,15 @@
       "comment" : "FAQ answer: support"
     },
     "Настройки" : {
-      "comment" : "Settings"
+      "comment" : "Settings",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Settings"
+          }
+        }
+      }
     },
     "Не удалось обработать ответ сервера." : {
 
@@ -240,6 +397,17 @@
     },
     "Поиск" : {
 
+    },
+    "Помощь" : {
+      "comment" : "Help Center",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Help Center"
+          }
+        }
+      }
     },
     "Приглашение достигло лимита использования." : {
 
@@ -286,8 +454,16 @@
     "Сервер не отвечает. Попробуйте позже." : {
 
     },
-    "Сканировать" : {
+    "Скан" : {
-      "comment" : "Scan"
+      "comment" : "Scan",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Scan"
+          }
+        }
+      }
     },
     "Слишком много запросов." : {
 
@@ -302,10 +478,15 @@
 
     },
     "Центр авторов" : {
-      "comment" : "Creator Center"
+      "comment" : "Creator Center",
-    },
+      "localizations" : {
-    "Центр помощи" : {
+        "en" : {
-      "comment" : "Help Center"
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Creator Center"
+          }
+        }
+      }
     },
     "Частые вопросы" : {
       "comment" : "FAQ navigation title"
@@ -314,7 +495,15 @@
 
     },
     "Черновики" : {
-      "comment" : "Drafts"
+      "comment" : "Drafts",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Drafts"
+          }
+        }
+      }
     },
     "Черновики доступны в боковом меню в разделе Drafts." : {
       "comment" : "FAQ answer: drafts"

yobble/Views/SplashScreenView.swift

@@ -6,7 +6,7 @@ struct SplashScreenView: View {
             ProgressView()
                 .progressViewStyle(CircularProgressViewStyle())
                 .scaleEffect(1.5)
-            Text(NSLocalizedString("loading_placeholder", comment: ""))
+            Text(NSLocalizedString("Загрузка...", comment: ""))
                 .padding(.top, 10)
         }
     }

yobble/Views/Tab/SideMenuView.swift

@@ -53,8 +53,10 @@ struct SideMenuFooterButton: View {
                 Text(title)
                     .font(.caption2)
             }
+            .frame(maxWidth: .infinity)
             .foregroundColor(.primary)
         }
+        .frame(maxWidth: .infinity)
     }
 }
 
@@ -74,15 +76,6 @@ struct SideMenuView: View {
     private let topPadding: CGFloat = 66
     private let bottomPadding: CGFloat = 34
 
-    // Dummy account data
-    private let accounts: [Account] = [
-        Account(name: "Your Name", username: "@yourusername", isCurrent: true),
-        Account(name: "Second Account", username: "@second", isCurrent: false),
-        Account(name: "Another One", username: "@another", isCurrent: false),
-        Account(name: "Test User", username: "@test", isCurrent: false),
-        Account(name: "Creative Profile", username: "@creative", isCurrent: false)
-    ]
-    
     private var themeToggleButton: some View {
         Button(action: {
             themeManager.toggleTheme(from: colorScheme)
@@ -125,101 +118,21 @@ struct SideMenuView: View {
             ScrollView(showsIndicators: false) {
                 VStack(alignment: .leading, spacing: 0) { // Parent VStack
 
-                    // --- Header ---
-                    HStack(alignment: .top) {
-                        Button(action: {  }) {
-                            Image(systemName: "person.circle.fill")
-                                .resizable()
-                                .frame(width: 60, height: 60)
-                                .foregroundColor(.gray)
-                        }
-                        Spacer()
-                        themeToggleButton
-                    }
-                    .padding(.horizontal, 20)
-                    .padding(.top, topPadding)
-                    .padding(.bottom, 10)
-                    
-                    // --- Header Button ---
-                    Button(action: {
-                        withAnimation(.spring()) {
-                            isAccountListExpanded.toggle()
-                        }
-                    }) {
-                        HStack {
-                            VStack(alignment: .leading) {
-                                Text("@\(viewModel.username)")
-                                    .font(.title3).bold()
-//                                Text("@yourusername")
-//                                    .font(.footnote)
-                            }
-                            .foregroundColor(.primary)
-                            
-                            Spacer()
-                            
-                            Image(systemName: isAccountListExpanded ? "chevron.up" : "chevron.down")
-                                .font(.headline)
-                                .foregroundColor(.secondary)
-                        }
-                    }
-                    .padding(.horizontal, 20)
-                    .padding(.bottom, 10)
-
-                    // --- Collapsible Account List in a clipped container ---
-                    VStack {
-                        if isAccountListExpanded {
-                            VStack(alignment: .leading, spacing: 15) {
-                                ForEach(accounts) { account in
-                                    HStack {
-                                        Button(action: {  }) {
-                                            ZStack {
-                                                Image(systemName: "person.circle.fill")
-                                                    .resizable()
-                                                    .frame(width: 32, height: 32) // Smaller icon
-                                                    .foregroundColor(.secondary)
-                                                
-                                                if account.isCurrent {
-                                                    Image(systemName: "checkmark.circle.fill")
-                                                        .foregroundColor(.blue)
-                                                        .background(Circle().fill(Color(UIColor.systemBackground)))
-                                                        .font(.body) // Smaller checkmark
-                                                        .offset(x: 11, y: 11) // Adjusted offset
-                                                }
-                                            }
-                                            
-                                            VStack(alignment: .leading) {
-                                                Text(account.username).font(.footnote).bold() // Smaller text
-//                                                Text(account.name).font(.footnote).bold() // Smaller text
-//                                                Text(account.username).font(.caption2)      // Smaller text
-                                            }
-                                            .foregroundColor(.primary)
-                                        }
-                                                                            
-                                        Spacer()
-                                    }
-                                }
-                            }
-                            .padding(.horizontal, 20)
-                            .padding(.vertical, 10)
-                            .transition(.slideAndFade)
-                        }
-                    }
-                    .clipped()
-                    
                     // Menu Items
                     VStack(alignment: .leading, spacing: 20) {
                         // Section 1
                         VStack(alignment: .leading, spacing: 7) {
-                            SideMenuButton(icon: "person.2.fill", title: NSLocalizedString("Люди, которых вы можете знать", comment: "People You May Like"), action: {})
+                            SideMenuButton(icon: "person.2.fill", title: NSLocalizedString("Добавить друзей", comment: "Add friends"), action: {})
                             SideMenuButton(icon: "star.fill", title: NSLocalizedString("Fun Fest", comment: "Fun Fest"), action: {})
                             SideMenuButton(icon: "lightbulb.fill", title: NSLocalizedString("Центр авторов", comment: "Creator Center"), action: {})
                         }
+                        .padding(.top, topPadding)
 
                         Divider()
 
                         // Section 2
                         VStack(alignment: .leading, spacing: 7) {
-                            Text("CATEGORY").font(.caption2).foregroundColor(.secondary)
+//                            Text("CATEGORY").font(.caption2).foregroundColor(.secondary)
                             SideMenuButton(icon: "doc.text", title: NSLocalizedString("Черновики", comment: "Drafts"), action: {})
                             SideMenuButton(icon: "bubble.left", title: NSLocalizedString("Мои комментарии", comment: "My Comments"), action: {})
                             SideMenuButton(icon: "clock", title: NSLocalizedString("История", comment: "History"), action: {})
@@ -230,7 +143,7 @@ struct SideMenuView: View {
 
                         // Section 3
                         VStack(alignment: .leading, spacing: 7) {
-                            Text("SERVICES").font(.caption2).foregroundColor(.secondary)
+//                            Text("SERVICES").font(.caption2).foregroundColor(.secondary)
                             SideMenuButton(icon: "shippingbox", title: NSLocalizedString("Заказы", comment: "Orders"), action: {})
                             SideMenuButton(icon: "cart", title: NSLocalizedString("Корзина", comment: "Cart"), action: {})
                             SideMenuButton(icon: "wallet.pass", title: NSLocalizedString("Кошелёк", comment: "Wallet"), action: {})
@@ -252,24 +165,35 @@ struct SideMenuView: View {
             Spacer()
 
             // Footer
-            HStack(spacing: 20) {
+            HStack(spacing: 0) {
-                Spacer()
+                SideMenuFooterButton(
-                SideMenuFooterButton(icon: "qrcode.viewfinder", title: NSLocalizedString("Сканировать", comment: "Scan"), action: {})
+                    icon: "qrcode.viewfinder",
-                SideMenuFooterButton(icon: "questionmark.circle", title: NSLocalizedString("Центр помощи", comment: "Help Center")) {
+                    title: NSLocalizedString("Скан", comment: "Scan"),
+                    action: {}
+                )
+                Spacer(minLength: 40)
+                SideMenuFooterButton(
+                    icon: "questionmark.circle",
+                    title: NSLocalizedString("Помощь", comment: "Help Center")
+                ) {
                     withAnimation(.easeInOut) {
                         isPresented = false
                     }
                     navigateToFAQ = true
                 }
-                SideMenuFooterButton(icon: "gear", title: NSLocalizedString("Настройки", comment: "Settings")) {
+                Spacer(minLength: 40)
+                SideMenuFooterButton(
+                    icon: "gear",
+                    title: NSLocalizedString("Настройки", comment: "Settings")
+                ) {
                     withAnimation(.easeInOut) {
                         isPresented = false
                     }
                     navigateToSettings = true
                 }
-                Spacer()
             }
-            .padding()
+            .padding(.horizontal, 28)
+            .padding(.vertical)
             .padding(.bottom, bottomPadding)
         }
         .background(Color(UIColor.systemBackground))