Skip to content

Commit

Permalink
Prepare: 1.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@ayaysir
ayaysir committed Mar 6, 2024
1 parent 71f0891 commit 92a4b5f
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 19 deletions.
16 changes: 16 additions & 0 deletions MusicScale.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@
44E0ACF1285F0BC6008BBB82 /* NSLayoutConstraint+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44E0ACF0285F0BC6008BBB82 /* NSLayoutConstraint+.swift */; };
44E0ACF3285F3FCD008BBB82 /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44E0ACF2285F3FCC008BBB82 /* UIDevice+.swift */; };
44E6FDB62B9817F300FF6972 /* IAPHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44E6FDB52B9817F300FF6972 /* IAPHelper.swift */; };
44E6FDB92B985BA600FF6972 /* MusicScale - ShortcutTable - en.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 44E6FDB72B985BA600FF6972 /* MusicScale - ShortcutTable - en.pdf */; };
44E6FDBA2B985BA600FF6972 /* MusicScale - ShortcutTable - ko.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 44E6FDB82B985BA600FF6972 /* MusicScale - ShortcutTable - ko.pdf */; };
44E7A07528467692005C7909 /* SearchCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44E7A07428467692005C7909 /* SearchCategory.swift */; };
44EE68152853A80B00A6D810 /* Quiz_IntroVC와 InProgressVC에서 무한루프.md in Resources */ = {isa = PBXBuildFile; fileRef = 44EE68142853A80B00A6D810 /* Quiz_IntroVC와 InProgressVC에서 무한루프.md */; };
44EFA4B328541F0800565F93 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 44EFA4B228541F0800565F93 /* GoogleService-Info.plist */; };
Expand Down Expand Up @@ -356,6 +358,8 @@
44E0ACF0285F0BC6008BBB82 /* NSLayoutConstraint+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSLayoutConstraint+.swift"; sourceTree = "<group>"; };
44E0ACF2285F3FCC008BBB82 /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = "<group>"; };
44E6FDB52B9817F300FF6972 /* IAPHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IAPHelper.swift; sourceTree = "<group>"; };
44E6FDB72B985BA600FF6972 /* MusicScale - ShortcutTable - en.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "MusicScale - ShortcutTable - en.pdf"; sourceTree = "<group>"; };
44E6FDB82B985BA600FF6972 /* MusicScale - ShortcutTable - ko.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "MusicScale - ShortcutTable - ko.pdf"; sourceTree = "<group>"; };
44E7A07428467692005C7909 /* SearchCategory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchCategory.swift; sourceTree = "<group>"; };
44EE68142853A80B00A6D810 /* Quiz_IntroVC와 InProgressVC에서 무한루프.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = "Quiz_IntroVC와 InProgressVC에서 무한루프.md"; sourceTree = "<group>"; };
44EFA4B228541F0800565F93 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -426,6 +430,7 @@
440637F5283082A800875E77 /* ResourceData */ = {
isa = PBXGroup;
children = (
44E6FDBB2B985BB000FF6972 /* ShortcutTable */,
441E96F1286596F300261D43 /* Manual JPEG */,
4463FEBB282D61DC00E7A607 /* GeneralUser GS MuseScore v1.442.sf2 */,
4494B475293E41430009548C /* MusicScale - ko.pdf */,
Expand Down Expand Up @@ -853,6 +858,15 @@
path = IAP;
sourceTree = "<group>";
};
44E6FDBB2B985BB000FF6972 /* ShortcutTable */ = {
isa = PBXGroup;
children = (
44E6FDB72B985BA600FF6972 /* MusicScale - ShortcutTable - en.pdf */,
44E6FDB82B985BA600FF6972 /* MusicScale - ShortcutTable - ko.pdf */,
);
path = ShortcutTable;
sourceTree = "<group>";
};
44EE68132853A7DB00A6D810 /* Report */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1030,6 +1044,8 @@
441E97092865974900261D43 /* MusicScale - English.005.jpeg in Resources */,
441E970A2865974900261D43 /* MusicScale - English.002.jpeg in Resources */,
4494B477293E41440009548C /* MusicScale - ko.pdf in Resources */,
44E6FDB92B985BA600FF6972 /* MusicScale - ShortcutTable - en.pdf in Resources */,
44E6FDBA2B985BA600FF6972 /* MusicScale - ShortcutTable - ko.pdf in Resources */,
441E96E62864AD5600261D43 /* MusicScale - en.pdf in Resources */,
441E97032865974900261D43 /* MusicScale - English.001.jpeg in Resources */,
);
Expand Down
6 changes: 3 additions & 3 deletions MusicScale/Main/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Override point for customization after application launch.

// IAP Test only - Must be removed when distributing
if let firstProduct = InAppProducts.productIDs.first {
UserDefaults.standard.set(false, forKey: firstProduct)
}
// if let firstProduct = InAppProducts.productIDs.first {
// UserDefaults.standard.set(false, forKey: firstProduct)
// }

// in your AppDelegate's didFinishLaunching method so that the drop down will handle its display with the keyboard displayed even the first time a drop down is showed.
DropDown.startListeningToKeyboard()
Expand Down
35 changes: 28 additions & 7 deletions MusicScale/Main/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1460,7 +1460,7 @@
<rect key="frame" x="0.0" y="0.0" width="316.5" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Licenses" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mlg-Rx-erV">
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="New Features &amp; Shortcuts Table" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mlg-Rx-erV">
<rect key="frame" x="16" y="0.0" width="292.5" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="0.0"/>
Expand All @@ -1471,12 +1471,33 @@
</tableViewCellContentView>
<color key="tintColor" systemColor="systemGray3Color"/>
<connections>
<segue destination="YUB-VH-J3c" kind="show" identifier="LicenseSegue" id="M8x-He-tZN"/>
<segue destination="YUB-VH-J3c" kind="show" identifier="NewFeatureSegue" id="ejH-Eh-ga8"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="MYK-91-rGs" style="IBUITableViewCellStyleDefault" id="TQh-Bq-cgE">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Jym-0J-hpL" style="IBUITableViewCellStyleDefault" id="Xl4-fs-Jwe">
<rect key="frame" x="16" y="658.5" width="343" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Xl4-fs-Jwe" id="0al-P0-j8l">
<rect key="frame" x="0.0" y="0.0" width="316.5" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Licenses" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Jym-0J-hpL">
<rect key="frame" x="16" y="0.0" width="292.5" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="0.0"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
<color key="tintColor" systemColor="systemGray3Color"/>
<connections>
<segue destination="YUB-VH-J3c" kind="show" identifier="LicenseSegue" id="vqg-rm-2GU"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="MYK-91-rGs" style="IBUITableViewCellStyleDefault" id="TQh-Bq-cgE">
<rect key="frame" x="16" y="702" width="343" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TQh-Bq-cgE" id="dQA-bt-Eu2">
<rect key="frame" x="0.0" y="0.0" width="343" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
Expand All @@ -1493,7 +1514,7 @@
<color key="tintColor" systemColor="systemGray3Color"/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="SdA-3a-3ZF" style="IBUITableViewCellStyleDefault" id="nmX-lt-PIO">
<rect key="frame" x="16" y="702" width="343" height="43.5"/>
<rect key="frame" x="16" y="745.5" width="343" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nmX-lt-PIO" id="lvZ-OH-nq2">
<rect key="frame" x="0.0" y="0.0" width="343" height="43.5"/>
Expand All @@ -1511,7 +1532,7 @@
<color key="tintColor" systemColor="systemGray3Color"/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="ilC-iq-SWi" style="IBUITableViewCellStyleDefault" id="n5b-Oc-FP3">
<rect key="frame" x="16" y="745.5" width="343" height="43.5"/>
<rect key="frame" x="16" y="789" width="343" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="n5b-Oc-FP3" id="ehU-ha-MpD">
<rect key="frame" x="0.0" y="0.0" width="316.5" height="43.5"/>
Expand All @@ -1536,7 +1557,7 @@
<tableViewSection headerTitle="" id="V8T-jG-Tfa">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="50" id="9oY-9A-mky">
<rect key="frame" x="16" y="829" width="343" height="50"/>
<rect key="frame" x="16" y="872.5" width="343" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9oY-9A-mky" id="NgE-h3-jfm">
<rect key="frame" x="0.0" y="0.0" width="343" height="50"/>
Expand Down Expand Up @@ -3741,7 +3762,7 @@
</designable>
</designables>
<inferredMetricsTieBreakers>
<segue reference="M8x-He-tZN"/>
<segue reference="ejH-Eh-ga8"/>
<segue reference="6tl-C7-X1w"/>
<segue reference="2J2-cR-7Di"/>
</inferredMetricsTieBreakers>
Expand Down
4 changes: 3 additions & 1 deletion MusicScale/Main/ja.lproj/Main.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@
"lfh-7v-VfA.text" = "題名";

/* Class = "UILabel"; text = "Licenses"; ObjectID = "mlg-Rx-erV"; */
"mlg-Rx-erV.text" = "ライセンス";
"mlg-Rx-erV.text" = "新機能とショートカットテーブル";

/* Class = "UITableViewSection"; headerTitle = "Note List"; ObjectID = "nCv-Cl-OqY"; */
"nCv-Cl-OqY.headerTitle" = "ノートリスト";
Expand Down Expand Up @@ -583,3 +583,5 @@

/* 2024-03-06 */
"Uf2-uc-MQh.text" = "ピアノの上にHWキーを表示";

"Jym-0J-hpL.text" = "ライセンス";
4 changes: 3 additions & 1 deletion MusicScale/Main/ko.lproj/Main.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@
"lfh-7v-VfA.text" = "제목";

/* Class = "UILabel"; text = "Licenses"; ObjectID = "mlg-Rx-erV"; */
"mlg-Rx-erV.text" = "라이센스";
"mlg-Rx-erV.text" = "새로운 기능 & 단축키 표";

/* Class = "UITableViewSection"; headerTitle = "Note List"; ObjectID = "nCv-Cl-OqY"; */
"nCv-Cl-OqY.headerTitle" = "음표 목록";
Expand Down Expand Up @@ -584,3 +584,5 @@

/* 2024-03-06 */
"Uf2-uc-MQh.text" = "피아노에 하드웨어 키 표시";

"Jym-0J-hpL.text" = "라이선스";
21 changes: 18 additions & 3 deletions MusicScale/ViewController/Settings/PDFViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,31 @@ class PDFViewController: UIViewController {
@IBOutlet weak var pdfView: PDFView!

enum Category {
case help, licenses
case help, licenses, newFeatureAndShortcuts
}
var category: Category = .help

override func viewDidLoad() {
super.viewDidLoad()

self.title = category == .help ? "HELP" : "LICENSES"
self.title = switch category {
case .help:
"HELP"
case .licenses:
"LICENSES"
case .newFeatureAndShortcuts:
"New Features & Shortcut Table"
}

let fileName = switch category {
case .help:
"MusicScale_ManualFileName".localized()
case .licenses:
"MusicScale Licenses"
case .newFeatureAndShortcuts:
"MusicScale - ShortcutTable - en".localized()
}

let fileName = category == .help ? "MusicScale_ManualFileName".localized() : "MusicScale Licenses"
let url = Bundle.main.url(forResource: fileName, withExtension: "pdf")

pdfView.autoScales = true
Expand Down
8 changes: 4 additions & 4 deletions MusicScale/ViewController/Settings/SettingTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ class SettingTableViewController: UITableViewController {
private let restorePurchasesCellIndexPath = IndexPath(row: 0, section: 2)
private let firstIAPProductCellIndexPath = IndexPath(row: 1, section: 2)

private let githubLinkCell = IndexPath(row: 3, section: 3)
private let sendMailCell = IndexPath(row: 2, section: 3)
private let sendMailCell = IndexPath(row: 3, section: 3)
private let githubLinkCell = IndexPath(row: 4, section: 3)

private let SECTION_BANNER = 4
// ==============================================
Expand Down Expand Up @@ -66,9 +66,9 @@ class SettingTableViewController: UITableViewController {
let selectVC = segue.destination as! InstrumentTableViewController
let place = sender as! InstrumentTableViewController.Place
selectVC.place = place
case "HelpSegue", "LicenseSegue":
case "HelpSegue", "LicenseSegue", "NewFeatureSegue":
let webVC = segue.destination as! PDFViewController
webVC.category = segue.identifier == "HelpSegue" ? .help : .licenses
webVC.category = segue.identifier == "HelpSegue" ? .help : segue.identifier == "LicenseSegue" ? .licenses : .newFeatureAndShortcuts
default:
break
}
Expand Down
2 changes: 2 additions & 0 deletions MusicScale/ko.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,5 @@

"Success! Let’s keep this momentum going!" = "[확인] 성공했습니다! 이 기세를 이어갑시다!";
"Again! Let's try harder!" = "[다시 학습하기] 알겠습니다! 조금 더 분발합시다!";

"MusicScale - ShortcutTable - en" = "MusicScale - ShortcutTable - ko";

0 comments on commit 92a4b5f

Please sign in to comment.