@nakamura-123/pages 0.1.10 → 0.1.12

package/dist/component/Coin/CoinCheck.d.ts

@@ -1,7 +1,7 @@
 import { Storage } from "@nakamura-123/types";
 export declare const coinCheckFnc: import("@reduxjs/toolkit").AsyncThunk<void, string, {
     state?: unknown;
-    dispatch?: import("redux").Dispatch;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
     extra?: unknown;
     rejectValue?: unknown;
     serializedErrorType?: unknown;

package/dist/component/Coin/CoinFnc.d.ts

@@ -1,4 +1,4 @@
-import RNIap, { ProductPurchase } from "react-native-iap";
+import RNIap, { Product, ProductPurchase } from "react-native-iap";
 import { Storage } from "@nakamura-123/types";
 export declare const initializeIAP: (paymentItems: string[] | undefined, setProducts: (products: RNIap.Product[]) => void, setLoading: (loading: boolean) => void) => Promise<void>;
 export declare const handlePurchase: (productId: string, dispatch: (action: any) => void) => Promise<ProductPurchase | null>;

package/dist/component/Result/CharaCard.js

@@ -12,15 +12,17 @@ var CaraCard = function (_a) {
     var scoreInfo = _a.scoreInfo;
     var imgs = (0, react_redux_1.useSelector)(function (state) { return state.app.imgs; });
     var showCharactor = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.app.appSetting.setting) === null || _a === void 0 ? void 0 : _a.showCharactor; }) || false;
-    var imgPath = imgs.chara.lv1;
     // 正答割合を取得
     var percent = scoreInfo.percent;
-    var item = lib_1.scoreLevels.find(function (item) {
+    var scoreItem = lib_1.scoreLevels.find(function (item) {
         return percent <= item.maxPercent;
     });
-    var enTitle = (item === null || item === void 0 ? void 0 : item.enTitle) || "Great Job";
-    var jpTitle = (item === null || item === void 0 ? void 0 : item.jpTitle) || "なかなかやるね";
+    var enTitle = (scoreItem === null || scoreItem === void 0 ? void 0 : scoreItem.enTitle) || "Great Job";
+    var jpTitle = (scoreItem === null || scoreItem === void 0 ? void 0 : scoreItem.jpTitle) || "なかなかやるね";
+    var level = (scoreItem === null || scoreItem === void 0 ? void 0 : scoreItem.level) || "l2";
+    var imgPath = imgs.chara[level];
     return (<react_native_1.View style={styles.container}>
+      {/* <View style={styles.circle} /> */}
       <common_1.MyText style={styles.title}>{enTitle}</common_1.MyText>
       <common_1.MyText color="gray">{jpTitle}</common_1.MyText>
       {showCharactor && <react_native_1.Image style={styles.imgBox} source={imgPath}/>}
@@ -40,5 +42,14 @@ var styles = react_native_1.StyleSheet.create({
         width: 130,
         height: 130,
     },
+    circle: {
+        width: 200,
+        height: 200,
+        borderRadius: 150,
+        backgroundColor: lib_1.colors.green,
+        position: "absolute",
+        top: 20,
+        opacity: 0.4, // Add opacity to make it slightly transparent
+    },
 });
 exports.default = CaraCard;

package/dist/functions/oldStorageFnc.d.ts

@@ -2,3 +2,4 @@ import Realm from "realm";
 import { ASetting } from "@nakamura-123/types";
 import { AppDispatch } from "@nakamura-123/stores";
 export declare const handleOldData: (realm: Realm, oldInfo: ASetting.OldInfo, dispatch: AppDispatch, msg?: string) => Promise<void>;
+export declare const existOldData: () => Promise<boolean>;

package/dist/functions/oldStorageFnc.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleOldData = void 0;
+exports.existOldData = exports.handleOldData = void 0;
 var toolkit_1 = require("@reduxjs/toolkit");
 var db_1 = require("@nakamura-123/db");
 var stores_1 = require("@nakamura-123/stores");
@@ -54,7 +54,6 @@ var handleOldData = function (realm, oldInfo, dispatch, msg) { return __awaiter(
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        dispatch({ type: "setting/guideStateFalse", payload: "loadOldData" });
                         dispatch(stores_1.settingStorage.saveSetting());
                         if (!oldInfo) return [3 /*break*/, 4];
                         return [4 /*yield*/, loadingAllOldData(realm, oldInfo)];
@@ -75,8 +74,7 @@ var handleOldData = function (realm, oldInfo, dispatch, msg) { return __awaiter(
                 }
             });
         }); }, "実行する", function () {
-            dispatch({ type: "setting/guideStateFalse", payload: "loadOldData" });
-            dispatch(stores_1.settingStorage.saveSetting());
+            console.log("キャンセル");
         });
         return [2 /*return*/];
     });
@@ -214,3 +212,16 @@ var loadOldInputId = (0, toolkit_1.createAsyncThunk)("old/loadOldInputId", funct
         });
     });
 });
+// 90. 旧データの存在をMarkデータから確認
+var existOldData = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var markData;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, loadOldData("mark")];
+            case 1:
+                markData = _a.sent();
+                return [2 /*return*/, markData !== null]; // null チェックを簡潔に
+        }
+    });
+}); };
+exports.existOldData = existOldData;

package/dist/functions/questionFilter.d.ts

@@ -1,16 +1,18 @@
 import { Results } from "realm";
 import { dQuestionSchema } from "@nakamura-123/db";
-import { CfgInitial } from "@nakamura-123/stores";
 import { Store } from "@nakamura-123/types";
 type QuestionType = typeof dQuestionSchema.prototype;
 type QR = Results<QuestionType>;
-type startCfg = CfgInitial["startCfg"];
 export declare const getUnitQuestions: (questions: QR, unitId: number) => QR;
 export declare const getSubUnitQuestions: (questions: QR, unitId: number, subUnitId: number) => QR;
 export declare const getYearQuestions: (questions: QR, year: number) => QR;
 export declare const getSubYearQuestions: (questions: QR, year: number, key: number) => QR;
 export declare const filterByOutOfYearRange: (questions: QR, outOfYearRange: number[]) => QR;
 export declare const filterByOutOfUnitRange: (questions: QR, outOfUnitRange: number[]) => QR;
-export declare const filterByTags: (questions: QR, startCfg: startCfg) => QR;
+export declare const filterByTags: (questions: QR, startCfg: {
+    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
+    option: import("@nakamura-123/lib/dist/config/startOption").QuizStartOptionValue;
+    outOfYearRange: number[];
+}) => QR;
 export declare const commonFilter: (questions: Store.DQInStore[], quizCnt: number, isShuffle: boolean) => Store.DQInStore[];
 export {};

package/dist/page/BootPage.js

@@ -35,9 +35,9 @@ var BootPage = function (_a) {
     var yearLength = (0, react_redux_1.useSelector)(function (state) { return state.app.yearList; }).length;
     // アベレージバーのデータ生成
     var l4TagCnt = (0, tagFnc_1.getCompletedTagRate)(tagLevels, true);
-    var allQuizCnt = QuestionDB.length || 1;
-    var average = Math.round((l4TagCnt / allQuizCnt) * 100);
-    var barLabel = "\u8D64\u3075\u305B\u3093\u306E\u5272\u5408\n(\u5168".concat(allQuizCnt, "\u554F\u4E2D)");
+    var allQuizCnt = tagLevels.length || 0;
+    var average = Math.round((l4TagCnt / allQuizCnt) * 100) || 0;
+    var barLabel = "\u8D64\u3075\u305B\u3093\u306E\u5272\u5408\n(".concat(allQuizCnt, "\u554F\u4E2D)");
     // 履歴情報
     var historyParams = {
         subject: subject.name,

package/dist/page/GetBadgePage.js

@@ -73,7 +73,7 @@ var GetBadgePage = function (_a) {
     var notification = (0, react_redux_1.useSelector)(function (state) { return state.score.notification; });
     if (notification.length === 0)
         return null;
-    var imgPath = imgs.chara.lv1;
+    var imgPath = imgs.chara.l1;
     var title = notification[0].title || "";
     var badgeName = notification[0].name || "";
     var badgeColor = notification[0].color || "blue";

package/dist/page/HomePage.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { Home, Nav } from "@nakamura-123/types";
 interface Prop {
-    menuLists: Array<Home.MenuItem<Nav.RootKeys>>;
+    menuLists: Home.MenuListItem[];
     navigation: Nav.NavigationProp<"Home">;
 }
 declare const HomePage: React.FC<Prop>;

package/dist/page/HomePage.js

@@ -22,6 +22,42 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -32,6 +68,7 @@ var realm_1 = __importDefault(require("realm"));
 var react_redux_1 = require("react-redux");
 var react_2 = require("@realm/react");
 var common_1 = require("@nakamura-123/common");
+var stores_1 = require("@nakamura-123/stores");
 var lib_1 = require("@nakamura-123/lib");
 var db_1 = require("@nakamura-123/db");
 var GradeCard_1 = __importDefault(require("../component/Grade/GradeCard/GradeCard"));
@@ -42,8 +79,6 @@ var MenuRectangle = function (_a) {
     var menu = _a.menu, navigation = _a.navigation;
     var title = menu.title, note = menu.note, icon = menu.icon, color = menu.color, link = menu.link;
     var handlePress = function () {
-        if (link === "History" || link === "ImgZoom")
-            return;
         navigation.navigate(link);
     };
     return (<common_1.RectangleCard title={title} note={note} left={<common_1.IconInCircle name={icon} size={25}/>} onPress={handlePress} color={color} outerStyle={{ marginBottom: 20 }}/>);
@@ -59,11 +94,24 @@ var HomePage = function (_a) {
     var settingAsyncLoaded = (0, react_redux_1.useSelector)(function (state) { return state.setting.asyncLoaded; });
     var oldInfo = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.oldInfo; });
     (0, react_1.useEffect)(function () {
-        if (!settingAsyncLoaded)
+        if (!showLoadOldData || !settingAsyncLoaded)
             return;
-        if (showLoadOldData && oldInfo.testInfo.length > 0) {
-            (0, oldStorageFnc_1.handleOldData)(realm, oldInfo, dispatch, LOAD_OLD_MSG);
-        }
+        dispatch({ type: "setting/guideStateFalse", payload: "loadOldData" });
+        dispatch(stores_1.settingStorage.saveSetting());
+        var fetchOldData = function () { return __awaiter(void 0, void 0, void 0, function () {
+            var existOldMarkData;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, oldStorageFnc_1.existOldData)()];
+                    case 1:
+                        existOldMarkData = _a.sent();
+                        if (existOldMarkData && oldInfo.testInfo.length > 0)
+                            (0, oldStorageFnc_1.handleOldData)(realm, oldInfo, dispatch, LOAD_OLD_MSG);
+                        return [2 /*return*/];
+                }
+            });
+        }); };
+        fetchOldData();
     }, [showLoadOldData, settingAsyncLoaded]);
     // これはデバッグ用です。
     if (__DEV__)

package/dist/page/ReportPage.js

@@ -79,7 +79,6 @@ var ReportPage = function (_a) {
     var _b = (0, react_1.useState)(null), type = _b[0], setType = _b[1];
     var _c = (0, react_1.useState)(""), mail = _c[0], setMail = _c[1];
     var _d = (0, react_1.useState)(""), inquiry = _d[0], setInquiry = _d[1];
-    var storeQuiz = (0, react_redux_1.useSelector)(function (state) { return state.quiz; });
     var storeSetting = (0, react_redux_1.useSelector)(function (state) { return state.setting; });
     var errorLogs = (0, react_redux_1.useSelector)(function (state) { return state.error; });
     var selectedQuiz = (0, quizHook_1.useQuestionData)();
@@ -102,11 +101,10 @@ var ReportPage = function (_a) {
                             type: appName,
                             appKey: appKey,
                             mail: mail,
-                            body: inquiry,
+                            comment: inquiry,
                             selectedQuiz: selectedQuiz,
-                            storeQuiz: storeQuiz,
-                            storeSetting: storeSetting,
                             device: device,
+                            storeSetting: storeSetting,
                             errorLogs: errorLogs,
                         })];
                 case 2:

package/dist/page/SettingPage.js

@@ -53,6 +53,8 @@ var SettingPage = function (_a) {
             icon: "exchange-alt",
             color: "yellow",
             handlePress: function () {
+                if (oldInfo.testInfo.length === 0)
+                    react_native_1.Alert.alert("エラー", "このアプリは、公開時点で新アプリに移行しているため、旧システムのデータは存在しません。");
                 (0, oldStorageFnc_1.handleOldData)(realm, oldInfo, dispatch);
             },
         },

package/dist/quiz/explain/ExplainLogic.js

@@ -4,7 +4,7 @@ exports.getExplainDatas = void 0;
 var getExplainDatas = function (word, Q) {
     var yearId = Q.yearId, num = Q.num, form = Q.form;
     if (word.startsWith("lmn"))
-        return { word: word.slice(3), color: "yellow", viewType: "base" };
+        return { word: word.slice(3), color: "lemon", viewType: "base" };
     if (word.startsWith("(記入例"))
         return { word: word, color: "light", viewType: "copy" };
     if (word.startsWith("/"))

package/dist/quiz/save/QuizSaveData.js

@@ -29,26 +29,26 @@ var react_redux_1 = require("react-redux");
 var Animatable = __importStar(require("react-native-animatable"));
 var common_1 = require("@nakamura-123/common");
 var stores_1 = require("@nakamura-123/stores");
-var loadQuizFromStorage = stores_1.saveStorage.loadQuizFromStorage;
+var loadQuizFromStorage = stores_1.saveStorage.loadQuizFromStorage, deleteQuizInStorage = stores_1.saveStorage.deleteQuizInStorage;
 var QuizSaveData = function (_a) {
     var navigation = _a.navigation, saveKey = _a.saveKey;
     var dispatch = (0, react_redux_1.useDispatch)();
-    var _b = (0, react_1.useState)(false), isShowSaveData = _b[0], setIsShowSaveData = _b[1];
-    (0, react_1.useEffect)(function () {
-        setTimeout(function () {
-            dispatch(loadQuizFromStorage(saveKey));
-            setIsShowSaveData(true);
-        }, 500);
-    }, []);
     var isExistedSaveData = (0, react_redux_1.useSelector)(function (state) { return state.score.isSave[saveKey]; });
     var lessonTitle = (0, react_redux_1.useSelector)(function (state) { return state.quiz.selected.lesson.title; });
     var turn = (0, react_redux_1.useSelector)(function (state) { return state.quiz.currentInfo.state.turn; });
-    if (!isExistedSaveData || !isShowSaveData)
+    (0, react_1.useEffect)(function () {
+        dispatch(loadQuizFromStorage(saveKey));
+    }, []);
+    if (!isExistedSaveData)
         return null;
     var title = "つづきからはじめる";
     var note = "\u3010".concat(lessonTitle, "\u3011\u7B2C").concat(turn + 1, "\u554F\u304B\u3089");
+    var onPress = function () {
+        dispatch(deleteQuizInStorage(saveKey));
+        navigation.navigate("Quiz");
+    };
     return (<Animatable.View style={styles.fixedBottom} animation="fadeIn" duration={500} useNativeDriver>
-      <common_1.RectangleCard title={title} note={note} left={<common_1.IconInCircle name="save" size={30}/>} onPress={function () { return dispatch({ type: "quiz/changeMode", payload: "quiz" }); }} color="blue" style={styles.card}/>
+      <common_1.RectangleCard title={title} note={note} left={<common_1.IconInCircle name="save" size={30}/>} onPress={onPress} color="blue" style={styles.card}/>
     </Animatable.View>);
 };
 var styles = react_native_1.StyleSheet.create({

package/dist/quiz/setting/ReturnSaveBtn.js

@@ -67,9 +67,9 @@ var ModalWithButton = function (_a) {
         {/* モーダル内のシンプルなサンプルコンテンツ */}
         <common_1.MyText fsize="md">{msg}</common_1.MyText>
         <react_native_1.View style={styles.btnBox}>
-          <common_1.MiniIconBtn onPress={function () { return handlePress(); }} icon="stop" title="保存して中断" color="blue" width={200} style={{ marginBottom: 15 }}/>
-          <common_1.MiniIconBtn onPress={function () { return goBack(); }} icon="times" title="保存せず中断" color="ltRed" width={200} style={{ marginBottom: 15 }}/>
-          <common_1.MiniIconBtn onPress={function () { return closeModal(); }} icon="ban" title="キャンセル" color="ltBlack" width={200}/>
+          <common_1.MiniIconBtn onPress={function () { return handlePress(); }} icon="save" title="保存して中断" color="blue" width={200} style={{ marginBottom: 15 }}/>
+          <common_1.MiniIconBtn onPress={function () { return goBack(); }} icon="times" title="保存せず中断" color="ltBlack" width={200} style={{ marginBottom: 15 }}/>
+          <common_1.MiniIconBtn onPress={function () { return closeModal(); }} icon="ban" title="キャンセル" color="beige" width={200}/>
         </react_native_1.View>
       </common_1.BaseModal>
     </react_native_1.View>);