From b8d2c64d8a67ce24f199f5c77199e8ed161f625f Mon Sep 17 00:00:00 2001 From: Isao Takeyasu Date: Sun, 14 Mar 2021 11:13:31 +0900 Subject: [PATCH 1/5] Update RMMatureCreatureRobotController.m On iOS11 or upper, additional permission alert is necessary to access PhotoLibrary. --- .../RMMatureCreatureRobotController.m | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/Creature/RMMatureCreatureRobotController.m b/src/Creature/RMMatureCreatureRobotController.m index ab4c8bf3..fc08b373 100644 --- a/src/Creature/RMMatureCreatureRobotController.m +++ b/src/Creature/RMMatureCreatureRobotController.m @@ -7,6 +7,7 @@ // #import "RMMatureCreatureRobotController.h" +#import "Photos/Photos.h" #import #import @@ -491,6 +492,31 @@ - (RMMotionDetectionModule *)motionDetectionModule - (void)requestPhotoLibraryPermission { + UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Error" + message:@"Please allow to access PhotoLibrary" + preferredStyle:UIAlertControllerStyleAlert]; + [alert addAction:[UIAlertAction actionWithTitle:@"OK" + style:UIAlertActionStyleDefault handler:nil]]; + + switch ([PHPhotoLibrary authorizationStatus]) { + case PHAuthorizationStatusNotDetermined: { + // In case of unpermitted + [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status){ + switch (status) { + case PHAuthorizationStatusRestricted: + case PHAuthorizationStatusDenied: + // Alert + [self presentViewController:alert animated:YES completion:nil]; + break; + + default: + break; + } + }]; + break; + } + } + // By creating and showing a UIImagePickerController, the user will be // prompted to allow photo access UIImagePickerController *picker = [[UIImagePickerController alloc] init]; From 0cec158007e2689a5319a4dbf74ffafa52371d63 Mon Sep 17 00:00:00 2001 From: Isao Takeyasu Date: Sun, 14 Mar 2021 11:32:55 +0900 Subject: [PATCH 2/5] Fix a text resource mistake. --- Languages/ja.lproj/CharacterScripts.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Languages/ja.lproj/CharacterScripts.strings b/Languages/ja.lproj/CharacterScripts.strings index 4608e7f2..3f5e54e4 100755 --- a/Languages/ja.lproj/CharacterScripts.strings +++ b/Languages/ja.lproj/CharacterScripts.strings @@ -713,7 +713,7 @@ "Now go build%nyour track!" = "自分のコース%nをつくりに行こう！"; /* LineFollow-Introduction-First-Run DO NOT See Video */ -"Okay, I'll leave you to%nbuild your track." = "よし、コース作りは%n{userName}にまかせるね"; +"Okay, I'll leave you to%nbuild your track." = "よし、コース作りは%n${userName}にまかせるね"; /* LineFollow-Introduction-First-Run Ask them to let Romo know when they are done! */ "Tell me when you're%ndone building." = "作りおわったら%n教えてね"; From 3d03154f93dc4902aece37313f2de3a0b8c68f35 Mon Sep 17 00:00:00 2001 From: Isao Takeyasu Date: Sun, 14 Mar 2021 11:39:54 +0900 Subject: [PATCH 3/5] Fix a text resource --- Languages/ja.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Languages/ja.lproj/Localizable.strings b/Languages/ja.lproj/Localizable.strings index 248fe24f..decb5747 100755 --- a/Languages/ja.lproj/Localizable.strings +++ b/Languages/ja.lproj/Localizable.strings @@ -599,7 +599,7 @@ "FavColor-WrongColorPrompt1" = "ちがうよ！考えつづけてね！"; /* FavColor-WrongColorPrompt10 */ -"FavColor-WrongColorPrompt10" = "ちがうけど、それは{userName}の\n好きな色？"; +"FavColor-WrongColorPrompt10" = "ちがうけど、それは${userName}の\n好きな色？"; /* FavColor-WrongColorPrompt11 */ "FavColor-WrongColorPrompt11" = "うーん…その色じゃないよ"; From 3032721d3265d879552487078c0acef80e4d2cec Mon Sep 17 00:00:00 2001 From: Isao Takeyasu Date: Sun, 14 Mar 2021 12:04:26 +0900 Subject: [PATCH 4/5] Remove "userName" from some text resources which are not supported keyword replace. --- Languages/ja.lproj/CharacterScripts.strings | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Languages/ja.lproj/CharacterScripts.strings b/Languages/ja.lproj/CharacterScripts.strings index 3f5e54e4..88ad52c0 100755 --- a/Languages/ja.lproj/CharacterScripts.strings +++ b/Languages/ja.lproj/CharacterScripts.strings @@ -251,7 +251,7 @@ "Oh, right!" = "あ、そうだ！"; /* Character-Script-1000-0 Push The Lab. */ -"Well, everything you taught me%nis unlocked in The Lab!" = "${userName}が教えてくれたことは全て%nじっけん室で使って遊べるよ！"; +"Well, everything you taught me%nis unlocked in The Lab!" = "キミが教えてくれたことは全て%nじっけん室で使って遊べるよ！"; /* Character-Script-1000-0 Explain Romo Control. */ "Really?" = "ほんとう？"; @@ -335,7 +335,7 @@ "Let's play%nPeek-a-Boo!" = "いないいないばあを%nして遊ぼう！"; /* Character-Script-2-4 Ask to see their face */ -"Lemme see%nyour face." = "${userName}の顔を見せて"; +"Lemme see%nyour face." = "キミの顔を見せて"; /* Character-Script-2-4 play */ "Now cover%nyour face." = "つぎは顔をかくして"; @@ -347,7 +347,7 @@ "I missed ya,%n${userName}!" = "キミがいないとさみしいよ、%n${userName}！"; /* Character-Script-2-4 */ -"Now I know%nhow to follow your face." = "${userName}の顔を追いかける%nやりかたがわかったよ"; +"Now I know%nhow to follow your face." = "キミの顔を追いかける%nやりかたがわかったよ"; /* Character-Script-2-5 Ask to be removed from base */ "Getting un-docked%n feels...%n" = "ドックからはずされてると%nなんだか…%n"; @@ -380,7 +380,7 @@ "Hey%n${userName}!" = "やぁ%n${userName}！"; /* Character-Script-2-7 Prompt for pickup */ -"Pick me up%nand bring me to%nyour favorite place." = "ボクをもち上げて%n${userName}の好きな場所へ%nつれてって"; +"Pick me up%nand bring me to%nyour favorite place." = "ボクをもち上げて%nキミの好きな場所へ%nつれてって"; /* Character-Script-2-7 get picked up */ "Tell me when%nwe're there!" = "そこについたら%n教えてね！"; @@ -395,7 +395,7 @@ "Let me%ntake a look!" = "ちょっと%n見せて！"; /* Character-Script-2-7 Explain that you like it here */ -"I see why you%nlike it here!" = "${userName}がここを好きな%nりゆうが分かるよ！"; +"I see why you%nlike it here!" = "キミがここを好きな%nりゆうが分かるよ！"; /* Character-Script-2-7 Ask for photo */ "%nWant me to snap a photo?" = "%nボクにしゃしんをとってほしい？"; @@ -428,7 +428,7 @@ "Let's practice %nour starts" = "スタートの練習をしよう"; /* Character-Script-3-1 */ -"You clap, %nand I'll dart forward" = "${userName}が手をたたくと、%nボクは前にすすむよ"; +"You clap, %nand I'll dart forward" = "キミが手をたたくと、%nボクは前にすすむよ"; /* Character-Script-3-1 */ "First put me somewhere%nwith plenty of room" = "まずは広い場所に%nボクをおいてね"; @@ -473,7 +473,7 @@ "I'm gonna%nchill out%nfor a sec." = "ちょっとおちつかないと"; /* Character-Script-3-2 Explain wtf is about to happen */ -"Ooh!%nShow me your best%nFreeze Dance." = "そうだ！${userName}の%nさいこうのフリーズダンス%nを見せてよ"; +"Ooh!%nShow me your best%nFreeze Dance." = "そうだ！キミの%nさいこうのフリーズダンス%nを見せてよ"; /* Character-Script-3-2 Explain wtf is about to happen */ "Do you guys do%nFreeze Dance%non Earth?" = "地球では%nフリーズダンス%nをしないの？"; @@ -491,13 +491,13 @@ "But if you freeze...%nthen it's just the breeze." = "でも止まると…%n風の音しか聞こえなくなるよ"; /* Character-Script-3-2 Explain wtf is about to happen */ -"OK, talk is cheap.%nLet's see your best..." = "さあ、口で言うのは%nかんたんだ見せてよ%n${userName}のベストを…"; +"OK, talk is cheap.%nLet's see your best..." = "さあ、口で言うのは%nかんたんだ見せてよ%nキミのベストを…"; /* Character-Script-3-2 Do the freeze dance */ "That dance was..." = "そのダンスは…"; /* Character-Script-3-2 Do the freeze dance */ -"Incredible!%nYour arms%nare so wobbly!" = "すばらしい！%n${userName}のうでは%nすごくくねくねだね！"; +"Incredible!%nYour arms%nare so wobbly!" = "すばらしい！%nキミのうでは%nすごくくねくねだね！"; /* Character-Script-3-3 Looks up and chuckles */ "That's...%npretty neat." = "それってすごくいいね"; @@ -518,7 +518,7 @@ "Look at the photos%nI snapped!" = "しゃしんを見て%nボクがとったんだ！"; /* Character-Script-3-5 Show off them photos */ -"I'll save these in%nyour Camera app." = "${userName}のカメラアプリに%nほぞんするよ"; +"I'll save these in%nyour Camera app." = "キミのカメラアプリに%nほぞんするよ"; /* Character-Script-3-6 */ "Now that I can%ndrive on a path" = "みちを走れる%nようになったよ"; @@ -539,7 +539,7 @@ "Robots race after%na colorful ball." = "カラフルなボールを%n追いかけるよ"; /* Chase-Introduction-First-Run Explains Chase */ -"Let's use everying%nyou taught me..." = "${userName}が教えてくれたことを%n全て使おう！"; +"Let's use everying%nyou taught me..." = "キミが教えてくれたことを%n全て使おう！"; /* Chase-Introduction-First-Run Explains Chase */ "...and%nstart chasing!" = "そして追いかけはじめよう！"; @@ -584,7 +584,7 @@ "On Earth, there's%nso much to explore!" = "地球にはたんけんする%n場所がたくさんあるね！"; /* Favorite-Color-Introduction-First-Run Lead in to interactive help */ -"Let me%nshow you something" = "${userName}に見せたいものが%nあるんだ"; +"Let me%nshow you something" = "キミに見せたいものが%nあるんだ"; /* Favorite-Color-Introduction Explain the game */ "I have a%nfavorite color" = "好きな色%nがあるんだ"; @@ -596,7 +596,7 @@ "Try to find%nmy favorite color" = "ボクの好きな色%nを見つけてみよう"; /* Favorite-Color-Introduction Explain the game */ -"I'll give you%na hint..." = "${userName}にヒント%nをあげるよ…"; +"I'll give you%na hint..." = "キミにヒント%nをあげるよ…"; /* Favorite-Color-Introduction Explain the game */ "I'll help%nyou out..." = "手つだって%nあげる…"; @@ -647,7 +647,7 @@ "And let me get%na good look!" = "そして、よく%n見せて！"; /* Favorite-Color-Introduction Explain the game */ -"And I'll tell you%nif I like it!" = "もし好きな色だったら%n${userName}に教えるね！"; +"And I'll tell you%nif I like it!" = "もし好きな色だったら%nキミに教えるね！"; /* Favorite-Color-Introduction Explain the game */ "And if I don't like it,%nkeep guessing!" = "好きじゃなかったら、%n考えつづけてね！"; @@ -713,7 +713,7 @@ "Now go build%nyour track!" = "自分のコース%nをつくりに行こう！"; /* LineFollow-Introduction-First-Run DO NOT See Video */ -"Okay, I'll leave you to%nbuild your track." = "よし、コース作りは%n${userName}にまかせるね"; +"Okay, I'll leave you to%nbuild your track." = "よし、コース作りは%nキミにまかせるね"; /* LineFollow-Introduction-First-Run Ask them to let Romo know when they are done! */ "Tell me when you're%ndone building." = "作りおわったら%n教えてね"; From 8ee4acf3ebe0a031a921a9fa03ea64923849e7ba Mon Sep 17 00:00:00 2001 From: Isao Takeyasu Date: Sun, 14 Mar 2021 12:07:16 +0900 Subject: [PATCH 5/5] Remove unsupported replace keyword. --- Languages/ja.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Languages/ja.lproj/Localizable.strings b/Languages/ja.lproj/Localizable.strings index decb5747..6e16b269 100755 --- a/Languages/ja.lproj/Localizable.strings +++ b/Languages/ja.lproj/Localizable.strings @@ -599,7 +599,7 @@ "FavColor-WrongColorPrompt1" = "ちがうよ！考えつづけてね！"; /* FavColor-WrongColorPrompt10 */ -"FavColor-WrongColorPrompt10" = "ちがうけど、それは${userName}の\n好きな色？"; +"FavColor-WrongColorPrompt10" = "ちがうけど、それはキミの\n好きな色？"; /* FavColor-WrongColorPrompt11 */ "FavColor-WrongColorPrompt11" = "うーん…その色じゃないよ";