Merge branch 'main' into feature/miharun

mnaruse · mnaruse · commit fc9b75afca8b · 2024-03-13T00:42:32.000+09:00
# Conflicts:
#	MyLibrary/Sources/DataClient/Resources/organizers.json
#	MyLibrary/Sources/trySwiftFeature/Localizable.xcstrings
diff --git a/MyLibrary/Sources/DataClient/Resources/day1.json b/MyLibrary/Sources/DataClient/Resources/day1.json
@@ -41,8 +41,8 @@
               "bio": "He was fascinated by the smooth and beautiful UI of Mac OS X and started working with Cocoa to create it by himself. After working as a commercial iOS developer, he now works as a software designer and architect, aiming to create beautiful software with smooth UI. He is also a member of \"macOS native\" community organizers.",
               "links": [
                 {
-                  "url": "https://twitter.com/usagimaru_dev",
-                  "name": "@usagimaru"
+                  "url": "https://twitter.com/usagimaruma",
+                  "name": "@usagimaruma"
                 }
               ]
             }
diff --git a/MyLibrary/Sources/DataClient/Resources/organizers.json b/MyLibrary/Sources/DataClient/Resources/organizers.json
@@ -62,5 +62,21 @@
         "url": "https://github.com/mnaruse"
       }
     ]
+  },
+  {
+    "id": 5,
+    "name": "Naoki Muramoto",
+    "image_name": "Naoki",
+    "bio": "Naoki is a 3rd year software engineer working in Tokyo who loves Swift.\nHe loves beer and often drinks it when he's not working.",
+    "links": [
+      {
+        "name": "@naoki_mrmt",
+        "url": "https://x.com/naoki_mrmt"
+      },
+      {
+        "name": "@naoki-mrmt",
+        "url": "https://github.com/naoki-mrmt"
+      }
+    ]
   }
 ]
diff --git a/MyLibrary/Sources/ScheduleFeature/Detail.swift b/MyLibrary/Sources/ScheduleFeature/Detail.swift
@@ -102,6 +102,7 @@ public struct ScheduleDetailView: View {
     }
     .sheet(item: $store.scope(state: \.destination?.safari, action: \.destination.safari)) { sheetStore in
       SafariViewRepresentation(url: sheetStore.url)
+        .ignoresSafeArea()
     }
   }
 
diff --git a/MyLibrary/Sources/ScheduleFeature/Schedule.swift b/MyLibrary/Sources/ScheduleFeature/Schedule.swift
@@ -118,6 +118,7 @@ public struct ScheduleView: View {
     }
     .sheet(item: $store.scope(state: \.destination?.guidance, action: \.destination.guidance)) { sheetStore in
       SafariViewRepresentation(url: sheetStore.url)
+        .ignoresSafeArea()
     }
   }
 
diff --git a/MyLibrary/Sources/trySwiftFeature/Localizable.xcstrings b/MyLibrary/Sources/trySwiftFeature/Localizable.xcstrings
@@ -106,6 +106,17 @@
         }
       }
     },
+    "Naoki is a 3rd year software engineer working in Tokyo who loves Swift.\nHe loves beer and often drinks it when he's not working." : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Swiftが好きな東京で働いている3年目のソフトウェアエンジニアです。\nビールが大好きで、仕事以外でもよく飲んでいます。"
+          }
+        }
+      }
+    },
     "Natasha is an iOS developer by day and a robot by night. She organizes the try! Swift Conference around the world (including this one!). She's currently living the digital nomad life as her alter identity: @NatashaTheNomad." : {
       "extractionState" : "manual",
       "localizations" : {
diff --git a/MyLibrary/Sources/trySwiftFeature/Media.xcassets/Naoki.imageset/500x500.png b/MyLibrary/Sources/trySwiftFeature/Media.xcassets/Naoki.imageset/500x500.png
diff --git a/MyLibrary/Sources/trySwiftFeature/Media.xcassets/Naoki.imageset/Contents.json b/MyLibrary/Sources/trySwiftFeature/Media.xcassets/Naoki.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "500x500.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/MyLibrary/Sources/trySwiftFeature/Organizers.swift b/MyLibrary/Sources/trySwiftFeature/Organizers.swift
@@ -59,16 +59,17 @@ public struct OrganizersView: View {
   public var body: some View {
     List {
       ForEach(store.organizers) { organizer in
-        Label {
-          Text(LocalizedStringKey(organizer.name), bundle: .module)
-        } icon: {
-          Image(organizer.imageName, bundle: .module)
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .clipShape(Circle())
-        }
-        .onTapGesture {
+        Button {
           send(._organizerTapped(organizer))
+        } label: {
+          Label {
+            Text(LocalizedStringKey(organizer.name), bundle: .module)
+          } icon: {
+            Image(organizer.imageName, bundle: .module)
+              .resizable()
+              .aspectRatio(contentMode: .fit)
+              .clipShape(Circle())
+          }
         }
       }
     }
diff --git a/MyLibrary/Sources/trySwiftFeature/Profile.swift b/MyLibrary/Sources/trySwiftFeature/Profile.swift
@@ -86,7 +86,7 @@ public struct ProfileView: View {
           .padding()
           .frame(maxWidth: 700)
       }
-      .navigationTitle(store.organizer.name)
+      .navigationTitle(Text(LocalizedStringKey(store.organizer.name), bundle: .module))
     }
     .sheet(item: $store.scope(state: \.destination?.safari, action: \.destination.safari)) { sheetStore in
       SafariViewRepresentation(url: sheetStore.url)

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@`
`41`	`41`	`"bio": "He was fascinated by the smooth and beautiful UI of Mac OS X and started working with Cocoa to create it by himself. After working as a commercial iOS developer, he now works as a software designer and architect, aiming to create beautiful software with smooth UI. He is also a member of \"macOS native\" community organizers.",`
`42`	`42`	`"links": [`
`43`	`43`	`{`
`44`		`- "url": "https://twitter.com/usagimaru_dev",`
`45`		`- "name": "@usagimaru"`
	`44`	`+ "url": "https://twitter.com/usagimaruma",`
	`45`	`+ "name": "@usagimaruma"`
`46`	`46`	`}`
`47`	`47`	`]`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,21 @@`
`62`	`62`	`"url": "https://github.com/mnaruse"`
`63`	`63`	`}`
`64`	`64`	`]`
	`65`	`+ },`
	`66`	`+ {`
	`67`	`+ "id": 5,`
	`68`	`+ "name": "Naoki Muramoto",`
	`69`	`+ "image_name": "Naoki",`
	`70`	`+ "bio": "Naoki is a 3rd year software engineer working in Tokyo who loves Swift.\nHe loves beer and often drinks it when he's not working.",`
	`71`	`+ "links": [`
	`72`	`+ {`
	`73`	`+ "name": "@naoki_mrmt",`
	`74`	`+ "url": "https://x.com/naoki_mrmt"`
	`75`	`+ },`
	`76`	`+ {`
	`77`	`+ "name": "@naoki-mrmt",`
	`78`	`+ "url": "https://github.com/naoki-mrmt"`
	`79`	`+ }`
	`80`	`+ ]`
`65`	`81`	`}`
`66`	`82`	`]`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public struct ScheduleDetailView: View {`
`102`	`102`	`}`
`103`	`103`	`.sheet(item: $store.scope(state: \.destination?.safari, action: \.destination.safari)) { sheetStore in`
`104`	`104`	`SafariViewRepresentation(url: sheetStore.url)`
	`105`	`+ .ignoresSafeArea()`
`105`	`106`	`}`
`106`	`107`	`}`
`107`	`108`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ public struct ScheduleView: View {`
`118`	`118`	`}`
`119`	`119`	`.sheet(item: $store.scope(state: \.destination?.guidance, action: \.destination.guidance)) { sheetStore in`
`120`	`120`	`SafariViewRepresentation(url: sheetStore.url)`
	`121`	`+ .ignoresSafeArea()`
`121`	`122`	`}`
`122`	`123`	`}`
`123`	`124`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public struct ProfileView: View {`
`86`	`86`	`.padding()`
`87`	`87`	`.frame(maxWidth: 700)`
`88`	`88`	`}`
`89`		`- .navigationTitle(store.organizer.name)`
	`89`	`+ .navigationTitle(Text(LocalizedStringKey(store.organizer.name), bundle: .module))`
`90`	`90`	`}`
`91`	`91`	`.sheet(item: $store.scope(state: \.destination?.safari, action: \.destination.safari)) { sheetStore in`
`92`	`92`	`SafariViewRepresentation(url: sheetStore.url)`