Merge branch 'main' into feature/#1

lib/model/operators.dart

@@ -14,6 +14,7 @@ final Map<String, Operator> _strOprMap = {
   ")": 0x002,
   "+": 0x100,
   "-": 0x101,
+  "//": 0x102,
   "*": 0x110,
   "/": 0x111,
   "^": 0x120,
@@ -28,6 +29,7 @@ final Map<String, Operator> _strOprMap = {
 final Map<Operator, BinaryOperator> _binaryOprFuncMap = {
   0x100: (left, right) => left + right,
   0x101: (left, right) => left - right,
+  0x102: (left, right) => left * right / (left + right),
   0x110: (left, right) => left * right,
   0x111: (left, right) => left / right,
   0x120: (left, right) => pow(left, right).toDouble()
@@ -142,6 +144,9 @@ class Operators {
   /// `-` 引き算
   static const sub = 0x101;
 
+  /// `//` 並列接続の抵抗の足し算演算子
+  static const para = 0x102;
+
   /// `*` 掛け算
   static const multi = 0x110;
 

lib/model/result_data.dart

@@ -0,0 +1,35 @@
+class ResultData {
+  /// id
+  final int id;
+
+  /// 半角空白を区切り文字とした式
+  final String formula;
+
+  /// 計算結果
+  final double result;
+
+  /// 作成された日時
+  final DateTime createdDate;
+
+  ResultData(this.id, this.formula, this.result, this.createdDate);
+
+  /// 式の配列から`ResultDataを生成します。
+  ResultData.fromList(
+      this.id, List<String> formulaList, this.result, this.createdDate)
+      : formula = formulaList.join(" ");
+
+  /// JSONをデコードして出てきた`Map<String, dynamic>`から[ResultData]を生成します。
+  ResultData.fromJson(Map<String, dynamic> json)
+      : id = json["id"],
+        formula = json["formula"],
+        result = json["result"],
+        createdDate = json["created_date"];
+
+  /// JSONへエンコードするためにデータを変換します。
+  Map<String, dynamic> toJson() => {
+        "id": id,
+        "formula": formula,
+        "result": result,
+        "created_date": createdDate,
+      };
+}

pubspec.yaml

@@ -34,6 +34,7 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
+  shared_preferences: ^2.0.15
 
 dev_dependencies:
   flutter_test:

test/model/result_data_test.dart

@@ -0,0 +1,44 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:calculator2022/model/result_data.dart';
+
+void main() {
+  test("fromJson_test", () {
+    final json = <String, dynamic>{
+      "id": 0,
+      "formula": "fo-myura",
+      "result": 0.3232,
+      "created_date": DateTime(2001, 05, 24, 12, 34)
+    };
+    var jsd = ResultData.fromJson(json);
+
+    expect(jsd.formula, "fo-myura");
+  });
+
+  test("toJson_test", () {
+    final jsd = ResultData(1, "fo-myura", 3, DateTime(2001, 05, 24, 12, 34));
+    final json = <String, dynamic>{
+      "id": 1,
+      "formula": "fo-myura",
+      "result": 3,
+      "created_date": DateTime(2001, 05, 24, 12, 34)
+    };
+    final jsdJson = jsd.toJson();
+
+    expect(jsdJson, json);
+  });
+
+  test("toJsonList_test", () {
+    final formulaList = ["1", "2", "+"];
+    final jsd =
+        ResultData.fromList(1, formulaList, 3, DateTime(2001, 05, 24, 12, 34));
+    final json = <String, dynamic>{
+      "id": 1,
+      "formula": "1 2 +",
+      "result": 3,
+      "created_date": DateTime(2001, 05, 24, 12, 34)
+    };
+    var jsdJson = jsd.toJson();
+
+    expect(jsdJson, json);
+  });
+}