@nakamura-123/pages 1.0.8 → 1.0.10

package/dist/page/QuizSetupPage.js

@@ -77,12 +77,11 @@ var QuizSetup = function (_a) {
         <QuizOptionDrill_1.default />
         {system === "JLPT" && (<common_1.RoundRectangleIcon icon="cog" title="Detail Setting" onPress={handleDetail}/>)}
         {system === "JLPT" && (<common_1.VibrationText>*{t("setup.turnOffSilent")}</common_1.VibrationText>)}
+        <react_native_1.View style={styles.btnBox}>
+          <common_1.MiniIconBtn onPress={function () { return handlePreStudy(); }} icon="book" title={t("setup.btn.study")} color="ltBlack"/>
+          <common_1.MiniIconBtn onPress={function () { return handleStart(); }} icon="play" title={t("setup.btn.start")} color="red"/>
+        </react_native_1.View>
       </react_native_gesture_handler_1.ScrollView>
-
-      <react_native_1.View style={styles.btnBox}>
-        <common_1.MiniIconBtn onPress={function () { return handlePreStudy(); }} icon="book" title={t("setup.btn.study")} color="ltBlack"/>
-        <common_1.MiniIconBtn onPress={function () { return handleStart(); }} icon="play" title={t("setup.btn.start")} color="red"/>
-      </react_native_1.View>
     </react_native_1.View>);
 };
 var styles = react_native_1.StyleSheet.create({
@@ -96,10 +95,10 @@ var styles = react_native_1.StyleSheet.create({
         flex: 1,
     },
     btnBox: {
+        marginTop: 20,
         flexDirection: "row",
         justifyContent: "space-around",
         alignItems: "center",
-        paddingVertical: 5,
     },
 });
 exports.default = QuizSetup;

package/dist/page/SettingPage.js

@@ -19,6 +19,7 @@ var SettingPage = function (_a) {
     var dispatch = (0, react_redux_1.useDispatch)();
     var existInputQuiz = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.app.appSetting.setting) === null || _a === void 0 ? void 0 : _a.existInputQuiz; });
     var oldInfo = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.oldInfo; });
+    var displayOldSystemBtn = Array.isArray(oldInfo.testInfo) && oldInfo.testInfo.length > 0;
     var isJLPT = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.setting.appSystem; }) === "JLPT";
     var settingInfo = [
         {
@@ -55,7 +56,7 @@ var SettingPage = function (_a) {
             icon: "exchange-alt",
             color: "yellow",
             handlePress: function () {
-                if (!oldInfo.testInfo || oldInfo.testInfo.length === 0)
+                if (!oldInfo.testInfo || oldInfo.testInfo.length < 1)
                     react_native_1.Alert.alert(t("setting.oldSystem.error"), t("setting.oldSystem.errorMsg"));
                 (0, oldStorageFnc_1.handleOldData)(realm, oldInfo, dispatch, t);
             },
@@ -64,6 +65,8 @@ var SettingPage = function (_a) {
     // JLPTの場合、古いデータを移行するボタンを削除
     if (isJLPT)
         settingInfo = settingInfo.filter(function (info) { return info.title !== t("setting.oldSystem.title"); });
+    if (!displayOldSystemBtn)
+        settingInfo = settingInfo.filter(function (info) { return info.title !== t("setting.oldSystem.title"); });
     if (existInputQuiz)
         settingInfo.push({
             title: t("setting.saveInput.title"),

package/dist/quiz/answer/BlankBtn.js

@@ -5,9 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var react_native_1 = require("react-native");
-var common_1 = require("@nakamura-123/common");
 var quizActionHook_1 = require("../../hooks/quizActionHook");
-var lib_1 = require("@nakamura-123/lib");
+var CheckButton_1 = __importDefault(require("./CheckButton"));
 var BlankBtn = function () {
     var useHandleCheck = (0, quizActionHook_1.useChangeModeToCheck)();
     var handleCheck = function (isCorrect) {
@@ -16,17 +15,10 @@ var BlankBtn = function () {
         useHandleCheck(isCorrect);
     };
     return (<react_native_1.View style={styles.container}>
-      <CheckButton text="不正解" iconName="times" backgroundColor={lib_1.colors.blue} onPress={function () { return handleCheck(false); }}/>
-      <CheckButton text="正解" iconName="check" backgroundColor={lib_1.colors.red} onPress={function () { return handleCheck(true); }}/>
+      <CheckButton_1.default text="不正解" iconName="times" backgroundColor="blue" onPress={function () { return handleCheck(false); }}/>
+      <CheckButton_1.default text="正解" iconName="check" backgroundColor="red" onPress={function () { return handleCheck(true); }}/>
     </react_native_1.View>);
 };
-var CheckButton = function (_a) {
-    var text = _a.text, iconName = _a.iconName, backgroundColor = _a.backgroundColor, onPress = _a.onPress;
-    return (<react_native_1.TouchableOpacity style={[styles.button, { backgroundColor: backgroundColor }]} onPress={onPress} activeOpacity={0.7}>
-    <common_1.IconInCircle name={iconName} size={17} cStyle={styles.iconCircle}/>
-    <common_1.MyText style={styles.buttonText}>{text}</common_1.MyText>
-  </react_native_1.TouchableOpacity>);
-};
 var styles = react_native_1.StyleSheet.create({
     container: {
         width: "100%",
@@ -34,22 +26,5 @@ var styles = react_native_1.StyleSheet.create({
         flexDirection: "row",
         justifyContent: "space-between",
     },
-    button: {
-        width: "49%",
-        borderRadius: 8,
-        paddingVertical: 7,
-        paddingHorizontal: 10,
-        flexDirection: "row",
-        justifyContent: "center",
-        alignItems: "center",
-    },
-    iconCircle: {
-        width: 27,
-        height: 27,
-    },
-    buttonText: {
-        color: lib_1.colors.ltBeige,
-        marginLeft: 5,
-    },
 });
 exports.default = BlankBtn;

package/dist/quiz/answer/CheckButton.d.ts

@@ -0,0 +1,10 @@
+import React from "react";
+import { ColorKeys } from "@nakamura-123/lib";
+interface Props {
+    text: string;
+    iconName: string;
+    backgroundColor: ColorKeys;
+    onPress: () => void;
+}
+declare const CheckButton: React.FC<Props>;
+export default CheckButton;

package/dist/quiz/answer/CheckButton.js

@@ -0,0 +1,36 @@
+"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 common_1 = require("@nakamura-123/common");
+var lib_1 = require("@nakamura-123/lib");
+var CheckButton = function (_a) {
+    var text = _a.text, iconName = _a.iconName, backgroundColor = _a.backgroundColor, onPress = _a.onPress;
+    return (<react_native_1.TouchableOpacity style={[styles.button, { backgroundColor: lib_1.colors[backgroundColor] }]} onPress={onPress} activeOpacity={0.7}>
+    <common_1.IconInCircle name={iconName} size={17} cStyle={styles.iconCircle}/>
+    <common_1.MyText style={styles.buttonText}>{text}</common_1.MyText>
+  </react_native_1.TouchableOpacity>);
+};
+var styles = react_native_1.StyleSheet.create({
+    button: {
+        width: "49%",
+        borderRadius: 8,
+        paddingVertical: 7,
+        paddingHorizontal: 10,
+        flexDirection: "row",
+        justifyContent: "center",
+        alignItems: "center",
+    },
+    iconCircle: {
+        width: 27,
+        height: 27,
+    },
+    buttonText: {
+        color: lib_1.colors.ltBeige,
+        marginLeft: 5,
+    },
+});
+exports.default = CheckButton;

package/dist/quiz/answer/Input/InputAnswerBtn.js

@@ -1,24 +1,12 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 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 common_1 = require("@nakamura-123/common");
-var lib_1 = require("@nakamura-123/lib");
 var quizActionHook_1 = require("../../../hooks/quizActionHook");
+var CheckButton_1 = __importDefault(require("../CheckButton"));
 var InputAnswerBtn = function () {
     var useHandleCheck = (0, quizActionHook_1.useChangeModeToCheck)();
     var buttons = [
@@ -26,29 +14,14 @@ var InputAnswerBtn = function () {
         { text: "正　解", color: "red", icon: "check", isCheck: true },
     ];
     return (<react_native_1.View style={styles.container}>
-      {buttons.map(function (btn, index) { return (<react_native_1.TouchableOpacity key={index} style={__assign(__assign({}, styles.btn), { backgroundColor: lib_1.colors[btn.color] })} onPress={function () { return useHandleCheck && useHandleCheck(btn.isCheck); }} activeOpacity={0.7}>
-          <common_1.IconInCircle name={btn.icon} circleColor="white" iconColor={btn.color} size={13} cStyle={styles.icon}/>
-          <common_1.MyText weight={700} color="white">
-            {btn.text}
-          </common_1.MyText>
-        </react_native_1.TouchableOpacity>); })}
+      {buttons.map(function (btn, index) { return (<CheckButton_1.default key={index} text={btn.text} iconName={btn.icon} backgroundColor={btn.color} onPress={function () { return useHandleCheck && useHandleCheck(btn.isCheck); }}/>); })}
     </react_native_1.View>);
 };
 var styles = react_native_1.StyleSheet.create({
     container: {
         flexDirection: "row",
-    },
-    icon: {
-        width: 20,
-        height: 20,
-        marginRight: 10,
-    },
-    btn: {
-        flex: 1,
-        padding: 5,
-        flexDirection: "row",
-        justifyContent: "center",
-        alignItems: "center",
+        width: "100%",
+        justifyContent: "space-between",
     },
 });
 exports.default = InputAnswerBtn;