@nakamura-123/pages 0.1.1 → 0.1.2

package/dist/component/Basic/BasicContents.js

@@ -37,12 +37,16 @@ var TagBadge5s_1 = __importDefault(require("../TagBadge5s"));
 var SubCategoryList_1 = __importDefault(require("../SubCategoryList"));
 var MiniTestCard_1 = __importDefault(require("../MiniTestCard"));
 var BasicSetting_1 = __importDefault(require("../BasicSetting"));
+var Guide_1 = __importDefault(require("../Guide"));
 var BasicPage = function (_a) {
     var navigation = _a.navigation, subject = _a.subject, index = _a.index;
     var dispatch = (0, react_redux_1.useDispatch)();
     // // Reduxから必要なデータを一括取得
     var categoryList = (0, react_redux_1.useSelector)(function (state) { return state.app[subject.list]; });
     var activeIndex = (0, react_redux_1.useSelector)(function (state) { return state.setting.viewSet[subject.name].activeIndex; });
+    var guide = (0, react_redux_1.useSelector)(function (state) { return state.setting.guide; });
+    var isShowGuide = guide.basicPageNav || guide.basicPageSwipe;
+    var guideName = guide.basicPageNav ? "basicPageNav" : "basicPageSwipe";
     // 選択されたカテゴリー情報を取得
     var selectedList = categoryList[index];
     // カテゴリー名を計算
@@ -89,6 +93,9 @@ var BasicPage = function (_a) {
     if (activeIndex !== index)
         return null;
     return (<react_native_gesture_handler_1.ScrollView style={styles.scrollContainer} contentContainerStyle={styles.container} showsVerticalScrollIndicator={false} ref={scrollViewRef} onMomentumScrollEnd={handleEndScroll}>
+      <Guide_1.default name={guideName} isVisible={isShowGuide}>
+        <react_native_1.View style={styles.navBar}/>
+      </Guide_1.default>
       <common_1.RoundRectangle title={categoryName} style={styles.categoryName}/>
       <common_1.HelpMark name="basicList" marginTop={20} top={-23}/>
       <SubCategoryList_1.default navigation={navigation} subject={subject} index={index}/>
@@ -103,6 +110,7 @@ var BasicPage = function (_a) {
     </react_native_gesture_handler_1.ScrollView>);
 };
 var styles = react_native_1.StyleSheet.create({
+    navBar: {},
     scrollContainer: {
         padding: 20,
     },

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,32 +42,32 @@ 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, todayStr;
-    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" });
-                }
-                todayStr = lib_1.timeFnc.getTodayString();
-                dispatch({ type: "setting/updateLastCheckedDate", payload: todayStr });
-                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) {
     if (allFreeState === "none")
         return false;
-    var inThisWeek = lib_1.timeFnc.isWithinWeek(lastCheckedDate);
-    if (inThisWeek && allFreeState === "paid")
+    var isOver3Days = lib_1.timeFnc.isOver3Days(lastCheckedDate);
+    if (!isOver3Days && allFreeState === "paid")
         return false;
     return true;
 };

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.");
@@ -35,12 +35,8 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAllFreeState = exports.restorePurchases = exports.handlePurchase = exports.initializeIAP = void 0;
-var netinfo_1 = __importDefault(require("@react-native-community/netinfo")); // ネットワーク状態確認用ライブラリ
 var react_native_1 = require("react-native");
 var react_native_iap_1 = require("react-native-iap");
 var stores_1 = require("@nakamura-123/stores");
@@ -87,18 +83,13 @@ var handlePurchase = function (productId, dispatch) { return __awaiter(void 0, v
     var params, purchase, receipt, isValid, err_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, isNetworkAvailable()];
-            case 1:
-                if (!(_a.sent())) {
-                    alert("インターネットに接続されていません。");
-                    throw new Error("インターネットに接続されていません。");
-                }
+            case 0:
                 params = react_native_1.Platform.OS === "ios" ? { sku: productId } : { skus: [productId] };
-                _a.label = 2;
-            case 2:
-                _a.trys.push([2, 7, , 8]);
+                _a.label = 1;
+            case 1:
+                _a.trys.push([1, 6, , 7]);
                 return [4 /*yield*/, (0, react_native_iap_1.requestPurchase)(params)];
-            case 3:
+            case 2:
                 purchase = _a.sent();
                 dispatch(pushCoinLog({ title: "Purchase", log: purchase }));
                 if (Array.isArray(purchase))
@@ -118,22 +109,22 @@ var handlePurchase = function (productId, dispatch) { return __awaiter(void 0, v
                     dispatch(pushCoinWarn({ title: "購入検証に失敗しました", log: purchase }));
                     throw new Error("購入検証に失敗しました");
                 }
-                if (!(react_native_1.Platform.OS === "android" && purchase.purchaseStateAndroid === 2)) return [3 /*break*/, 4];
+                if (!(react_native_1.Platform.OS === "android" && purchase.purchaseStateAndroid === 2)) return [3 /*break*/, 3];
                 alert("手続きが完了しました。。支払いが完了したら、このページにある「以前購入した方はこちらから復元」をタップしてください。");
-                return [3 /*break*/, 6];
-            case 4: return [4 /*yield*/, (0, react_native_iap_1.finishTransaction)({ purchase: purchase, isConsumable: false })];
-            case 5:
+                return [3 /*break*/, 5];
+            case 3: return [4 /*yield*/, (0, react_native_iap_1.finishTransaction)({ purchase: purchase, isConsumable: false })];
+            case 4:
                 _a.sent();
                 alert("購入が完了しました！");
-                _a.label = 6;
-            case 6: return [2 /*return*/, purchase]; // 成功時に購入データを返す
-            case 7:
+                _a.label = 5;
+            case 5: return [2 /*return*/, purchase]; // 成功時に購入データを返す
+            case 6:
                 err_2 = _a.sent();
                 // エラー処理を整理
                 dispatch(pushCoinError({ title: "購入処理中にエラーが発生しました", log: err_2 }));
                 alert("購入に失敗しました。\nしばらく時間を置いた後、もう一度実行してみてください。もしそれでも購入できない場合は「よくある質問」をご確認いただくか、必要に応じて「お問い合わせフォーム」からご連絡ください。");
                 return [2 /*return*/, null]; // 失敗時はnullを返す
-            case 8: return [2 /*return*/];
+            case 7: return [2 /*return*/];
         }
     });
 }); };
@@ -144,58 +135,55 @@ var restorePurchases = function (dispatch, isAlert) { return __awaiter(void 0, v
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                _a.trys.push([0, 9, , 10]);
-                return [4 /*yield*/, isNetworkAvailable()];
-            case 1:
-                if (!(_a.sent())) {
-                    isAlert && alert("インターネットに接続されていません。");
-                    throw new Error("インターネットに接続されていません。");
-                }
+                _a.trys.push([0, 8, , 9]);
+                console.log("restorePurchases");
                 return [4 /*yield*/, (0, react_native_iap_1.getAvailablePurchases)()];
-            case 2:
+            case 1:
                 purchases = _a.sent();
+                console.log("purchases", purchases);
                 dispatch(pushCoinLog({ title: "Purchases", log: purchases }));
                 receipts = [];
                 _i = 0, purchases_1 = purchases;
-                _a.label = 3;
-            case 3:
-                if (!(_i < purchases_1.length)) return [3 /*break*/, 6];
+                _a.label = 2;
+            case 2:
+                if (!(_i < purchases_1.length)) return [3 /*break*/, 5];
                 purchase = purchases_1[_i];
                 receipt = (0, ReceiptFnc_1.unifyReceipt)(purchase);
                 if (receipt) {
                     dispatch((0, exports.updateAllFreeState)(receipt));
                     receipts.push(receipt);
                 }
-                if (!checkNeedFinish(purchase)) return [3 /*break*/, 5];
+                if (!checkNeedFinish(purchase)) return [3 /*break*/, 4];
                 return [4 /*yield*/, (0, react_native_iap_1.finishTransaction)({ purchase: purchase, isConsumable: false })];
-            case 4:
+            case 3:
                 _a.sent();
-                _a.label = 5;
-            case 5:
+                _a.label = 4;
+            case 4:
                 _i++;
-                return [3 /*break*/, 3];
-            case 6:
+                return [3 /*break*/, 2];
+            case 5:
                 if (receipts.length === 0)
                     dispatch((0, exports.updateAllFreeState)(null)); // 購入アイテムがない場合はAllFreeの状態を更新
                 dispatch(pushCoinLog({ title: "Receipts", log: receipts }));
-                if (!(receipts.length > 0)) return [3 /*break*/, 8];
+                if (!(receipts.length > 0)) return [3 /*break*/, 7];
                 return [4 /*yield*/, stores_1.coinStorage.replacePurchasedItems(receipts)];
-            case 7:
+            case 6:
                 _a.sent();
-                _a.label = 8;
-            case 8:
+                _a.label = 7;
+            case 7:
                 isAlert &&
                     (receipts.length > 0
                         ? alert("購入アイテムを復元しました！")
                         : alert("購入済みのアイテムがありませんでした"));
                 return [2 /*return*/, receipts]; // 復元アイテムがあればpurchasesを返す
-            case 9:
+            case 8:
                 error_1 = _a.sent();
+                console.warn("Restore Error: ", error_1);
                 dispatch(pushCoinError({ title: "購入復元に失敗しました", log: error_1 }));
                 isAlert &&
                     alert("購入アイテムの復元に失敗しました。しばらく時間を置いた後、もう一度実行してみてください。もしそれでも購入できない場合は「よくある質問」をご確認いただくか、必要に応じて「お問い合わせフォーム」からご連絡ください。");
                 return [2 /*return*/, null]; // エラーが発生した場合もnullを返す
-            case 10: return [2 /*return*/];
+            case 9: return [2 /*return*/];
         }
     });
 }); };
@@ -223,18 +211,3 @@ exports.updateAllFreeState = updateAllFreeState;
 var checkNeedFinish = function (purchase) {
     return purchase.purchaseStateAndroid === 1 && !purchase.isAcknowledgedAndroid;
 };
-// 93. ネットワーク状態の確認
-var isNetworkAvailable = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var state, isConnected, isInternetReachable;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0: return [4 /*yield*/, netinfo_1.default.fetch()];
-            case 1:
-                state = _c.sent();
-                isConnected = (_a = state.isConnected) !== null && _a !== void 0 ? _a : false;
-                isInternetReachable = (_b = state.isInternetReachable) !== null && _b !== void 0 ? _b : false;
-                return [2 /*return*/, isConnected && isInternetReachable];
-        }
-    });
-}); };

package/dist/component/Grade/GradeCard/ChangeWeeklyModal.js

@@ -10,7 +10,7 @@ var ChangeWeeklyModal = function (_a) {
     var visible = _a.visible, optionInfo = _a.optionInfo, handleChange = _a.handleChange, selectedValue = _a.selectedValue, onClose = _a.onClose;
     return (<common_1.BaseModal isVisible={visible} onClose={onClose}>
       <common_1.MyText fsize="lg">目標を選んでください</common_1.MyText>
-      <react_native_1.FlatList data={optionInfo} keyExtractor={function (item) { return item.value.toString(); }} style={styles.listContainer} renderItem={function (_a) {
+      <react_native_1.FlatList data={optionInfo} keyExtractor={function (item) { return item.value.toString(); }} style={styles.listContainer} showsVerticalScrollIndicator={false} renderItem={function (_a) {
             var item = _a.item;
             var color = item.value === selectedValue ? "red" : "black";
             return (<react_native_1.TouchableOpacity onPress={function () { return handleChange(item.value); }} style={styles.option}>

package/dist/component/Grade/GradeCard/DatePickerModal.js

@@ -20,6 +20,13 @@ var DatePickerModal = function (_a) {
         dispatch({ type: "setting/updateTargetDay", payload: day.dateString });
         dispatch(stores_1.settingStorage.saveSetting());
     };
+    var renderCustomHeader = function (date) {
+        var month = date.getMonth() + 1; // 月を取得（0ベースのため +1）
+        var year = date.getFullYear(); // 年を取得
+        return (<common_1.MyText style={styles.headerText}>
+        {year}年 {month}月
+      </common_1.MyText>);
+    };
     return (<common_1.CloseBtnModal isVisible={isVisible} onClose={onClose}>
       <react_native_1.View style={styles.container}>
         <react_native_calendars_1.Calendar onDayPress={handleDateSelect} // 日付選択イベント
@@ -29,7 +36,8 @@ var DatePickerModal = function (_a) {
                 marked: true,
                 selectedColor: lib_1.colors.red,
             },
-            _b} theme={{
+            _b} renderHeader={renderCustomHeader} // ヘッダーをカスタマイズ
+     theme={{
             calendarBackground: "white",
             selectedDayBackgroundColor: lib_1.colors.red,
             todayTextColor: lib_1.colors.red,
@@ -49,10 +57,11 @@ var styles = react_native_1.StyleSheet.create({
         alignItems: "center",
         height: "65%",
     },
-    btnBox: {
-        flexDirection: "row",
-        justifyContent: "space-around",
-        marginTop: 20,
+    headerText: {
+        fontSize: 18,
+        fontWeight: "bold",
+        color: lib_1.colors.text,
+        textAlign: "center",
     },
 });
 exports.default = DatePickerModal;

package/dist/component/Guide.d.ts

@@ -0,0 +1,9 @@
+import React from "react";
+import { Store } from "@nakamura-123/types";
+interface GuideProps {
+    children: React.ReactNode;
+    isVisible?: boolean;
+    name: keyof Store.GuideType;
+}
+declare const Guide: React.FC<GuideProps>;
+export default Guide;

package/dist/component/Guide.js

@@ -0,0 +1,40 @@
+"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 NAV_GUIDE_MSG = "タブをスクロールして、項目も選択してください。また左右のスワイプでも移動することができます。";
+var SWIPE_GUIDE_MSG = "ページ内を左右にスワイプすることでも、他の項目に移動できます。";
+var GUIDE_MSG1 = "画面内の任意の場所を左にスワイプすることで、次の問題に進むことができます。";
+var GUIDE_MSG2 = "画面内の任意の場所を右にスワイプすることで、前の問題に戻ることができます。";
+var GUIDE_MSG_TAG = "ここで「ふせん」を手動で選択することもできます。また、右端のボタンで次の問題へ進みます。";
+var TAG_GUIDE_MSG = "ここをタップすると、「ふせん」の種類によって出題範囲を変更することができます。";
+// ガイド情報を取得
+var getGuideInfo = function (guideName) {
+    switch (guideName) {
+        case "basicPageNav":
+            return { msg: NAV_GUIDE_MSG, name: "basicPageNav", position: "bottom" };
+        case "basicPageSwipe":
+            return { msg: SWIPE_GUIDE_MSG, name: "basicPageSwipe", position: "left" };
+        case "setupPageTag":
+            return { msg: TAG_GUIDE_MSG, name: "setupPageTag", position: "bottom" };
+        case "quizPageTag":
+            return { msg: GUIDE_MSG_TAG, name: "quizPageTag", position: "top" };
+        case "quizPageSwipe1":
+            return { msg: GUIDE_MSG1, name: "quizPageSwipe1", position: "bottom" };
+        case "quizPageSwipe2":
+            return { msg: GUIDE_MSG2, name: "quizPageSwipe2", position: "bottom" };
+        default:
+            return { msg: NAV_GUIDE_MSG, name: "basicPageNav", position: "bottom" };
+    }
+};
+var Guide = function (_a) {
+    var children = _a.children, name = _a.name, isVisible = _a.isVisible;
+    var guideInfo = getGuideInfo(name);
+    return (<common_1.Tooltip content={guideInfo.msg} isVisible={isVisible} placement={guideInfo.position} guideName={guideInfo.name}>
+      {children}
+    </common_1.Tooltip>);
+};
+exports.default = Guide;

package/dist/component/Result/CharaCard.js

@@ -11,6 +11,7 @@ var lib_1 = require("@nakamura-123/lib");
 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;
@@ -22,7 +23,7 @@ var CaraCard = function (_a) {
     return (<react_native_1.View style={styles.container}>
       <common_1.MyText style={styles.title}>{enTitle}</common_1.MyText>
       <common_1.MyText color="gray">{jpTitle}</common_1.MyText>
-      <react_native_1.Image style={styles.imgBox} source={imgPath}/>
+      {showCharactor && <react_native_1.Image style={styles.imgBox} source={imgPath}/>}
     </react_native_1.View>);
 };
 var styles = react_native_1.StyleSheet.create({

package/dist/component/Result/QuizFlatList.js

@@ -18,14 +18,22 @@ var QuizFlatList = function (_a) {
         var id = String(quiz.yearId) + String(quiz.num);
         var question = "(".concat(i + 1, ") ").concat(quiz.question[0]);
         var color = lib_1.tagLevels.filter(function (item) { return item.level === quiz.tag; })[0].color;
-        return { id: id, question: question, color: color, index: i };
+        var isCorrected = quiz.isCorrected;
+        return { id: id, question: question, color: color, index: i, isCorrected: isCorrected };
     });
     // 02_リストアイテムのレンダリング
     var renderItem = function (_a) {
         var item = _a.item;
         var text = item.question.replace(/zz/g, " 空欄");
+        var icon = item.isCorrected ? "circle" : "times";
+        var iconColor = item.isCorrected ? "red" : "blue";
         return (<react_native_1.TouchableOpacity style={styles.itemContainer} activeOpacity={0.7} onPress={function () { return handlePress(item.index); }}>
-        <common_1.IconInCircle name="tag" circleColor={item.color} size={11} iconColor="white"/>
+        <react_native_1.View>
+          <common_1.IconInCircle name="tag" circleColor={item.color} size={11} iconColor="white"/>
+          <react_native_1.View style={{ position: "absolute", top: -5, right: -5 }}>
+            <common_1.Icon5 name={icon} size={11} color={iconColor}/>
+          </react_native_1.View>
+        </react_native_1.View>
         <react_native_1.View style={styles.questionBox}>
           <MyTextqqyy_1.default isNotSearch fsize="xs">
             {text}

package/dist/component/TagBadge5sPress.js

@@ -15,7 +15,12 @@ var TagBadge5sPress = function (_a) {
     var tagActives = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.tags; });
     var tagInfos = (0, tagFnc_1.countTagsByLevelSelected)(categoryTags, tagActives);
     return (<react_native_1.View style={styles.container}>
-      {tagInfos.map(function (tag, i) { return (<common_1.Badge key={i} name={String(tag.cnt)} icon={"tag"} circleColor={tag.circle} badgeColor={tag.badge} iconColor={tag.icon} onPress={function () { return dispatch(stores_1.cfgAction.changeTagActive(tag.level)); }}/>); })}
+      {tagInfos.map(function (tag, i) { return (<react_native_1.View key={i} style={{ alignItems: "center" }}>
+          <common_1.Badge name={String(tag.cnt)} icon={"tag"} circleColor={tag.circle} badgeColor={tag.badge} iconColor={tag.icon} onPress={function () { return dispatch(stores_1.cfgAction.changeTagActive(tag.level)); }}/>
+          <common_1.MyText fsize="xs" style={styles.txt}>
+            {tag.circle === "white" ? "OFF" : "ON"}
+          </common_1.MyText>
+        </react_native_1.View>); })}
     </react_native_1.View>);
 };
 var styles = react_native_1.StyleSheet.create({
@@ -25,5 +30,8 @@ var styles = react_native_1.StyleSheet.create({
         width: "100%",
         marginBottom: 10,
     },
+    txt: {
+        marginTop: 3,
+    },
 });
 exports.default = TagBadge5sPress;

package/dist/functions/createQuizFnc.js

@@ -22,7 +22,8 @@ var getBasicQuizList = function (QuestionDB, startCfg, selected) {
         var key = lesson.key;
         if (key === 0)
             questions = (0, questionFilter_1.getYearQuestions)(QuestionDB, category);
-        questions = (0, questionFilter_1.getSubYearQuestions)(QuestionDB, category, key);
+        else
+            questions = (0, questionFilter_1.getSubYearQuestions)(QuestionDB, category, key);
     }
     // 04_タグによる絞り込み
     questions = (0, questionFilter_1.filterByTags)(questions, startCfg);

package/dist/functions/oldStorageFnc.d.ts

@@ -0,0 +1,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>;