Skip to content

Commit f8a9961

Browse files
authored
Merge pull request #35 from olearytd/issue-34
restyle UI, add button to record a manual loss, update stylization of…
2 parents 35c6787 + b40ffbb commit f8a9961

File tree

13 files changed

+496
-223
lines changed

13 files changed

+496
-223
lines changed

NightreignTimer.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
420420
CODE_SIGN_ENTITLEMENTS = NightreignTimer/NightreignTimer.entitlements;
421421
CODE_SIGN_STYLE = Automatic;
422-
CURRENT_PROJECT_VERSION = 1;
422+
CURRENT_PROJECT_VERSION = 2;
423423
DEVELOPMENT_TEAM = LCM5FMVWQD;
424424
ENABLE_PREVIEWS = YES;
425425
GENERATE_INFOPLIST_FILE = YES;
@@ -451,7 +451,7 @@
451451
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
452452
CODE_SIGN_ENTITLEMENTS = NightreignTimer/NightreignTimer.entitlements;
453453
CODE_SIGN_STYLE = Automatic;
454-
CURRENT_PROJECT_VERSION = 1;
454+
CURRENT_PROJECT_VERSION = 2;
455455
DEVELOPMENT_TEAM = LCM5FMVWQD;
456456
ENABLE_PREVIEWS = YES;
457457
GENERATE_INFOPLIST_FILE = YES;
@@ -680,7 +680,7 @@
680680
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
681681
CODE_SIGN_ENTITLEMENTS = NightreignWidgetExtension.entitlements;
682682
CODE_SIGN_STYLE = Automatic;
683-
CURRENT_PROJECT_VERSION = 1;
683+
CURRENT_PROJECT_VERSION = 2;
684684
DEVELOPMENT_TEAM = LCM5FMVWQD;
685685
GENERATE_INFOPLIST_FILE = YES;
686686
INFOPLIST_FILE = NightreignWidget/Info.plist;
@@ -708,7 +708,7 @@
708708
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
709709
CODE_SIGN_ENTITLEMENTS = NightreignWidgetExtension.entitlements;
710710
CODE_SIGN_STYLE = Automatic;
711-
CURRENT_PROJECT_VERSION = 1;
711+
CURRENT_PROJECT_VERSION = 2;
712712
DEVELOPMENT_TEAM = LCM5FMVWQD;
713713
GENERATE_INFOPLIST_FILE = YES;
714714
INFOPLIST_FILE = NightreignWidget/Info.plist;

NightreignTimer/ContentView.swift

Lines changed: 283 additions & 216 deletions
Large diffs are not rendered by default.

NightreignTimer/Resources/Localizable.xcstrings

Lines changed: 209 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sourceLanguage" : "en",
33
"strings" : {
4-
"%@, %@, %@": {
4+
"%@, %@, %@" : {
55
"localizations" : {
66
"en" : {
77
"stringUnit" : {
@@ -534,7 +534,7 @@
534534
}
535535
},
536536
"game_type" : {
537-
"comment" : "Game Type Selection",
537+
"comment" : "Game Type",
538538
"extractionState" : "stale",
539539
"localizations" : {
540540
"en" : {
@@ -739,6 +739,88 @@
739739
}
740740
}
741741
},
742+
"loss_recorded_message" : {
743+
"comment" : "Loss recorded message",
744+
"localizations" : {
745+
"en" : {
746+
"stringUnit" : {
747+
"state" : "translated",
748+
"value" : "Your session has been recorded and reset"
749+
}
750+
},
751+
"es-US" : {
752+
"stringUnit" : {
753+
"state" : "translated",
754+
"value" : "Tu sesión ha sido registrada y reiniciada."
755+
}
756+
},
757+
"fr" : {
758+
"stringUnit" : {
759+
"state" : "translated",
760+
"value" : "Votre session a été enregistrée et réinitialisée."
761+
}
762+
},
763+
"ja" : {
764+
"stringUnit" : {
765+
"state" : "translated",
766+
"value" : "セッションが記録され、リセットされました。"
767+
}
768+
},
769+
"ko" : {
770+
"stringUnit" : {
771+
"state" : "translated",
772+
"value" : "세션이 기록되고 초기화되었습니다."
773+
}
774+
},
775+
"zh-HK" : {
776+
"stringUnit" : {
777+
"state" : "translated",
778+
"value" : "你的會話已記錄並重設。"
779+
}
780+
}
781+
}
782+
},
783+
"loss_recorded_title" : {
784+
"comment" : "Loss recorded title",
785+
"localizations" : {
786+
"en" : {
787+
"stringUnit" : {
788+
"state" : "translated",
789+
"value" : "Loss Recorded"
790+
}
791+
},
792+
"es-US" : {
793+
"stringUnit" : {
794+
"state" : "translated",
795+
"value" : "Derrota registrada"
796+
}
797+
},
798+
"fr" : {
799+
"stringUnit" : {
800+
"state" : "translated",
801+
"value" : "Défaite enregistrée"
802+
}
803+
},
804+
"ja" : {
805+
"stringUnit" : {
806+
"state" : "translated",
807+
"value" : "敗北を記録"
808+
}
809+
},
810+
"ko" : {
811+
"stringUnit" : {
812+
"state" : "translated",
813+
"value" : "패배 기록됨"
814+
}
815+
},
816+
"zh-HK" : {
817+
"stringUnit" : {
818+
"state" : "translated",
819+
"value" : "已記錄失敗"
820+
}
821+
}
822+
}
823+
},
742824
"nightlord_battle" : {
743825
"extractionState" : "manual",
744826
"localizations" : {
@@ -985,6 +1067,47 @@
9851067
}
9861068
}
9871069
},
1070+
"ok" : {
1071+
"comment" : "OK",
1072+
"localizations" : {
1073+
"en" : {
1074+
"stringUnit" : {
1075+
"state" : "translated",
1076+
"value" : "Ok"
1077+
}
1078+
},
1079+
"es-US" : {
1080+
"stringUnit" : {
1081+
"state" : "translated",
1082+
"value" : "Aceptar"
1083+
}
1084+
},
1085+
"fr" : {
1086+
"stringUnit" : {
1087+
"state" : "translated",
1088+
"value" : "OK"
1089+
}
1090+
},
1091+
"ja" : {
1092+
"stringUnit" : {
1093+
"state" : "translated",
1094+
"value" : "OK"
1095+
}
1096+
},
1097+
"ko" : {
1098+
"stringUnit" : {
1099+
"state" : "translated",
1100+
"value" : "확인"
1101+
}
1102+
},
1103+
"zh-HK" : {
1104+
"stringUnit" : {
1105+
"state" : "translated",
1106+
"value" : "確定"
1107+
}
1108+
}
1109+
}
1110+
},
9881111
"pause" : {
9891112
"extractionState" : "manual",
9901113
"localizations" : {
@@ -1190,6 +1313,48 @@
11901313
}
11911314
}
11921315
},
1316+
"record_loss" : {
1317+
"comment" : "Record loss manually",
1318+
"extractionState" : "manual",
1319+
"localizations" : {
1320+
"en" : {
1321+
"stringUnit" : {
1322+
"state" : "translated",
1323+
"value" : "Record Loss"
1324+
}
1325+
},
1326+
"es-US" : {
1327+
"stringUnit" : {
1328+
"state" : "translated",
1329+
"value" : "Registrar derrota"
1330+
}
1331+
},
1332+
"fr" : {
1333+
"stringUnit" : {
1334+
"state" : "translated",
1335+
"value" : "Enregistrer la défaite"
1336+
}
1337+
},
1338+
"ja" : {
1339+
"stringUnit" : {
1340+
"state" : "translated",
1341+
"value" : "敗北を記録"
1342+
}
1343+
},
1344+
"ko" : {
1345+
"stringUnit" : {
1346+
"state" : "translated",
1347+
"value" : "패배 기록"
1348+
}
1349+
},
1350+
"zh-HK" : {
1351+
"stringUnit" : {
1352+
"state" : "translated",
1353+
"value" : "記錄失敗"
1354+
}
1355+
}
1356+
}
1357+
},
11931358
"records" : {
11941359
"comment" : "Records",
11951360
"localizations" : {
@@ -1600,6 +1765,47 @@
16001765
}
16011766
}
16021767
},
1768+
"session_saved" : {
1769+
"comment" : "Confirmation after saving a session",
1770+
"localizations" : {
1771+
"en" : {
1772+
"stringUnit" : {
1773+
"state" : "translated",
1774+
"value" : "Session Saved!"
1775+
}
1776+
},
1777+
"es-US" : {
1778+
"stringUnit" : {
1779+
"state" : "translated",
1780+
"value" : "¡Sesión guardada!"
1781+
}
1782+
},
1783+
"fr" : {
1784+
"stringUnit" : {
1785+
"state" : "translated",
1786+
"value" : "Session enregistrée !"
1787+
}
1788+
},
1789+
"ja" : {
1790+
"stringUnit" : {
1791+
"state" : "translated",
1792+
"value" : "セッションが保存されました!"
1793+
}
1794+
},
1795+
"ko" : {
1796+
"stringUnit" : {
1797+
"state" : "translated",
1798+
"value" : "세션이 저장되었습니다!"
1799+
}
1800+
},
1801+
"zh-HK" : {
1802+
"stringUnit" : {
1803+
"state" : "translated",
1804+
"value" : "會話已保存!"
1805+
}
1806+
}
1807+
}
1808+
},
16031809
"settings" : {
16041810
"comment" : "Settings label",
16051811
"localizations" : {
@@ -2340,4 +2546,4 @@
23402546
}
23412547
},
23422548
"version" : "1.0"
2343-
}
2549+
}
9.26 KB
Loading
3.51 KB
Loading
642 KB
Loading
18.6 KB
Loading
Binary file not shown.
24 KB
Loading
13.3 KB
Loading

0 commit comments

Comments
 (0)