@nakamura-123/pages 0.1.31 → 0.1.34

package/dist/component/Basic/BasicContents.js

@@ -40,6 +40,7 @@ var BasicSetting_1 = __importDefault(require("./BasicSetting"));
 var Guide_1 = __importDefault(require("../Guide"));
 var SelectedExamCnt_1 = __importDefault(require("./SelectedExamCnt"));
 var react_i18next_1 = require("react-i18next");
+var BasicProgressBar_1 = __importDefault(require("./BasicProgressBar"));
 var BasicPage = function (_a) {
     var navigation = _a.navigation, subject = _a.subject, index = _a.index;
     var dispatch = (0, react_redux_1.useDispatch)();
@@ -102,6 +103,7 @@ var BasicPage = function (_a) {
         <react_native_1.View style={styles.navBar}/>
       </Guide_1.default>
       <common_1.RoundRectangle title={categoryName} style={styles.categoryName}/>
+      <BasicProgressBar_1.default subject={subject} index={index}/>
       <SelectedExamCnt_1.default type={subject.type}/>
       <common_1.HelpMark name="basicList" marginTop={20} top={-23}/>
       <SubCategoryList_1.default navigation={navigation} topSubject={subject} index={index}/>

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

@@ -0,0 +1,8 @@
+import { Db } from "@nakamura-123/types";
+import React from "react";
+interface Props {
+    subject: Db.SubjectInfo;
+    index: number;
+}
+declare const BasicProgressBar: React.FC<Props>;
+export default BasicProgressBar;

package/dist/component/Basic/BasicProgressBar.js

@@ -0,0 +1,50 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var common_1 = require("@nakamura-123/common");
+var react_1 = __importDefault(require("react"));
+var react_native_1 = require("react-native");
+var react_redux_1 = require("react-redux");
+var basicHook_1 = require("../../hooks/basicHook");
+var tagFncJ_1 = require("../../functions/tagFncJ");
+var tagFncD_1 = require("../../functions/tagFncD");
+var BasicProgressBar = function (_a) {
+    var subject = _a.subject, index = _a.index;
+    var selectKey = (0, react_redux_1.useSelector)(function (state) { return state.app[subject.list][index].key; });
+    var outOfYearRangeStore = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.outOfYearRange; });
+    var outOfYearRange = subject.type === "unit" ? outOfYearRangeStore : undefined;
+    // Realm データベースクエリ
+    var QuestionDBInfo = (0, basicHook_1.useGetQuestionQuery)();
+    var getCategoryTags = QuestionDBInfo.system === "JLPT"
+        ? (0, tagFncJ_1.getCategoryTagLevelCntsJ)(QuestionDBInfo.query, selectKey, subject.tag)
+        : (0, tagFncD_1.getCategoryTagLevelCntsD)(QuestionDBInfo.query, selectKey, subject.type, outOfYearRange);
+    var rate = Math.round((0, tagFncD_1.getCategoryRate)(getCategoryTags));
+    var progressColor = rate > 85 ? "red" : rate > 70 ? "green" : rate > 50 ? "yellow" : "blue";
+    return (<react_native_1.View style={styles.container}>
+      <react_native_1.View style={styles.progressBox}>
+        <common_1.ProgressBar progress={rate} barColor={progressColor} height={20}/>
+      </react_native_1.View>
+      <react_native_1.View style={styles.textBox}>
+        <common_1.MyText>{rate}%</common_1.MyText>
+      </react_native_1.View>
+    </react_native_1.View>);
+};
+var styles = react_native_1.StyleSheet.create({
+    container: {
+        // marginTop: 10,
+        // marginBottom: 5,
+        flexDirection: "row",
+    },
+    progressBox: {
+        flex: 1,
+    },
+    textBox: {
+        width: 50,
+        height: 20,
+        justifyContent: "flex-start",
+        alignItems: "center",
+    },
+});
+exports.default = BasicProgressBar;

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/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 = 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;
+    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.");
@@ -42,24 +42,26 @@ 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_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*/];
-        }
+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*/];
+            }
+        });
     });
-}); });
+});
 // 91.　復元を行い、チェックが必要か判定
 var isCheckRequired = function (allFreeState, lastCheckedDate, isCompoleteFree) {
     if (isCompoleteFree)

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/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 = 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;
+    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.");

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 = 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;
+    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.");

package/dist/component/Grade/UnitCircles copy.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+import { QRQuery } from "../../types/filterType";
+type Props = {
+    QuestionDBInfo: QRQuery;
+};
+declare const UnitCircles: React.FC<Props>;
+export default UnitCircles;

package/dist/component/Grade/UnitCircles copy.js

@@ -0,0 +1,58 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var react_native_1 = require("react-native");
+var react_redux_1 = require("react-redux");
+var tagFncJ_1 = require("../../functions/tagFncJ");
+var tagFncD_1 = require("../../functions/tagFncD");
+var SubCategoryLeft_1 = __importDefault(require("../Basic/SubCategoryLeft"));
+var lib_1 = require("@nakamura-123/lib");
+var common_1 = require("@nakamura-123/common");
+var UnitCircles = function (_a) {
+    var QuestionDBInfo = _a.QuestionDBInfo;
+    var unitList = (0, react_redux_1.useSelector)(function (state) { return state.app.unitList; });
+    var outOfYearRange = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.outOfYearRange; });
+    var circleInfos = unitList.map(function (_a) {
+        var key = _a.key, title = _a.title;
+        var tags = QuestionDBInfo.system === "JLPT"
+            ? (0, tagFncJ_1.getCategoryTagLevelCntsJ)(QuestionDBInfo.query, key, "basicTag")
+            : (0, tagFncD_1.getCategoryTagLevelCntsD)(QuestionDBInfo.query, key, "unit", outOfYearRange);
+        var rate = Math.round((0, tagFncD_1.getCategoryRate)(tags));
+        return { title: title, rate: rate };
+    });
+    return (<react_native_1.View style={styles.container}>
+      {circleInfos.map(function (_a) {
+            var title = _a.title, rate = _a.rate;
+            return (<react_native_1.View key={title} style={styles.itemBox}>
+          <SubCategoryLeft_1.default rate={rate} isLocked={false}/>
+          <common_1.MyText style={{ fontSize: 11 }}>{title}</common_1.MyText>
+        </react_native_1.View>);
+        })}
+    </react_native_1.View>);
+};
+var styles = react_native_1.StyleSheet.create({
+    container: {
+        flex: 1,
+        flexDirection: "row",
+        flexWrap: "wrap",
+        justifyContent: "center",
+        alignItems: "center",
+        backgroundColor: lib_1.colors.bkBeige,
+        borderWidth: 1,
+        borderColor: lib_1.colors.ltBlack,
+        borderRadius: 20,
+        paddingTop: 10,
+        marginTop: 10,
+    },
+    itemBox: {
+        width: 80,
+        height: 80,
+        justifyContent: "flex-start",
+        alignItems: "center",
+        // margin: 5,
+    },
+});
+exports.default = UnitCircles;

package/dist/component/Grade/UnitCircles.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+import { QRQuery } from "../../types/filterType";
+type Props = {
+    QuestionDBInfo: QRQuery;
+};
+declare const UnitCircles: React.FC<Props>;
+export default UnitCircles;

package/dist/component/Grade/UnitCircles.js

@@ -0,0 +1,58 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var react_native_1 = require("react-native");
+var react_redux_1 = require("react-redux");
+var tagFncJ_1 = require("../../functions/tagFncJ");
+var tagFncD_1 = require("../../functions/tagFncD");
+var SubCategoryLeft_1 = __importDefault(require("../Basic/SubCategoryLeft"));
+var lib_1 = require("@nakamura-123/lib");
+var common_1 = require("@nakamura-123/common");
+var UnitCircles = function (_a) {
+    var QuestionDBInfo = _a.QuestionDBInfo;
+    var unitList = (0, react_redux_1.useSelector)(function (state) { return state.app.unitList; });
+    var outOfYearRange = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.outOfYearRange; });
+    var circleInfos = unitList.map(function (_a) {
+        var key = _a.key, title = _a.title;
+        var tags = QuestionDBInfo.system === "JLPT"
+            ? (0, tagFncJ_1.getCategoryTagLevelCntsJ)(QuestionDBInfo.query, key, "basicTag")
+            : (0, tagFncD_1.getCategoryTagLevelCntsD)(QuestionDBInfo.query, key, "unit", outOfYearRange);
+        var rate = Math.round((0, tagFncD_1.getCategoryRate)(tags));
+        return { title: title, rate: rate };
+    });
+    return (<react_native_1.View style={styles.container}>
+      {circleInfos.map(function (_a) {
+            var title = _a.title, rate = _a.rate;
+            return (<react_native_1.View key={title} style={styles.itemBox}>
+          <SubCategoryLeft_1.default rate={rate} isLocked={false}/>
+          <common_1.MyText style={{ fontSize: 11 }}>{title}</common_1.MyText>
+        </react_native_1.View>);
+        })}
+    </react_native_1.View>);
+};
+var styles = react_native_1.StyleSheet.create({
+    container: {
+        flex: 1,
+        flexDirection: "row",
+        flexWrap: "wrap",
+        justifyContent: "center",
+        alignItems: "center",
+        backgroundColor: lib_1.colors.bkBeige,
+        borderWidth: 1,
+        borderColor: lib_1.colors.ltBlack,
+        borderRadius: 20,
+        paddingTop: 10,
+        marginTop: 10,
+    },
+    itemBox: {
+        width: 80,
+        height: 80,
+        justifyContent: "flex-start",
+        alignItems: "center",
+        // margin: 5,
+    },
+});
+exports.default = UnitCircles;

package/dist/component/Grade/YearCircles.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+import { QRQuery } from "../../types/filterType";
+type Props = {
+    QuestionDBInfo: QRQuery;
+};
+declare const YearCircles: React.FC<Props>;
+export default YearCircles;

package/dist/component/Grade/YearCircles.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var react_native_1 = require("react-native");
+var react_redux_1 = require("react-redux");
+var tagFncJ_1 = require("../../functions/tagFncJ");
+var tagFncD_1 = require("../../functions/tagFncD");
+var SubCategoryLeft_1 = __importDefault(require("../Basic/SubCategoryLeft"));
+var lib_1 = require("@nakamura-123/lib");
+var common_1 = require("@nakamura-123/common");
+var YearCircles = function (_a) {
+    var QuestionDBInfo = _a.QuestionDBInfo;
+    var yearList = (0, react_redux_1.useSelector)(function (state) { return state.app.yearList; });
+    var circleInfos = yearList.map(function (_a) {
+        var key = _a.key, title = _a.title;
+        var tags = QuestionDBInfo.system === "JLPT"
+            ? (0, tagFncJ_1.getCategoryTagLevelCntsJ)(QuestionDBInfo.query, key, "listenTag")
+            : (0, tagFncD_1.getCategoryTagLevelCntsD)(QuestionDBInfo.query, key, "year");
+        var rate = Math.round((0, tagFncD_1.getCategoryRate)(tags));
+        return { title: title, rate: rate };
+    });
+    return (<react_native_1.View style={styles.container}>
+      {circleInfos.map(function (_a) {
+            var title = _a.title, rate = _a.rate;
+            return (<react_native_1.View key={title} style={styles.itemBox}>
+          <SubCategoryLeft_1.default rate={rate} isLocked={false}/>
+          <common_1.MyText style={{ fontSize: 11 }}>{title}</common_1.MyText>
+        </react_native_1.View>);
+        })}
+    </react_native_1.View>);
+};
+var styles = react_native_1.StyleSheet.create({
+    container: {
+        flex: 1,
+        flexDirection: "row",
+        flexWrap: "wrap",
+        justifyContent: "center",
+        alignItems: "center",
+        backgroundColor: lib_1.colors.bkBeige,
+        borderWidth: 1,
+        borderColor: lib_1.colors.ltBlack,
+        borderRadius: 20,
+        paddingTop: 10,
+        marginTop: 10,
+    },
+    itemBox: {
+        width: 80,
+        height: 80,
+        justifyContent: "flex-start",
+        alignItems: "center",
+        // margin: 5,
+    },
+});
+exports.default = YearCircles;

package/dist/component/OnlineInput/PasswardModal.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 = 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;
+    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.");
@@ -58,6 +58,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var react_native_1 = require("react-native");
@@ -75,23 +84,31 @@ var PasswordModal = function (_a) {
     var saveUrl = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.app.appSetting.setting) === null || _a === void 0 ? void 0 : _a.api.inputSave; }) || "";
     var appKey = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.quizName.appKey; }) ||
         "";
+    var datas = (0, react_redux_1.useSelector)(function (state) { return state.setting.input.onlineSave; });
     var _b = (0, react_1.useState)(""), password = _b[0], setPassword = _b[1];
     var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
     // セーブ時の動作
     var handleSave = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var isChecked, inputSaveData, sendData, res, date, error_1;
+        var isChecked, oldIds, inputSaveData, sendData, res, date, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     isChecked = (0, OnlineInputFnc_1.checkPassword)(password);
                     if (!isChecked)
                         return [2 /*return*/];
+                    oldIds = getOldIds(datas);
                     setLoading(true);
+                    console.log("oldIds", oldIds);
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, 4, 5]);
                     inputSaveData = db_1.InputModel.getAllInput(realm);
-                    sendData = { appKey: appKey, password: password, saveData: inputSaveData };
+                    sendData = {
+                        appKey: appKey,
+                        password: password,
+                        saveData: inputSaveData,
+                        deleteIds: oldIds,
+                    };
                     return [4 /*yield*/, stores_1.inputApi.inputSaveApi(sendData, saveUrl)];
                 case 2:
                     res = _a.sent();
@@ -100,6 +117,11 @@ var PasswordModal = function (_a) {
                         type: "setting/addOnlineSave",
                         payload: { date: date, id: res.id },
                     });
+                    // 古いデータを削除
+                    dispatch({
+                        type: "setting/deleteOnlineSave",
+                        payload: res.deleteIds || [],
+                    });
                     (0, OnlineInputFnc_1.correctAlart)();
                     dispatch(stores_1.settingStorage.saveSetting());
                     return [3 /*break*/, 5];
@@ -121,8 +143,12 @@ var PasswordModal = function (_a) {
     return (<common_1.BaseModal isVisible={isVisible} onClose={onClose}>
       <common_1.Spinner loading={loading}/>
       <react_native_1.View style={styles.msgBox}>
-        <common_1.MyText>パスワードを入力してください</common_1.MyText>
-        <common_1.MyText>(4文字以上の半角英数)</common_1.MyText>
+        <common_1.MyText fsize="lg" style={{ alignSelf: "center", marginBottom: 10 }}>
+          パスワードを入力してください
+        </common_1.MyText>
+        <common_1.MyText>・4文字以上の半角英数</common_1.MyText>
+        <common_1.MyText>・保存期間は6ヶ月</common_1.MyText>
+        <common_1.MyText>・保存上限は3スロット。それ以上は古いデータから削除。</common_1.MyText>
       </react_native_1.View>
       <react_native_1.View style={styles.inputBox}>
         <react_native_1.TextInput style={styles.input} placeholder="pass123" value={password} onChangeText={function (text) { return setPassword(text); }}/>
@@ -133,9 +159,14 @@ var PasswordModal = function (_a) {
       </react_native_1.View>
     </common_1.BaseModal>);
 };
+function getOldIds(dataList) {
+    return __spreadArray([], dataList, true).sort(function (a, b) { return new Date(b.date).getTime() - new Date(a.date).getTime(); })
+        .slice(2)
+        .map(function (item) { return item.id; });
+}
 var styles = react_native_1.StyleSheet.create({
     msgBox: {
-        alignItems: "center",
+        alignItems: "flex-start",
     },
     inputBox: {
         padding: 20,

package/dist/component/OnlineInput/PasswordIdModal.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 = 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;
+    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.");

package/dist/component/Result/ScoreCircle.js

@@ -23,6 +23,9 @@ var ScoreCircle = function (_a) {
           /{quizCnt}
         </common_1.MyText>
       </react_native_1.View>
+      <common_1.MyText fsize="sm" color="ltBlack">
+        ({Math.round((score / quizCnt) * 100)}%)
+      </common_1.MyText>
     </react_native_1.View>);
 };
 var styles = react_native_1.StyleSheet.create({
@@ -42,18 +45,17 @@ var styles = react_native_1.StyleSheet.create({
         top: -15,
     },
     title: {
-        fontSize: 14,
-        marginTop: 10,
+        marginTop: 20,
     },
     scoreBox: {
         flexDirection: "row",
         alignItems: "flex-end",
     },
     score: {
-        fontSize: 20,
+        fontSize: 18,
     },
     cnt: {
-        fontSize: 15,
+        fontSize: 13,
     },
 });
 exports.default = ScoreCircle;

package/dist/component/TagBadge5s.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
 import { Db } from "@nakamura-123/types";
-interface Porps {
+interface Props {
     subject: Db.SubjectInfo;
     index: number;
 }
-declare const TagBadge5s: React.FC<Porps>;
+declare const TagBadge5s: React.FC<Props>;
 export default TagBadge5s;

package/dist/functions/createQuizFncD.d.ts

@@ -1,11 +1,18 @@
-import { CfgInitial, QuizInitial } from "@nakamura-123/stores";
+import { 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: startCfg, selected: Selected) => Store.DQInStore[];
+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 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: startCfg, outOfUnitRange: number[], outOfYearRange: 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 {};

package/dist/functions/gradeFnc.d.ts

@@ -13,5 +13,5 @@ export declare const findMaxQuizCntLog: (DailyDB: RD) => DailyLogSchema | null;
 export declare const getTotalQuizCnt: (DailyLogDB: RD) => number;
 export declare const getConsecutiveStudyDays: (DailyLogDB: RD) => number;
 export declare const getLongestConsecutiveStudyDays: (DailyLogDB: RD) => number;
-export declare const promptStoreReview: (totalCnt: number) => Promise<void>;
+export declare const promptStoreReview: () => Promise<void>;
 export {};

package/dist/functions/gradeFnc.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 = 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;
+    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.");
@@ -141,7 +141,7 @@ var getLongestConsecutiveStudyDays = function (DailyLogDB) {
     return longestStreak;
 };
 exports.getLongestConsecutiveStudyDays = getLongestConsecutiveStudyDays;
-var promptStoreReview = function (totalCnt) { return __awaiter(void 0, void 0, void 0, function () {
+var promptStoreReview = function () { return __awaiter(void 0, void 0, void 0, function () {
     var isAvailable;
     return __generator(this, function (_a) {
         switch (_a.label) {

package/dist/functions/oldStorageFnc.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 = 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;
+    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.");
@@ -194,21 +194,23 @@ var replaceOldInputData = function (realm) { return __awaiter(void 0, void 0, vo
     });
 }); };
 // 60. inputIdの読み込み(reduxThunk)
-var loadOldInputId = (0, toolkit_1.createAsyncThunk)("old/loadOldInputId", function (_1, _a) { return __awaiter(void 0, [_1, _a], void 0, function (_, _b) {
-    var id;
-    var dispatch = _b.dispatch;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0: return [4 /*yield*/, loadOldData("id")];
-            case 1:
-                id = _c.sent();
-                if (!id)
+var loadOldInputId = (0, toolkit_1.createAsyncThunk)("old/loadOldInputId", function (_, _a) {
+    var dispatch = _a.dispatch;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var id;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, loadOldData("id")];
+                case 1:
+                    id = _b.sent();
+                    if (!id)
+                        return [2 /*return*/];
+                    dispatch({ type: "setting/updateOldId", payload: id[0] });
                     return [2 /*return*/];
-                dispatch({ type: "setting/updateOldId", payload: id[0] });
-                return [2 /*return*/];
-        }
+            }
+        });
     });
-}); });
+});
 // 90. 旧データの存在をMarkデータから確認
 var existOldData = function () { return __awaiter(void 0, void 0, void 0, function () {
     var markData;