@nakamura-123/pages 0.1.32 → 0.1.35

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/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/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/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

@@ -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/tagFncD.d.ts

@@ -1,7 +1,7 @@
 import { ColorKeys } from "@nakamura-123/lib";
 import { QSelected, Lib } from "@nakamura-123/types";
 import { QRD, TagInfo } from "../types/filterType";
-export declare function getCategoryTagLevelCntsD(QuestionDB: QRD, category: number, type: "unit" | "year", outOfYearRange?: number[] | undefined): string[];
+export declare function getCategoryTagLevelCntsD(QuestionDB: QRD, category: number, type: "unit" | "year", outOfYearRange?: number[] | undefined): Lib.LevelNames[];
 export declare function getUnitSubTagLevelCnts(QuestionDB: QRD, unitId: number, subUnitId: number, outOfYearRange?: number[]): string[];
 export declare function getYearSubTagLevelCnts(QuestionDB: QRD, year: number, key: number): string[];
 export declare const getSubTagLevelCnts: (QuestionDB: QRD, selected: QSelected.SelectedUnit | QSelected.SelectedYear, outOfYearRange?: number[]) => Lib.LevelNames[];

package/dist/functions/tagFncJ.d.ts

@@ -1,7 +1,7 @@
 import { Db, JAssets } from "@nakamura-123/types";
 import { QSelected, Lib } from "@nakamura-123/types";
 import type { QRJ } from "../types/filterType";
-export declare function getCategoryTagLevelCntsJ(QuestionDB: QRJ, category: number, tag?: JAssets.JTag): string[];
+export declare function getCategoryTagLevelCntsJ(QuestionDB: QRJ, category: number, tag?: JAssets.JTag): Lib.LevelNames[];
 export declare function getUnitSubTagLevelCntsJ(QuestionDB: QRJ, unitId: number, subUnitId: number, tag?: JAssets.JTag): string[];
 export declare const getSubTagLevelCntsJ: (QuestionDB: QRJ, selected: QSelected.SelectedUnit | QSelected.SelectedYear) => Lib.LevelNames[];
 export declare const getTagNameFilterJ: (QuestionDB: QRJ, tagName?: Db.SubjectTag) => Lib.LevelNames[];

package/dist/page/GradePage.js

@@ -39,17 +39,22 @@ var gradeFnc_1 = require("../functions/gradeFnc");
 var react_i18next_1 = require("react-i18next");
 var react_redux_1 = require("react-redux");
 var JAllTags_1 = __importDefault(require("../component/Grade/JAllTags"));
+var lib_1 = require("@nakamura-123/lib");
+var UnitCircles_1 = __importDefault(require("../component/Grade/UnitCircles"));
+var basicHook_1 = require("../hooks/basicHook");
+var YearCircles_1 = __importDefault(require("../component/Grade/YearCircles"));
 var GradePage = function (_a) {
     var navigation = _a.navigation;
     var t = (0, react_i18next_1.useTranslation)().t;
     var realm = (0, react_2.useRealm)();
     var DailyLogDB = (0, react_2.useQuery)(db_1.DailyLogSchema);
+    var QuestionDBInfo = (0, basicHook_1.useGetQuestionQuery)();
     var appSystem = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.setting.appSystem; }) ||
         "drill";
     var totalCnt = (0, gradeFnc_1.getTotalQuizCnt)(DailyLogDB);
     // レビューをリクエスト可能か確認
     (0, react_1.useEffect)(function () {
-        (0, gradeFnc_1.promptStoreReview)(totalCnt);
+        (0, gradeFnc_1.promptStoreReview)();
         db_1.DailyLogModel.mergeDuplicateDailyLogs(realm);
     }, []);
     return (<react_native_1.ScrollView style={styles.page} contentContainerStyle={styles.container}>
@@ -57,7 +62,9 @@ var GradePage = function (_a) {
       <QuizCntGraph_1.default DailyLogDB={DailyLogDB}/>
       <Square4s_1.default DailyLogDB={DailyLogDB}/>
       {appSystem === "JLPT" ? <JAllTags_1.default /> : <AllTags_1.default />}
-      <common_1.RoundRectangleIcon title={t("grade.allBadges")} onPress={function () { return navigation.navigate("Badge"); }} icon="shield-alt"/>
+      <UnitCircles_1.default QuestionDBInfo={QuestionDBInfo}/>
+      <YearCircles_1.default QuestionDBInfo={QuestionDBInfo}/>
+      <common_1.RoundRectangleIcon title={t("grade.allBadges")} onPress={function () { return navigation.navigate("Badge"); }} icon="shield-alt" style={{ backgroundColor: lib_1.colors.ltRed }}/>
     </react_native_1.ScrollView>);
 };
 var styles = react_native_1.StyleSheet.create({

package/dist/page/HomePage.js

@@ -144,7 +144,7 @@ var HomePage = function (_a) {
         })}
           <react_native_1.View style={styles.settingBtns}>
             <common_1.SettingBtn icon="gem" title={t("home.setting.coin")} onPress={function () { return navigation.navigate("Coin"); }}/>
-            <common_1.SettingBtn icon="question" title={t("home.setting.FAQ")} onPress={function () { return navigation.navigate("FAQ"); }}/>
+            <common_1.SettingBtn icon="question" title={t("home.setting.FAQ")} onPress={function () { return react_native_1.Linking.openURL("https://drill-notes.com/faq"); }}/>
             <common_1.SettingBtn icon="cog" title={t("home.setting.setting")} onPress={function () { return navigation.navigate("Setting"); }}/>
           </react_native_1.View>
           <react_native_1.View style={styles.settingBtns}>

package/dist/quiz/Title.js

@@ -11,28 +11,40 @@ var common_1 = require("@nakamura-123/common");
 var quizHook_1 = require("../hooks/quizHook");
 var QuizTitle = function () {
     var _a;
-    var turn = (0, react_redux_1.useSelector)(function (state) { return state.quiz.currentInfo.state.turn; });
+    var _b = (0, react_redux_1.useSelector)(function (state) { return state.quiz.currentInfo.state; }), turn = _b.turn, score = _b.score;
+    var mode = (0, quizHook_1.useGetMode)();
     var question = (0, quizHook_1.useQuestionDataD)();
     var allQuizCnt = (0, react_redux_1.useSelector)(function (state) { return state.quiz.quizList.length; });
     var isShowTag = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.inQuizOption.isShowTag; });
     if (!question)
         return null;
     var title = question.title;
-    var cntText = "".concat(turn + 1, " / ").concat(allQuizCnt, "\u554F\u76EE");
     var tagColor = ((_a = lib_1.tagLevels.find(function (tag) { return tag.level === question.tag; })) === null || _a === void 0 ? void 0 : _a.color) || "ltBlack";
+    var rateCnt = mode === "quiz" ? turn || 1 : turn + 1 || 1;
+    var rate = Math.round((score / rateCnt) * 100).toString();
+    // 文章
+    var cntText = "".concat(turn + 1, "/").concat(allQuizCnt, "\u554F\u76EE");
+    var correctText = "\u3000".concat(score, "\u554F\u6B63\u89E3(").concat(rate, "%)");
     return (<react_native_1.View style={styles.container}>
-      {isShowTag && <common_1.Icon5 name="tag" size={15} color={tagColor}/>}
-      <common_1.MyText fsize="md" style={styles.title}>
-        {title}
-      </common_1.MyText>
-      <common_1.MyText fsize="sm" style={styles.cntText}>
-        {cntText}
-      </common_1.MyText>
+      <react_native_1.View style={{ flexDirection: "row", alignItems: "center" }}>
+        {isShowTag && <common_1.Icon5 name="tag" size={15} color={tagColor}/>}
+        <common_1.MyText fsize="md" style={styles.title}>
+          {title}
+        </common_1.MyText>
+      </react_native_1.View>
+      <react_native_1.View style={{ flexDirection: "row", alignItems: "center" }}>
+        <common_1.MyText fsize="sm" style={styles.cntText}>
+          {cntText}
+        </common_1.MyText>
+        <common_1.MyText fsize="sm" style={styles.cntText}>
+          {correctText}
+        </common_1.MyText>
+      </react_native_1.View>
     </react_native_1.View>);
 };
 var styles = react_native_1.StyleSheet.create({
     container: {
-        flexDirection: "row",
+        flexDirection: "column",
         justifyContent: "center",
         alignItems: "center",
         backgroundColor: lib_1.colors.ltBeige,

package/dist/quiz/question/QuestionFormats.js

@@ -57,6 +57,10 @@ var checkMultiState = function (multiState, index) {
 };
 // 04.check時とresult時の表示
 var checkMultiStateResult = function (multiSel, selectedIndexes, index) {
+    console.log("multiSel", multiSel);
+    console.log("selectedIndexes", selectedIndexes);
+    if (!selectedIndexes || selectedIndexes.length === 0)
+        return "inCorrect";
     var selectedIndex = selectedIndexes[index];
     var isCorrect = multiSel[index][selectedIndex].isCorrect;
     if (isCorrect)