@nakamura-123/pages 0.1.28 → 0.1.29

package/dist/component/Basic/MiniTestCard.js

@@ -85,8 +85,11 @@ var TestComponent = function (_a) {
         dispatch({ type: "quiz/setQuizList", payload: quizList });
         navigation.navigate("Quiz");
     };
+    // カードに表示する問題数
+    var ONEYEAR_TEST_NUMBER = 901;
+    var displayQuizCnt = quizCnt === ONEYEAR_TEST_NUMBER ? "1回分" : quizCnt + "問";
     return (<react_native_1.View style={{ marginBottom: 40 }}>
-      <common_1.RectangleCard title={testTitle} left={<common_1.IconInCircle name={icon} size={25}/>} bottom={<Paw5s_1.default levels={levels} quizCnt={quizCnt}/>} onPress={function () { return handleStart(); }} color="red"/>
+      <common_1.RectangleCard title={testTitle} left={<common_1.IconInCircle name={icon} size={25}/>} bottom={<Paw5s_1.default levels={levels} quizCnt={displayQuizCnt}/>} onPress={function () { return handleStart(); }} color="red"/>
     </react_native_1.View>);
 };
 exports.default = TestComponent;

package/dist/component/Basic/Paw5s.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 interface Paw4sProps {
     levels: string[];
-    quizCnt: number;
+    quizCnt: string;
 }
 declare const Paw5s: React.FC<Paw4sProps>;
 export default Paw5s;

package/dist/component/Basic/Paw5s.js

@@ -10,11 +10,10 @@ var testFnc_1 = require("../../functions/testFnc");
 var Paw5s = function (_a) {
     var levels = _a.levels, quizCnt = _a.quizCnt;
     // Empty function body
-    var cntTxt = quizCnt + "問";
     var levelInfos = (0, testFnc_1.countByLevel)(levels);
     return (<react_native_1.View style={styles.container}>
       <react_native_1.View>
-        <common_1.MyText style={styles.cntTxt}>{cntTxt}</common_1.MyText>
+        <common_1.MyText style={styles.cntTxt}>{quizCnt}</common_1.MyText>
       </react_native_1.View>
       {levelInfos.map(function (_a, i) {
             var cnt = _a.cnt, color = _a.color;

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<import("redux").AnyAction> | undefined;
+    dispatch?: import("redux").Dispatch;
     extra?: unknown;
     rejectValue?: unknown;
     serializedErrorType?: unknown;

package/dist/component/Coin/CoinCheck.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");
@@ -42,26 +42,24 @@ var toolkit_1 = require("@reduxjs/toolkit");
 var CoinFnc_1 = require("./CoinFnc");
 var stores_1 = require("@nakamura-123/stores");
 // 00.メイン関数
-exports.coinCheckFnc = (0, toolkit_1.createAsyncThunk)("coin/check", function (allFreeId, _a) {
-    var dispatch = _a.dispatch;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var receipts, isExistedId;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, CoinFnc_1.restorePurchases)(dispatch, false)];
-                case 1:
-                    receipts = _b.sent();
-                    isExistedId = hasPurchasedItems(receipts, allFreeId);
-                    if (!isExistedId) {
-                        // 返金などをされていて、flaseの場合、このIDのアイテムを削除し、store更新
-                        stores_1.coinStorage.removePurchasedItem(allFreeId);
-                        dispatch({ type: "setting/updateAllFreeState", payload: "none" });
-                    }
-                    return [2 /*return*/];
-            }
-        });
+exports.coinCheckFnc = (0, toolkit_1.createAsyncThunk)("coin/check", function (allFreeId_1, _a) { return __awaiter(void 0, [allFreeId_1, _a], void 0, function (allFreeId, _b) {
+    var receipts, isExistedId;
+    var dispatch = _b.dispatch;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0: return [4 /*yield*/, (0, CoinFnc_1.restorePurchases)(dispatch, false)];
+            case 1:
+                receipts = _c.sent();
+                isExistedId = hasPurchasedItems(receipts, allFreeId);
+                if (!isExistedId) {
+                    // 返金などをされていて、flaseの場合、このIDのアイテムを削除し、store更新
+                    stores_1.coinStorage.removePurchasedItem(allFreeId);
+                    dispatch({ type: "setting/updateAllFreeState", payload: "none" });
+                }
+                return [2 /*return*/];
+        }
     });
-});
+}); });
 // 91.　復元を行い、チェックが必要か判定
 var isCheckRequired = function (allFreeState, lastCheckedDate, isCompoleteFree) {
     if (isCompoleteFree)

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

@@ -1,4 +1,4 @@
-import RNIap, { Product, ProductPurchase } from "react-native-iap";
+import RNIap, { 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/Coin/CoinFnc.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");

package/dist/component/Grade/ShareBtn.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");

package/dist/component/QuizSet/QuizOptionDrill.js

@@ -10,11 +10,31 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
 var react_native_1 = require("react-native");
 var react_i18next_1 = require("react-i18next");
 var react_redux_1 = require("react-redux");
@@ -26,6 +46,7 @@ var QuizOption = function (_a) {
     // 設定の選択
     var dispatch = (0, react_redux_1.useDispatch)();
     var selected = (0, react_redux_1.useSelector)(function (state) { return state.quiz.selected; });
+    var noShuffle = selected.lesson.noShuffle;
     var system = selected.system || "drill";
     var storeOption = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.option; });
     var handleSelect = function (type, value) {
@@ -33,6 +54,10 @@ var QuizOption = function (_a) {
     };
     var jQuizStartOption = removeOptionByValue(selected.system || "drill");
     var quizOption = system === "drill" ? lib_1.startOption.dQuizStartOption : jQuizStartOption;
+    (0, react_1.useEffect)(function () {
+        if (noShuffle)
+            dispatch(stores_1.cfgAction.selectOption({ key: "isShuffle", value: false }));
+    }, [noShuffle]);
     return (<react_native_1.View style={styles.container}>
       <common_1.HelpMark name="quizOption.tag"/>
       {quizOption.map(function (O, i) {

package/dist/component/Result/AdCard.js

@@ -34,7 +34,7 @@ var emptyCardInfo = {
     description: "",
 };
 var AdCard = function () {
-    var infoSetting = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.setting.info; });
+    var infoSetting = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.setting.info; }) || {};
     var adCardInfos = (0, react_redux_1.useSelector)(function (state) { return state.setting.info.adCard; });
     var _a = (0, react_1.useState)(false), isVisible = _a[0], setIsVisible = _a[1];
     var _b = (0, react_1.useState)(emptyCardInfo), cardInfo = _b[0], setCardInfo = _b[1];

package/dist/functions/createQuizFncD.d.ts

@@ -1,18 +1,11 @@
-import { QuizInitial } from "@nakamura-123/stores";
+import { CfgInitial, QuizInitial } from "@nakamura-123/stores";
 import { Store } from "@nakamura-123/types";
 import { QRD } from "../types/filterType";
+type startCfg = CfgInitial["startCfg"];
 type Selected = QuizInitial["selected"];
-export declare const getBasicQuizList: (QuestionDB: QRD, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").StoreStartOptions;
-    outOfYearRange: number[];
-}, selected: Selected) => Store.DQInStore[];
+export declare const getBasicQuizList: (QuestionDB: QRD, startCfg: startCfg, selected: Selected) => Store.DQInStore[];
 export declare const getMiniTestQuestions: (QuestionDB: QRD, subjectType: "unit" | "year", key: number, cnt: number, outOfYearRange: number[]) => Store.DQInStore[];
 export declare const getTestQuestions: (QuestionDB: QRD, cnt: number) => Store.DQInStore[];
 export declare const getTestQuestionsByUnit: (QuestionDB: QRD, cnt: number, unit: number[]) => Store.DQInStore[];
-export declare const getBootQuestions: (QuestionDB: QRD, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").StoreStartOptions;
-    outOfYearRange: number[];
-}, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
+export declare const getBootQuestions: (QuestionDB: QRD, startCfg: startCfg, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
 export {};

package/dist/functions/createQuizFncD.js

@@ -38,14 +38,19 @@ exports.getBasicQuizList = getBasicQuizList;
 // ミニテストの問題を取得
 var getMiniTestQuestions = function (QuestionDB, subjectType, key, cnt, outOfYearRange) {
     var questions = QuestionDB.filtered("FALSEPREDICATE");
+    var isOneYearMode = cnt === 901;
+    var isShuffle = isOneYearMode ? false : true;
+    console.log(isOneYearMode, "isOneYearMode");
     if (subjectType === "unit") {
         questions = (0, questionFilterD_1.getUnitQuestions)(QuestionDB, key);
         questions = (0, questionFilterD_1.filterByOutOfYearRange)(questions, outOfYearRange);
+        if (isOneYearMode)
+            questions = getMiniTestOneYearQuestions(questions);
     }
     else if (subjectType === "year")
         questions = (0, questionFilterD_1.getYearQuestions)(QuestionDB, key);
     var formatted = (0, questionFormatD_1.formatQuestions)(questions);
-    return (0, questionFilterD_1.commonFilter)(formatted, cnt, true);
+    return (0, questionFilterD_1.commonFilter)(formatted, cnt, isShuffle);
 };
 exports.getMiniTestQuestions = getMiniTestQuestions;
 // 模擬試験の開始(Randam)
@@ -78,3 +83,13 @@ var getBootQuestions = function (QuestionDB, startCfg, outOfUnitRange, outOfYear
     return (0, questionFilterD_1.commonFilter)(formatted, quizCnt, isShuffle);
 };
 exports.getBootQuestions = getBootQuestions;
+// 特殊ミニテストモードのクイズ取得(1回分の試験だけを取得)
+var getMiniTestOneYearQuestions = function (questions) {
+    var _a;
+    if (((_a = questions.isEmpty) === null || _a === void 0 ? void 0 : _a.call(questions)) || questions.length === 0)
+        return questions;
+    // ランダムに 1 問 pick → その yearId を採用（map も shuffle も不要）
+    var randomIndex = Math.floor(Math.random() * questions.length);
+    var yearId = questions[randomIndex].yearId;
+    return questions.filtered("yearId == $0", yearId);
+};

package/dist/functions/questionFilterD.d.ts

@@ -1,14 +1,13 @@
+import { CfgInitial } from "@nakamura-123/stores";
 import { Store } from "@nakamura-123/types";
 import { QRD } from "../types/filterType";
+type startCfg = CfgInitial["startCfg"];
 export declare const getUnitQuestions: (questions: QRD, unitId: number) => QRD;
 export declare const getSubUnitQuestions: (questions: QRD, unitId: number, subUnitId: number) => QRD;
 export declare const getYearQuestions: (questions: QRD, year: number) => QRD;
 export declare const getSubYearQuestions: (questions: QRD, year: number, key: number) => QRD;
 export declare const filterByOutOfYearRange: (questions: QRD, outOfYearRange: number[]) => QRD;
 export declare const filterByOutOfUnitRange: (questions: QRD, outOfUnitRange: number[]) => QRD;
-export declare const filterByTags: (questions: QRD, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").StoreStartOptions;
-    outOfYearRange: number[];
-}) => QRD;
+export declare const filterByTags: (questions: QRD, startCfg: startCfg) => QRD;
 export declare const commonFilter: (questions: Store.DQInStore[], quizCnt: number, isShuffle: boolean) => Store.DQInStore[];
+export {};

package/dist/functions/questionFilterJ.d.ts

@@ -1,10 +1,9 @@
 import { QRJ } from "../types/filterType";
 import { Db, JStore } from "@nakamura-123/types";
+import { CfgInitial } from "@nakamura-123/stores";
+type startCfg = CfgInitial["startCfg"];
 export declare const getUnitQuestionsJ: (questions: QRJ, unitId: number) => QRJ;
 export declare const getSubUnitQuestionsJ: (questions: QRJ, unitId: number, subUnitId: number) => QRJ;
-export declare const filterByTagsJ: (questions: QRJ, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").StoreStartOptions;
-    outOfYearRange: number[];
-}, tagName: Db.SubjectTag) => QRJ;
+export declare const filterByTagsJ: (questions: QRJ, startCfg: startCfg, tagName: Db.SubjectTag) => QRJ;
 export declare const commonFilterJ: (questions: JStore.JQInStore[], quizCnt: number, isShuffle: boolean) => JStore.JQInStore[];
+export {};

package/dist/functions/tagFncD.js

@@ -1,7 +1,14 @@
 "use strict";
 // helpers.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.countTagsByLevelSelected = exports.getCategoryRate = exports.countTagsByLevel = exports.getCompletedTagRate = exports.getBootTagLevelCnts = exports.getSubTagLevelCnts = exports.getYearSubTagLevelCnts = exports.getUnitSubTagLevelCnts = exports.getCategoryTagLevelCntsD = void 0;
+exports.getBootTagLevelCnts = exports.getSubTagLevelCnts = void 0;
+exports.getCategoryTagLevelCntsD = getCategoryTagLevelCntsD;
+exports.getUnitSubTagLevelCnts = getUnitSubTagLevelCnts;
+exports.getYearSubTagLevelCnts = getYearSubTagLevelCnts;
+exports.getCompletedTagRate = getCompletedTagRate;
+exports.countTagsByLevel = countTagsByLevel;
+exports.getCategoryRate = getCategoryRate;
+exports.countTagsByLevelSelected = countTagsByLevelSelected;
 var lib_1 = require("@nakamura-123/lib");
 var questionFilterD_1 = require("./questionFilterD");
 // 01_大単元のTagのレベルを取得
@@ -16,7 +23,6 @@ function getCategoryTagLevelCntsD(QuestionDB, category, type, outOfYearRange) {
             : (0, questionFilterD_1.getYearQuestions)(returnQuestions, category);
     return returnQuestions.map(function (question) { return question.tag.level; });
 }
-exports.getCategoryTagLevelCntsD = getCategoryTagLevelCntsD;
 // 02_Unitの小単元のTagのレベルを取得
 function getUnitSubTagLevelCnts(QuestionDB, unitId, subUnitId, outOfYearRange) {
     var returnQuestions = QuestionDB;
@@ -26,12 +32,10 @@ function getUnitSubTagLevelCnts(QuestionDB, unitId, subUnitId, outOfYearRange) {
     returnQuestions = (0, questionFilterD_1.getSubUnitQuestions)(returnQuestions, unitId, subUnitId);
     return returnQuestions.map(function (question) { return question.tag.level; });
 }
-exports.getUnitSubTagLevelCnts = getUnitSubTagLevelCnts;
 // 03_Yearの小単元のTagのレベルを取得
 function getYearSubTagLevelCnts(QuestionDB, year, key) {
     return (0, questionFilterD_1.getSubYearQuestions)(QuestionDB, year, key).map(function (question) { return question.tag.level; });
 }
-exports.getYearSubTagLevelCnts = getYearSubTagLevelCnts;
 // 11_5Tagのレベルを取得。Unit(大・小単元) 、Year(大・小単元) どちらでも可。
 var getSubTagLevelCnts = function (QuestionDB, selected, outOfYearRange) {
     // QuestionDB をフィルタリング（共通処理）
@@ -78,7 +82,6 @@ function getCompletedTagRate(tags, onlyCnt) {
     var completedTagRate = Math.round((completedTagCnt / tags.length) * 100);
     return completedTagRate;
 }
-exports.getCompletedTagRate = getCompletedTagRate;
 // 22_タグをレベル別に集計し、色と数を返す
 function countTagsByLevel(tags) {
     var tagInfos = lib_1.tagLevels.map(function (_a) {
@@ -88,7 +91,6 @@ function countTagsByLevel(tags) {
     });
     return tagInfos;
 }
-exports.countTagsByLevel = countTagsByLevel;
 // 23_タグをレベルごとに点数化し、到達度を%で返す
 function getCategoryRate(tags) {
     var tagCnt = tags.length;
@@ -96,7 +98,6 @@ function getCategoryRate(tags) {
     var tagPoint = tags.reduce(function (acc, tag) { return acc + POINT_LIST[tag]; }, 0);
     return (tagPoint / (tagCnt * 5)) * 100;
 }
-exports.getCategoryRate = getCategoryRate;
 // タグをレベル別に集計し、色と数を返す。また、選択すると色が変わる
 function countTagsByLevelSelected(tags, tagActives) {
     var tagInfos = lib_1.tagLevels.map(function (_a) {
@@ -111,4 +112,3 @@ function countTagsByLevelSelected(tags, tagActives) {
     });
     return tagInfos;
 }
-exports.countTagsByLevelSelected = countTagsByLevelSelected;

package/dist/functions/tagFncJ.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTagNameFilterJ = exports.getSubTagLevelCntsJ = exports.getUnitSubTagLevelCntsJ = exports.getCategoryTagLevelCntsJ = void 0;
+exports.getTagNameFilterJ = exports.getSubTagLevelCntsJ = void 0;
+exports.getCategoryTagLevelCntsJ = getCategoryTagLevelCntsJ;
+exports.getUnitSubTagLevelCntsJ = getUnitSubTagLevelCntsJ;
 var questionFilterJ_1 = require("./questionFilterJ");
 // 01_大単元のTagのレベルを取得
 function getCategoryTagLevelCntsJ(QuestionDB, category, tag) {
@@ -8,7 +10,6 @@ function getCategoryTagLevelCntsJ(QuestionDB, category, tag) {
     var returnQuestions = (0, questionFilterJ_1.getUnitQuestionsJ)(QuestionDB, category);
     return returnQuestions.map(function (question) { return question[tag].level; });
 }
-exports.getCategoryTagLevelCntsJ = getCategoryTagLevelCntsJ;
 // 02_Unitの小単元のTagのレベルを取得
 function getUnitSubTagLevelCntsJ(QuestionDB, unitId, subUnitId, tag) {
     if (tag === void 0) { tag = "basicTag"; }
@@ -16,7 +17,6 @@ function getUnitSubTagLevelCntsJ(QuestionDB, unitId, subUnitId, tag) {
     returnQuestions = (0, questionFilterJ_1.getSubUnitQuestionsJ)(returnQuestions, unitId, subUnitId);
     return returnQuestions.map(function (question) { return question[tag].level; });
 }
-exports.getUnitSubTagLevelCntsJ = getUnitSubTagLevelCntsJ;
 // 11_5Tagのレベルを取得。Unit(大・小単元) 、Year(大・小単元) どちらでも可。
 var getSubTagLevelCntsJ = function (QuestionDB, selected) {
     // QuestionDB をフィルタリング（共通処理）

package/dist/page/CoinPage.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");

package/dist/page/GetBadgePage.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");

package/dist/page/HomePage.js

@@ -86,7 +86,7 @@ var MenuRectangle = function (_a) {
     };
     return (<common_1.RectangleCard title={title} note={note} left={<common_1.IconInCircle name={icon} size={25}/>} onPress={handlePress} color={color} outerStyle={{ marginBottom: 20 }}/>);
 };
-var LOAD_OLD_MSG = "  旧システムのデータ引き継ぎを実施いたします。ふせんデータや模擬試験の成績など、可能な限りデータを移行いたしますが、仕様上一部移行ができない項目があります。あらかじめご了承ください。\n\n  なお、引き継ぎをキャンセルされた場合でも、設定ページより再度手続きを行うことが可能です。";
+var LOAD_OLD_MSG = "  旧システムのデータ引き継ぎを実施いたします。ふせんデータや模擬試験の成績など、可能な限りデータを移行いたしますが、仕様上一部移行ができない項目があります。あらかじめご了承ください。\n\n  なお、引き継ぎをキャンセルされた場合でも、設定ページより再度操作を行うことが可能です。";
 var HomePage = function (_a) {
     var menuLists = _a.menuLists, navigation = _a.navigation;
     var dispatch = (0, react_redux_1.useDispatch)();
@@ -115,7 +115,7 @@ var HomePage = function (_a) {
                     case 0: return [4 /*yield*/, (0, oldStorageFnc_1.existOldData)()];
                     case 1:
                         existOldMarkData = _a.sent();
-                        if (existOldMarkData && oldInfo.testInfo.length > 0)
+                        if (existOldMarkData && oldInfo.testInfo)
                             (0, oldStorageFnc_1.handleOldData)(realm, oldInfo, dispatch, t, LOAD_OLD_MSG);
                         return [2 /*return*/];
                 }

package/dist/page/OnlineInputPage.js

@@ -33,7 +33,7 @@ var common_1 = require("@nakamura-123/common");
 var PasswardModal_1 = __importDefault(require("../component/OnlineInput/PasswardModal"));
 var OnlineSavedList_1 = __importDefault(require("../component/OnlineInput/OnlineSavedList"));
 var PasswordIdModal_1 = __importDefault(require("../component/OnlineInput/PasswordIdModal"));
-var MSG = "  当アプリのデータはお使いの端末にのみ保存されております。そのため、端末の紛失や機種変更などの際に、他の端末へデータを引き継ぐことはできません。そこで、入力されたデータのみバックアップを取ることができる仕組みを構築いたしました。\n  万が一に備え、定期的にバックアップを行っていただくことを推奨いたします。";
+var MSG = "  当アプリのデータは、すべてお使いの端末にのみ保存されています。そのため、端末の紛失や機種変更などがあった場合、別の端末へのデータ引き継ぎはできません。\n  そこで、入力した記述データのみをバックアップできる機能を用意いたしました。 万が一に備えて、定期的なバックアップの実施をおすすめいたします。\n  なお、バックアップの対象は記述データのみであり、成績データは保存されませんので、あらかじめご了承ください。";
 var WARN = "※ IDおよびパスワードは、必ずスクリーンショットなどで保存していただきますようお願い申し上げます。";
 var OnlineInputPage = function () {
     var _a = (0, react_1.useState)(false), isVisible = _a[0], setVisible = _a[1];

package/dist/page/ReportPage.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");

package/dist/page/SettingPage.js

@@ -55,7 +55,7 @@ var SettingPage = function (_a) {
             icon: "exchange-alt",
             color: "yellow",
             handlePress: function () {
-                if (oldInfo.testInfo.length === 0)
+                if (!oldInfo.testInfo)
                     react_native_1.Alert.alert(t("setting.oldSystem.error"), t("setting.oldSystem.errorMsg"));
                 (0, oldStorageFnc_1.handleOldData)(realm, oldInfo, dispatch, t);
             },

package/dist/page/TestPage.js

@@ -85,7 +85,7 @@ var TestPage = react_1.default.memo(function (_a) {
           <AverageBar_1.default percent={average} label={t("test.barLabel")}/>
           <BarChartContainer_1.default subjectName={subject.name} TestDB={TestDB}/>
           <react_native_1.View style={styles.test}>
-            <common_1.RectangleCard title={title} color="red" left={<common_1.IconInCircle name={iconName} circleColor="ltRed" size={25}/>} bottom={<Paw5s_1.default levels={cntByLevels} quizCnt={quizCnt}/>} onPress={function () { return handleStart(); }}/>
+            <common_1.RectangleCard title={title} color="red" left={<common_1.IconInCircle name={iconName} circleColor="ltRed" size={25}/>} bottom={<Paw5s_1.default levels={cntByLevels} quizCnt={quizCnt + "問"}/>} onPress={function () { return handleStart(); }}/>
           </react_native_1.View>
           <common_1.RoundRectangleIcon title={t("test.showHistory")} onPress={function () {
             return navigation.navigate("History", { info: historyParams });

package/dist/quiz/QuizContentsDrill.js

@@ -50,10 +50,10 @@ var QuizContentDrill = function (_a) {
     return (<react_native_gesture_handler_1.ScrollView contentContainerStyle={styles.container} ref={scrollRef} showsVerticalScrollIndicator={false}>
       <PageContainerWrap_1.default scrollViewRef={scrollRef} navigation={navigation}>
         <Title_1.default />
+        <Question_1.default navigation={navigation}/>
         <Guide_1.default name={guideName} isVisible={showSwipe1Guide || showSwipe2Guide}>
           <react_native_1.View></react_native_1.View>
         </Guide_1.default>
-        <Question_1.default navigation={navigation}/>
         <Answer_1.default />
         {isCheck && !isResult && isNotInput && <CorrectedBar_1.default />}
         {isNotQuiz && <Explain_1.default navigation={navigation}/>}

package/dist/quiz/explain/NormalExplain.js

@@ -18,6 +18,7 @@ var NormalExplain = function (_a) {
     var question = (0, quizHook_1.useQuestionDataD)();
     var rImgs = (0, react_redux_1.useSelector)(function (state) { return state.app.imgs.rImgs; });
     var mImgs = (0, react_redux_1.useSelector)(function (state) { return state.app.imgs.mImgs; });
+    var fsize = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.inQuizOption.fsize; });
     if (!question)
         return null;
     var yearId = question.yearId, explain = question.explain;
@@ -26,7 +27,7 @@ var NormalExplain = function (_a) {
     var explainInfos = explain.map(function (word) {
         return (0, ExplainLogic_1.getExplainDatas)(word, question);
     });
-    var formIsImpot = question.form === "input";
+    var formIsInput = question.form === "input";
     // 解説がない場合
     if (explainInfos.length === 0)
         return (<react_native_1.View style={styles.container}>
@@ -34,6 +35,7 @@ var NormalExplain = function (_a) {
           こちらの問題の解説は掲載しておりません。過去問題集やWEBサイトなどでご確認ください。
         </MyTextqqyy_1.default>
       </react_native_1.View>);
+    var marginBottom = getMarginBottom(fsize);
     // 解説表示
     return (<react_native_1.View style={styles.container}>
       {/* 解説表示 */}
@@ -43,14 +45,14 @@ var NormalExplain = function (_a) {
                 var mt20 = I.color === "light" ? 25 : 0;
                 return (<react_native_1.View style={{
                         backgroundColor: lib_1.colors[color],
-                        marginBottom: 5,
+                        marginBottom: marginBottom,
                         marginTop: mt20,
                     }} key={index}>
               <RenderImgOrText_1.default word={I.word} imgKey={"a" + yearId} navigation={navigation}/>
             </react_native_1.View>);
             }
             if (I.viewType === "copy") {
-                return (<react_native_1.View style={{ backgroundColor: lib_1.colors[color], marginBottom: 10 }} key={index}>
+                return (<react_native_1.View style={{ backgroundColor: lib_1.colors[color], marginBottom: marginBottom }} key={index}>
               <RenderImgOrText_1.default word={I.word} imgKey={"a" + yearId} navigation={navigation} selectable={true}/>
             </react_native_1.View>);
             }
@@ -66,7 +68,7 @@ var NormalExplain = function (_a) {
             </react_native_1.View>);
             }
         })}
-      {formIsImpot && (<common_1.MyText fsize="sm" color="red" style={{ alignSelf: "flex-end" }}>
+      {formIsInput && (<common_1.MyText fsize="sm" color="red" style={{ alignSelf: "flex-end" }}>
           ※記入例は長押しでコピーできます。
         </common_1.MyText>)}
     </react_native_1.View>);
@@ -82,4 +84,24 @@ var styles = react_native_1.StyleSheet.create({
         marginTop: 10,
     },
 });
+var getMarginBottom = function (fsize) {
+    switch (fsize) {
+        case "xs":
+            return 3;
+        case "sm":
+            return 7;
+        case "md":
+            return 12;
+        case "lg":
+            return 15;
+        case "xl":
+            return 20;
+        case "xxl":
+            return 25;
+        case "xxxl":
+            return 30;
+        default:
+            return 0;
+    }
+};
 exports.default = NormalExplain;