From 8f7c9ed36e1950b963e0906ffcab3ea99c273998 Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Sun, 19 May 2024 11:42:00 +0900 Subject: [PATCH 1/7] [feat] add ComingSoonModifier --- NinjacordApp.xcodeproj/project.pbxproj | 12 ++++++++++ NinjacordApp/Common/ComingSoonModifier.swift | 23 ++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 NinjacordApp/Common/ComingSoonModifier.swift diff --git a/NinjacordApp.xcodeproj/project.pbxproj b/NinjacordApp.xcodeproj/project.pbxproj index e4a36e0..1347a1b 100644 --- a/NinjacordApp.xcodeproj/project.pbxproj +++ b/NinjacordApp.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 4F6F9FB22BEBDEE40033AFB7 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 4F6F9FB12BEBDEE40033AFB7 /* Localizable.xcstrings */; }; 4F7248F32BE825D2004FD3DC /* BannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7248F22BE825D2004FD3DC /* BannerViewController.swift */; }; 4F7248F62BE827DF004FD3DC /* BannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7248F52BE827DF004FD3DC /* BannerView.swift */; }; + 4F8F72372BF99E0D00EB1869 /* ComingSoonModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F8F72362BF99E0D00EB1869 /* ComingSoonModifier.swift */; }; 4FAB6FF22BE1923F00B2F33A /* swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = 4FAB6FF12BE1923F00B2F33A /* swiftlint.yml */; }; 4FAB6FFB2BE1C53B00B2F33A /* WebhookURLSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FAB6FFA2BE1C53B00B2F33A /* WebhookURLSettingView.swift */; }; 4FD55D492BE6F04700581F34 /* FirebaseAnalytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FD55D482BE6F04700581F34 /* FirebaseAnalytics.swift */; }; @@ -61,6 +62,7 @@ 4F6F9FB12BEBDEE40033AFB7 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = ""; }; 4F7248F22BE825D2004FD3DC /* BannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerViewController.swift; sourceTree = ""; }; 4F7248F52BE827DF004FD3DC /* BannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerView.swift; sourceTree = ""; }; + 4F8F72362BF99E0D00EB1869 /* ComingSoonModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComingSoonModifier.swift; sourceTree = ""; }; 4FAB6FF12BE1923F00B2F33A /* swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = swiftlint.yml; sourceTree = ""; }; 4FAB6FF72BE1A04D00B2F33A /* ci_post_clone.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ci_post_clone.sh; sourceTree = ""; }; 4FAB6FFA2BE1C53B00B2F33A /* WebhookURLSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebhookURLSettingView.swift; sourceTree = ""; }; @@ -108,6 +110,7 @@ isa = PBXGroup; children = ( 4FF2FEA32BDFAEC300973FDA /* Extension */, + 4F8F72352BF99DD600EB1869 /* Common */, 4F6755532BE008BC00F2629B /* AppDelegate.swift */, 4F5072B72BCF901E0005D352 /* NinjacordApp.swift */, 4F435C8D2BE115650087CEE3 /* MainView.swift */, @@ -159,6 +162,14 @@ path = AdMob; sourceTree = ""; }; + 4F8F72352BF99DD600EB1869 /* Common */ = { + isa = PBXGroup; + children = ( + 4F8F72362BF99E0D00EB1869 /* ComingSoonModifier.swift */, + ); + path = Common; + sourceTree = ""; + }; 4FAB6FF62BE1A01B00B2F33A /* ci_scripts */ = { isa = PBXGroup; children = ( @@ -314,6 +325,7 @@ 4FD55D502BE701FE00581F34 /* PrivacyPolicyView.swift in Sources */, 4FD55D4B2BE6F92400581F34 /* AppInfo.swift in Sources */, 4F5C1BF52BDDDC2C001C9A51 /* SendMessageViewModel.swift in Sources */, + 4F8F72372BF99E0D00EB1869 /* ComingSoonModifier.swift in Sources */, 4F6F9FAD2BEB9C820033AFB7 /* Extension+Color.swift in Sources */, 4F3A7B552BE836BF0046765E /* Extension+View.swift in Sources */, 4FF2FEA52BDFAF4F00973FDA /* Extension+TextFieldStyle.swift in Sources */, diff --git a/NinjacordApp/Common/ComingSoonModifier.swift b/NinjacordApp/Common/ComingSoonModifier.swift new file mode 100644 index 0000000..08fe89d --- /dev/null +++ b/NinjacordApp/Common/ComingSoonModifier.swift @@ -0,0 +1,23 @@ +// +// ComingSoonModifier.swift +// NinjacordApp +// +// Created by 村石 拓海 on 2024/05/19. +// + +import SwiftUI + +struct ComingSoonModifier: ViewModifier { + func body(content: Content) -> some View { + HStack { + content + Text(" (近日公開)") + } + } +} + +extension View { + func addComingSoon() -> some View { + self.modifier(ComingSoonModifier()) + } +} From ce29e9352afe80db0148611764e5d0bf894ffbdb Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Sun, 19 May 2024 11:45:53 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[feat]=20addComingSoon=E3=82=92=E9=81=A9?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NinjacordApp/Common/ComingSoonModifier.swift | 2 +- NinjacordApp/Localizable.xcstrings | 3 +++ NinjacordApp/Setting/SettingView.swift | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NinjacordApp/Common/ComingSoonModifier.swift b/NinjacordApp/Common/ComingSoonModifier.swift index 08fe89d..099f5ca 100644 --- a/NinjacordApp/Common/ComingSoonModifier.swift +++ b/NinjacordApp/Common/ComingSoonModifier.swift @@ -9,7 +9,7 @@ import SwiftUI struct ComingSoonModifier: ViewModifier { func body(content: Content) -> some View { - HStack { + HStack(spacing: .zero) { content Text(" (近日公開)") } diff --git a/NinjacordApp/Localizable.xcstrings b/NinjacordApp/Localizable.xcstrings index 719d6e9..a416861 100644 --- a/NinjacordApp/Localizable.xcstrings +++ b/NinjacordApp/Localizable.xcstrings @@ -3,6 +3,9 @@ "strings" : { "" : { + }, + " (近日公開)" : { + }, "URLを入れてください" : { "localizations" : { diff --git a/NinjacordApp/Setting/SettingView.swift b/NinjacordApp/Setting/SettingView.swift index 7c8a492..be10f26 100644 --- a/NinjacordApp/Setting/SettingView.swift +++ b/NinjacordApp/Setting/SettingView.swift @@ -26,6 +26,7 @@ struct SettingView: View { isURLSettingPresented = true } label: { Text("URL設定 (近日公開)") + .addComingSoon() .foregroundStyle(.white) } .listRowBackground(Color.discordGray) From 3200889b25df676df04df933eecb2ed497c757e9 Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Sun, 19 May 2024 11:47:18 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[feat]=20=E8=BF=91=E6=97=A5=E5=85=AC?= =?UTF-8?q?=E9=96=8B=20=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NinjacordApp/Localizable.xcstrings | 5 +++-- NinjacordApp/Setting/SettingView.swift | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NinjacordApp/Localizable.xcstrings b/NinjacordApp/Localizable.xcstrings index a416861..98e4a82 100644 --- a/NinjacordApp/Localizable.xcstrings +++ b/NinjacordApp/Localizable.xcstrings @@ -40,6 +40,7 @@ } }, "URL設定 (近日公開)" : { + "extractionState" : "stale", "localizations" : { "en" : { "stringUnit" : { @@ -88,7 +89,6 @@ } }, "このアプリについて" : { - "extractionState" : "stale", "localizations" : { "en" : { "stringUnit" : { @@ -105,6 +105,7 @@ } }, "このアプリについて (近日公開)" : { + "extractionState" : "stale", "localizations" : { "en" : { "stringUnit" : { @@ -185,7 +186,6 @@ } }, "ライセンス" : { - "extractionState" : "stale", "localizations" : { "en" : { "stringUnit" : { @@ -202,6 +202,7 @@ } }, "ライセンス (近日公開)" : { + "extractionState" : "stale", "localizations" : { "en" : { "stringUnit" : { diff --git a/NinjacordApp/Setting/SettingView.swift b/NinjacordApp/Setting/SettingView.swift index be10f26..1e6c225 100644 --- a/NinjacordApp/Setting/SettingView.swift +++ b/NinjacordApp/Setting/SettingView.swift @@ -25,7 +25,7 @@ struct SettingView: View { Button { isURLSettingPresented = true } label: { - Text("URL設定 (近日公開)") + Text("URL設定") .addComingSoon() .foregroundStyle(.white) } @@ -40,7 +40,7 @@ struct SettingView: View { }) Section(content: { - Text("このアプリについて (近日公開)") + Text("このアプリについて") .foregroundStyle(.white) .listRowBackground(Color.discordGray) @@ -62,7 +62,7 @@ struct SettingView: View { PrivacyPolicyView() } - Text("ライセンス (近日公開)") + Text("ライセンス") .foregroundStyle(.white) .listRowBackground(Color.discordGray) From 69727dc66e0849e1a5e82c4114f5c2c769b71b56 Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Sun, 19 May 2024 11:49:43 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[feat]=20=E8=BF=91=E6=97=A5=E5=85=AC?= =?UTF-8?q?=E9=96=8B=E3=81=AE=E3=81=A4=E3=81=84=E3=81=9FLocalizeKey?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NinjacordApp/Localizable.xcstrings | 51 ------------------------------ 1 file changed, 51 deletions(-) diff --git a/NinjacordApp/Localizable.xcstrings b/NinjacordApp/Localizable.xcstrings index 98e4a82..1ec1395 100644 --- a/NinjacordApp/Localizable.xcstrings +++ b/NinjacordApp/Localizable.xcstrings @@ -39,23 +39,6 @@ } } }, - "URL設定 (近日公開)" : { - "extractionState" : "stale", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "URL Setting (Coming Soon)" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "URL設定 (近日公開)" - } - } - } - }, "アプリバージョン" : { "localizations" : { "en" : { @@ -104,23 +87,6 @@ } } }, - "このアプリについて (近日公開)" : { - "extractionState" : "stale", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "About this App (Coming Soon)" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "このアプリについて (近日公開)" - } - } - } - }, "プライバシーポリシー" : { "localizations" : { "en" : { @@ -201,23 +167,6 @@ } } }, - "ライセンス (近日公開)" : { - "extractionState" : "stale", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "License (Coming Soon)" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "ライセンス (近日公開)" - } - } - } - }, "名前を入れてください" : { "localizations" : { "en" : { From 770f2fed16b51a9ccabae72f0e6742098b7dfbd8 Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Sun, 19 May 2024 11:51:27 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[feat]=20=E8=BF=91=E6=97=A5=E5=85=AC?= =?UTF-8?q?=E9=96=8B=20=E3=82=AD=E3=83=BC=E3=81=AE=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=82=A4=E3=82=BA=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NinjacordApp/Localizable.xcstrings | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/NinjacordApp/Localizable.xcstrings b/NinjacordApp/Localizable.xcstrings index 1ec1395..f1f941c 100644 --- a/NinjacordApp/Localizable.xcstrings +++ b/NinjacordApp/Localizable.xcstrings @@ -5,7 +5,20 @@ }, " (近日公開)" : { - + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : " (Coming Soon)" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : " (近日公開)" + } + } + } }, "URLを入れてください" : { "localizations" : { From 0ae00f258c63c0a61fa12601883fe31e6877b59b Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Sun, 19 May 2024 11:52:35 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[feat]=20=E3=83=AD=E3=83=BC=E3=82=AB?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=BA=E3=81=AEneed=20review=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NinjacordApp/Localizable.xcstrings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NinjacordApp/Localizable.xcstrings b/NinjacordApp/Localizable.xcstrings index f1f941c..c37d4c4 100644 --- a/NinjacordApp/Localizable.xcstrings +++ b/NinjacordApp/Localizable.xcstrings @@ -30,7 +30,7 @@ }, "ja" : { "stringUnit" : { - "state" : "needs_review", + "state" : "translated", "value" : "URLを入れてください" } } From b617b3c1981cd3ce31cf927dc252b29ac637cf30 Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Sun, 19 May 2024 11:54:06 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[feat]=20=E3=82=A2=E3=83=97=E3=83=AA?= =?UTF-8?q?=E8=AA=AC=E6=98=8E=E3=81=A8=E3=83=A9=E3=82=A4=E3=82=BB=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=81=ABComing=20Soon=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NinjacordApp/Setting/SettingView.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NinjacordApp/Setting/SettingView.swift b/NinjacordApp/Setting/SettingView.swift index 1e6c225..939a38a 100644 --- a/NinjacordApp/Setting/SettingView.swift +++ b/NinjacordApp/Setting/SettingView.swift @@ -41,6 +41,7 @@ struct SettingView: View { Section(content: { Text("このアプリについて") + .addComingSoon() .foregroundStyle(.white) .listRowBackground(Color.discordGray) @@ -63,6 +64,7 @@ struct SettingView: View { } Text("ライセンス") + .addComingSoon() .foregroundStyle(.white) .listRowBackground(Color.discordGray)