[Misc] Minor UI improvements on iPad.

honganhkhoa · Feb 25, 2024 · daf3295 · daf3295
1 parent 79a2172
commit daf3295
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/Surround/Localizable.xcstrings b/Surround/Localizable.xcstrings
@@ -112,12 +112,6 @@
     "**%@** of total play time for each player." : {
       "comment" : "TimeControl - long description for absolute system",
       "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Thời gian suy nghĩ **%@** cho mỗi bên."
-          }
-        },
         "vi" : {
           "stringUnit" : {
             "state" : "translated",
@@ -6210,7 +6204,7 @@
       }
     },
     "Waiting for opponent: %lld games " : {
-      "comment" : "NewGameView - vary for plural\nHomeView - vary for plural",
+      "comment" : "HomeView - vary for plural\nNewGameView - vary for plural",
       "localizations" : {
         "en" : {
           "variations" : {
@@ -6767,7 +6761,7 @@
       }
     },
     "Your move" : {
-      "comment" : "Homeview\nGame",
+      "comment" : "Game\nHomeview",
       "localizations" : {
         "ja" : {
           "stringUnit" : {

diff --git a/Surround/Views/GameDetail/AnalyzeTreeView.swift b/Surround/Views/GameDetail/AnalyzeTreeView.swift
@@ -45,6 +45,7 @@ struct AnalyzeTreeSlice: View {
                                 .onTapGesture {
                                     self.selectedPosition = position
                                 }
+                                .position(x: 15, y: 15)
                         }
                     }
 //                    else {
@@ -186,7 +187,7 @@ struct AnalyzeTreeView: View {
                                 }
                             }
                         }
-                    }
+                    }.frame(minHeight: geometry.size.height)
                 }.frame(minHeight: geometry.size.height)
             }.frame(height: geometry.size.height)
         }

diff --git a/Surround/Views/GameDetail/GameDetailView.swift b/Surround/Views/GameDetail/GameDetailView.swift
@@ -27,6 +27,8 @@ struct GameDetailView: View {
     @State var analyzeMode = false
 
     @ObservedObject var settings = userDefaults
+
+    var showsActiveGamesCarouselSetting = Setting(.showsActiveGamesCarousel).binding
 
     var shouldShowActiveGamesCarousel: Bool {
         guard !zenMode else {
@@ -271,7 +273,7 @@ struct GameDetailView: View {
             return AnyView(
                 result.toolbar {
                     ToolbarItem(placement: .navigationBarTrailing) {
-                        Button(action: { withAnimation { analyzeMode.toggle() } }) {
+                        Toggle(isOn: $analyzeMode.animation()) {
                             if currentGame.analysisAvailable {
                                 Label("Toggle analyze mode", systemImage: "arrow.triangle.branch")
                                     .labelStyle(IconOnlyLabelStyle())
@@ -282,16 +284,16 @@ struct GameDetailView: View {
                         }
                     }
                     ToolbarItem(placement: .navigationBarTrailing) {
-                        Button(action: {
-                            withAnimation {
-                                if analyzeMode {
-                                    analyzeMode.toggle()
-                                    Setting(.showsActiveGamesCarousel).binding.wrappedValue = true
-                                } else {
-                                    Setting(.showsActiveGamesCarousel).binding.wrappedValue.toggle()
+                        Toggle(isOn: Binding<Bool>(
+                            get: { showsActiveGamesCarouselSetting.wrappedValue },
+                            set: { newValue in
+                                withAnimation {
+                                    if newValue && analyzeMode {
+                                        analyzeMode.toggle()
+                                    }
+                                    showsActiveGamesCarouselSetting.wrappedValue = newValue
                                 }
-                            }
-                        }) {
+                            })) {
                             Label("Toggle thumbnails", systemImage: "rectangle.topthird.inset")
                                 .labelStyle(IconOnlyLabelStyle())
                         }