childMode時表示しないように

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 グループワークチーム「シフトメイト」メンバー
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,38 +1,8 @@
 # WIP
 
-~~## メモ
+## メモ
 - リリース前(=提出前)には`DEBUG_ONLY`で検索してチェック(念のため)
 
 ## リリース前チェック
-- DBの破壊的マイグレーションを許可するオプションを無効に~~
-
-#### 補足
-- カレンダーはCompactCalendarViewをそのまま使用する予定でしたが，AndroidX環境で使用するとクラス重複でビルドできないため，AndroidXに対応させるPRを取り込んだ物を専用Mavenリポジトリとして公開して使用しています
-    - https://github.com/r-ca/CompactCalendarView
-
-## 補足
-- 直前に大規模リファクタリングを始めていたため，未使用コード(ファイル)がいくつか残っています
-    - `:feature:setting`, `:feature:parent` は廃止されており, 現在は使用されていません
-    - `:feature:child` は子供管理画面のアクティビティのみ使用されています
-
-- 親, 子供のタスク一覧画面はどちらも`:feature:common`の`CommonHomeFragment`を用いており, ナビゲーショングラフを切り替えることで表示モードを切り替えています
-
-## 既知の問題
-- 初回起動時, ウォレットの表示に失敗する場合がある
-- 特定の操作を行った場合にナビゲーションが正常に動作しなくなる場合がある
-- 特定の状況で子供モード時に追加ウィンドウが開けてしまう場合がある(APIの権限チェックではじかれるため, 実際に追加することは不可能)
-- カレンダーの表示を切り替える際, RecyclerViewのアニメーションが一定範囲にしか反映されない
-- お手伝い履歴がローカルキャッシュされておらず，毎回サーバーから全データを取得している
-- ウォレット画面でPull-to-Refreshが動作しない
-- ウォレット画面にて非UIスレッドでUI更新を行ってしまっている?
-- オフライン時，ウォレットなど一部の画面でクラッシュする場合がある
-- 資格情報が間違ったままログインできてしまう
-- キャッシュとサーバーのマスターデータに差異があった場合, 再表示しないと表示に適応されない場合がある(コールバックの処理が適切に実装されていない画面がある)
-
-## TODO
-- 全体的なUX改善
-- インメモリデータベースの活用(Related: 全体的なUX改善)
-- ViewModelの本格導入
-- タスクのアサイン機能への対応
-- 親モードで子供画面を表示したとき, 親モードへの移動にロックをかけられるようにする
-- 非DynamicColor機種で使用されるテーマの適用が中途半端なので完全に適用するように
+- DBの破壊的マイグレーションを許可するオプションを無効に
+- 

app/src/main/java/one/nem/kidshift/MainActivity.java

@@ -116,6 +116,8 @@ public class MainActivity extends AppCompatActivity {
                 } else if (item.getItemId() == R.id.show_account_dialog) {
                     showAccountDialog();
                     return true;
+                } else if (item.getItemId() == R.id.issue_login_code) {
+                    parentData.issueLoginCode().thenAccept((loginCode) -> runOnUiThread(() -> showLoginCodeDialog(loginCode)));
                 } else {
                     logger.warn("不明なアイテム: " + item.getItemId());
                 }
@@ -156,6 +158,9 @@ public class MainActivity extends AppCompatActivity {
 
             // manage_child_accountを削除
             navigationView.getMenu().removeItem(R.id.manage_child_account);
+
+            // issue_login_codeを削除
+            navigationView.getMenu().removeItem(R.id.issue_login_code);
         } else {
             logger.info("Child mode is disabled!");
             bottomNavigationView.getMenu().removeItem(R.id.feature_common_child_child_navigation);
@@ -237,6 +242,19 @@ public class MainActivity extends AppCompatActivity {
                 .show();
     }
 
+    private void showLoginCodeDialog(Integer loginCode) {
+        View view = getLayoutInflater().inflate(R.layout.parent_login_code_dialog_layout, null);
+        TextView loginCodeTextView = view.findViewById(R.id.loginCodeTextView);
+        // loginCodeをStringに変換して4桁 2つに分割してハイフンで繋げる
+        loginCodeTextView.setText(loginCode.toString().substring(0, 4) + "-" + loginCode.toString().substring(4));
+
+        new MaterialAlertDialogBuilder(this)
+                .setTitle("ログインコード")
+                .setView(view)
+                .setPositiveButton("閉じる", (dialog, which) -> dialog.dismiss())
+                .show();
+    }
+
     private void showDebugDialog() {
 
         ScrollView scrollView = new ScrollView(this);

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,15 +1,30 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-  <group android:scaleX="0.435"
-      android:scaleY="0.435"
-      android:translateX="6.78"
-      android:translateY="6.78">
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M22,8c0,-0.55 -0.45,-1 -1,-1h-7c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h7C21.55,9 22,8.55 22,8zM13,16c0,0.55 0.45,1 1,1h7c0.55,0 1,-0.45 1,-1c0,-0.55 -0.45,-1 -1,-1h-7C13.45,15 13,15.45 13,16zM10.47,4.63c0.39,0.39 0.39,1.02 0,1.41l-4.23,4.25c-0.39,0.39 -1.02,0.39 -1.42,0L2.7,8.16c-0.39,-0.39 -0.39,-1.02 0,-1.41c0.39,-0.39 1.02,-0.39 1.41,0l1.42,1.42l3.54,-3.54C9.45,4.25 10.09,4.25 10.47,4.63zM10.48,12.64c0.39,0.39 0.39,1.02 0,1.41l-4.23,4.25c-0.39,0.39 -1.02,0.39 -1.42,0L2.7,16.16c-0.39,-0.39 -0.39,-1.02 0,-1.41s1.02,-0.39 1.41,0l1.42,1.42l3.54,-3.54C9.45,12.25 10.09,12.25 10.48,12.64L10.48,12.64z"/>
-  </group>
-</vector>
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

app/src/main/res/layout/parent_login_code_dialog_layout.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextView
+            android:id="@+id/loginCodeTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="30dp"
+            android:paddingBottom="25dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Display3" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/nav_menu.xml

@@ -10,6 +10,11 @@
         android:icon="@drawable/manage_accounts_24px"
         android:title="子供アカウントの管理" />
 
+    <item
+        android:id="@+id/issue_login_code"
+        android:icon="@drawable/password_24px"
+        android:title="Alexaログインコード発行" />
+
     <!-- Divider -->
     <item
         android:id="@+id/divider"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#F1DEDE</color>
-</resources>

data/src/main/java/one/nem/kidshift/data/ParentData.java

@@ -32,4 +32,10 @@ public interface ParentData {
      */
     CompletableFuture<Void> updateParent(ParentModel parent);
 
+    /**
+     * 親ユーザーログインコード発行
+     * @return ログインコード
+     */
+    CompletableFuture<Integer> issueLoginCode();
+
 }

data/src/main/java/one/nem/kidshift/data/RewardData.java

@@ -16,7 +16,5 @@ public interface RewardData {
 
     CompletableFuture<List<HistoryModel>> getRewardHistoryList(String childId);
 
-    CompletableFuture<Void> payReward(String historyId);
 
-    CompletableFuture<Void> payReward(List<String> historyIds);
 }

data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java

@@ -159,7 +159,7 @@ public class KSActionsImpl implements KSActions {
     @Override
     public CompletableFuture<List<HistoryModel>> syncHistory(String childId) {
         CompletableFuture<HistoryListResponse> callHistoryApi = CompletableFuture.supplyAsync(() -> {
-            Call<HistoryListResponse> call = kidShiftApiService.getHistory(childId, true); // TODO: containPaidを引数に
+            Call<HistoryListResponse> call = kidShiftApiService.getHistory(childId);
             try {
                 Response<HistoryListResponse> response = call.execute();
                 if (!response.isSuccessful()) {

data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java

@@ -10,6 +10,7 @@ import one.nem.kidshift.data.UserSettings;
 import one.nem.kidshift.data.retrofit.KidShiftApiService;
 import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse;
 import one.nem.kidshift.data.retrofit.model.parent.ParentRenameRequest;
+import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginCodeResponse;
 import one.nem.kidshift.model.ParentModel;
 import one.nem.kidshift.model.callback.ParentModelCallback;
 import one.nem.kidshift.utils.KSLogger;
@@ -74,4 +75,17 @@ public class ParentDataImpl implements ParentData {
         }
     }
 
+    @Override
+    public CompletableFuture<Integer> issueLoginCode() {
+        Call<ParentLoginCodeResponse> call = kidShiftApiService.issueParentLoginCode();
+        try {
+            ParentLoginCodeResponse response = call.execute().body();
+            if (response == null) {
+                return CompletableFuture.completedFuture(null);
+            }
+            return CompletableFuture.completedFuture(response.getCode());
+        } catch (Exception e) {
+            return CompletableFuture.completedFuture(null);
+        }
+    }
 }

data/src/main/java/one/nem/kidshift/data/impl/RewardDataImpl.java

@@ -10,13 +10,11 @@ import one.nem.kidshift.data.ChildData;
 import one.nem.kidshift.data.KSActions;
 import one.nem.kidshift.data.RewardData;
 import one.nem.kidshift.data.UserSettings;
-import one.nem.kidshift.data.retrofit.KidShiftApiService;
 import one.nem.kidshift.data.room.utils.CacheWrapper;
 import one.nem.kidshift.model.ChildModel;
 import one.nem.kidshift.model.HistoryModel;
 import one.nem.kidshift.utils.KSLogger;
 import one.nem.kidshift.utils.factory.KSLoggerFactory;
-import retrofit2.Call;
 
 public class RewardDataImpl implements RewardData {
 
@@ -25,15 +23,14 @@ public class RewardDataImpl implements RewardData {
     private final CacheWrapper cacheWrapper;
     private final KSLogger logger;
     private final ChildData childData;
-    private final KidShiftApiService kidShiftApiService;
+
 
     @Inject
-    public RewardDataImpl(KSLoggerFactory ksLoggerFactory, CacheWrapper cacheWrapper, UserSettings userSettings, KSActions ksActions, ChildData childData, KidShiftApiService kidShiftApiService) {
+    public RewardDataImpl(KSLoggerFactory ksLoggerFactory, CacheWrapper cacheWrapper, UserSettings userSettings, KSActions ksActions, ChildData childData) {
         this.userSettings = userSettings;
         this.ksActions = ksActions;
         this.cacheWrapper = cacheWrapper;
         this.childData = childData;
-        this.kidShiftApiService = kidShiftApiService;
         this.logger = ksLoggerFactory.create("RewardDataImpl");
     }
 
@@ -56,30 +53,4 @@ public class RewardDataImpl implements RewardData {
     public CompletableFuture<List<HistoryModel>> getRewardHistoryList(String childId) { // TODO: localCacheを使う
         return CompletableFuture.supplyAsync(() -> ksActions.syncHistory(childId).join());
     }
-
-    @Override
-    public CompletableFuture<Void> payReward(String historyId) {
-        return CompletableFuture.runAsync(() -> {
-            Call<Void> call = kidShiftApiService.payHistory(historyId, true);
-            try {
-                call.execute();
-            } catch (Exception e) {
-                logger.error("Failed to pay reward : " + e.getMessage());
-            }
-        });
-    }
-
-    @Override
-    public CompletableFuture<Void> payReward(List<String> historyIds) {
-        return CompletableFuture.runAsync(() -> {
-            historyIds.forEach(historyId -> { // TODO: API側でリストに対応する
-                Call<Void> call = kidShiftApiService.payHistory(historyId, true);
-                try {
-                    call.execute();
-                } catch (Exception e) {
-                    logger.error("Failed to pay reward : " + e.getMessage());
-                }
-            });
-        });
-    }
 }

data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java

@@ -11,6 +11,7 @@ import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse;
 import one.nem.kidshift.data.retrofit.model.parent.ParentRenameRequest;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthRequest;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse;
+import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginCodeResponse;
 import one.nem.kidshift.data.retrofit.model.task.HistoryListResponse;
 import one.nem.kidshift.data.retrofit.model.task.TaskAddRequest;
 import one.nem.kidshift.data.retrofit.model.task.TaskListResponse;
@@ -183,11 +184,16 @@ public interface KidShiftApiService {
     @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER)
     Call<ChildLoginCodeResponse> issueLoginCode(@Path("id") String id);
 
+    /**
+     * 保護者ログインコード発行
+     * @return ParentLoginCodeResponse
+     */
+    @GET("/parent/issue")
+    @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER)
+    Call<ParentLoginCodeResponse> issueParentLoginCode();
+
     @GET("/task/history/{childId}")
     @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER)
-    Call<HistoryListResponse> getHistory(@Path("childId") String childId, @Query("containPaid") boolean containPaid);
+    Call<HistoryListResponse> getHistory(@Path("childId") String childId);
 
-    @POST("/task/history/{historyId}/paid")
-    @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER)
-    Call<Void> payHistory(@Path("historyId") String historyId, @Query("isPaid") boolean isPaid);
 }

data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/HistoryModelConverter.java

@@ -19,7 +19,6 @@ public class HistoryModelConverter { // TODO: JavaDoc
         historyModel.setTaskId(historyResponse.getTaskId());
         historyModel.setChildId(historyResponse.getChildId());
         historyModel.setRegisteredAt(historyResponse.getRegisteredAt());
-        historyModel.setPaid(historyResponse.isPaid());
         return historyModel;
     }
 
@@ -29,7 +28,6 @@ public class HistoryModelConverter { // TODO: JavaDoc
         historyResponse.setTaskId(historyModel.getTaskId());
         historyResponse.setChildId(historyModel.getChildId());
         historyResponse.setRegisteredAt(historyModel.getRegisteredAt());
-        historyResponse.setPaid(historyModel.isPaid());
         return historyResponse;
     }
 

data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentLoginCodeResponse.java

@@ -0,0 +1,20 @@
+package one.nem.kidshift.data.retrofit.model.parent.auth;
+
+public class ParentLoginCodeResponse {
+    private int code;
+
+    public ParentLoginCodeResponse(int code) {
+        this.code = code;
+    }
+
+    public ParentLoginCodeResponse() {
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

data/src/main/java/one/nem/kidshift/data/retrofit/model/task/HistoryBaseItem.java

@@ -7,14 +7,12 @@ public class HistoryBaseItem {
     private String taskId;
     private String childId;
     private Date registeredAt;
-    private boolean isPaid;
 
-    public HistoryBaseItem(String id, String taskId, String childId, Date registeredAt, boolean isPaid) {
+    public HistoryBaseItem(String id, String taskId, String childId, Date registeredAt) {
         this.id = id;
         this.taskId = taskId;
         this.childId = childId;
         this.registeredAt = registeredAt;
-        this.isPaid = isPaid;
     }
 
     public HistoryBaseItem() {
@@ -51,12 +49,4 @@ public class HistoryBaseItem {
     public void setRegisteredAt(Date registeredAt) {
         this.registeredAt = registeredAt;
     }
-
-    public boolean isPaid() {
-        return isPaid;
-    }
-
-    public void setPaid(boolean isPaid) {
-        this.isPaid = isPaid;
-    }
 }

feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java

@@ -24,8 +24,6 @@ import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -48,7 +46,6 @@ import one.nem.kidshift.data.TaskData;
 import one.nem.kidshift.data.UserSettings;
 import one.nem.kidshift.feature.common.adapter.ChildListItemAdapter;
 import one.nem.kidshift.feature.common.adapter.TaskListItemAdapter;
-import one.nem.kidshift.model.HistoryModel;
 import one.nem.kidshift.model.callback.TaskItemModelCallback;
 import one.nem.kidshift.model.tasks.TaskItemModel;
 import one.nem.kidshift.utils.FabManager;
@@ -380,7 +377,7 @@ public class CommonHomeFragment extends Fragment {
     private CompletableFuture<Void> updateCalender() {
         return rewardData.getRewardHistoryList().thenAccept(historyModels -> {
             historyModels.forEach(historyModel -> {
-                compactCalendarView.addEvent(new Event(Color.RED, historyModel.getRegisteredAt().getTime(), historyModel)); // debug
+                compactCalendarView.addEvent(new Event(Color.RED, historyModel.getRegisteredAt().getTime(), historyModel.getTaskName())); // debug
             });
         });
     }
@@ -390,25 +387,10 @@ public class CommonHomeFragment extends Fragment {
             @Override
             public void onDayClick(Date date) { // Test
                 List<Event> events = compactCalendarView.getEvents(date);
-
-                ScrollView scrollView = new ScrollView(requireContext());
-                LinearLayout linearLayout = new LinearLayout(requireContext());
-                linearLayout.setOrientation(LinearLayout.VERTICAL);
-                linearLayout.setPadding(96, 24, 96, 24);
-                scrollView.addView(linearLayout);
-
-                events.forEach(event -> {
-                    TextView textView = new TextView(requireContext());
-                    textView.setText(((HistoryModel) event.getData()).getTaskName() + " @ " + ((HistoryModel) event.getData()).getChildId());
-                    textView.setPadding(0, 0, 0, 24);
-                    linearLayout.addView(textView);
-                });
-
                 new MaterialAlertDialogBuilder(requireContext())
-                        .setTitle("タスク一覧 (DEBUG)")
-                        .setMessage(events.size() + "件のタスクが登録されています")
-                        .setView(scrollView)
-                        .setNeutralButton("閉じる", (dialog, which) -> dialog.dismiss())
+                        .setTitle(date.toString())
+                        .setMessage(events.toString())
+                        .setPositiveButton("OK", (dialog, which) -> dialog.dismiss())
                         .show();
             }
 

feature/wallet/src/main/java/one/nem/kidshift/wallet/HistoryItemListAdapter.java

@@ -1,253 +0,0 @@
-package one.nem.kidshift.wallet;
-
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import one.nem.kidshift.model.HistoryModel;
-
-public class HistoryItemListAdapter extends RecyclerView.Adapter<HistoryItemListAdapter.ViewHolder> {
-
-    enum ViewType {
-        WITH_HEADER(1),
-        ITEM(0);
-
-        private final int value;
-
-        ViewType(int value) {
-            this.value = value;
-        }
-
-        public int getValue() {
-            return value;
-        }
-    }
-
-    public static class HistoryModelExtended extends HistoryModel {
-        private boolean isChecked;
-
-        public boolean isChecked() {
-            return isChecked;
-        }
-
-        public void setChecked(boolean checked) {
-            isChecked = checked;
-        }
-
-        // add isChecked to the constructor
-        public HistoryModelExtended() {
-            super();
-            isChecked = false;
-        }
-
-        // copy constructor
-        public HistoryModelExtended(HistoryModel historyModel) {
-            super();
-            this.setId(historyModel.getId());
-            this.setPaid(historyModel.isPaid());
-            this.setChildId(historyModel.getChildId());
-            this.setRegisteredAt(historyModel.getRegisteredAt());
-            this.setTaskId(historyModel.getTaskId());
-            this.setTaskName(historyModel.getTaskName());
-            this.setReward(historyModel.getReward());
-            this.setChecked(false);
-        }
-    }
-
-    public static class HistoryModelExtendedList {
-        private List<HistoryModelExtended> list;
-
-        public List<HistoryModelExtended> getList() {
-            return list;
-        }
-
-        public void setList(List<HistoryModelExtended> list) {
-            this.list = list;
-        }
-
-        // clear all checked items
-        public void clearChecked() {
-            for (HistoryModelExtended item : list) {
-                item.setChecked(false);
-            }
-        }
-
-        // constructor
-        public HistoryModelExtendedList() {
-            list = new ArrayList<>();
-        }
-    }
-
-    public interface CheckBoxChangedCallback {
-        void onCheckBoxChanged();
-    }
-
-    public boolean hasChecked() {
-        for (HistoryModelExtended historyModelExtended : historyDataList.getList()) {
-            if (historyModelExtended.isChecked()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private HistoryModelExtendedList historyDataList;
-    private CheckBoxChangedCallback callback;
-    private boolean hideCheckBox; // for child mode
-
-    public void setHistoryDataList(List<HistoryModel> historyDataList) {
-        this.historyDataList = new HistoryModelExtendedList();
-        for (HistoryModel historyModel : historyDataList) {
-            this.historyDataList.getList().add(new HistoryModelExtended(historyModel));
-        }
-    }
-
-    public void setCallback(CheckBoxChangedCallback callback) {
-        this.callback = callback;
-    }
-
-    public void setHideCheckBox(boolean hideCheckBox) {
-        this.hideCheckBox = hideCheckBox;
-    }
-
-    public List<HistoryModel> getCheckedHistoryDataList() {
-        List<HistoryModel> checkedHistoryDataList = new ArrayList<>();
-        for (HistoryModelExtended historyModelExtended : historyDataList.getList()) {
-            if (historyModelExtended.isChecked()) {
-                checkedHistoryDataList.add(historyModelExtended);
-            }
-        }
-        return checkedHistoryDataList;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (position == 0) {
-            return ViewType.WITH_HEADER.getValue();
-        } else {
-            if (isFirstOfMonth(historyDataList.getList().get(position))) {
-                return ViewType.WITH_HEADER.getValue();
-            } else {
-                return ViewType.ITEM.getValue();
-            }
-        }
-    }
-
-    @NonNull
-    @Override
-    public HistoryItemListAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        if (viewType == ViewType.WITH_HEADER.getValue()) {
-            LinearLayout view = new LinearLayout(parent.getContext());
-
-            view.setOrientation(LinearLayout.VERTICAL);
-            view.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-
-            view.addView(LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_history_month_header, parent, false));
-            view.addView(LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_history_list_item, parent, false));
-            return new MonthHeaderViewHolder(view);
-        } else {
-            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_history_list_item, parent, false);
-            return new ViewHolder(view);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull HistoryItemListAdapter.ViewHolder holder, int position) {
-        HistoryModelExtended historyData = this.historyDataList.getList().get(position);
-        if (historyData.isPaid() || hideCheckBox) {
-            holder.historyItemCheckBox.setVisibility(View.GONE);
-        } else {
-            holder.historyItemCheckBox.setVisibility(View.VISIBLE);
-        }
-        holder.historyItemNameTextView.setText(historyData.getTaskName());
-        holder.historyItemRewardTextView.setText(historyData.getReward() + "円");
-        holder.historyItemCheckBox.setChecked(historyData.isChecked());
-        holder.historyItemCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            if (holder.historyItemCheckBox.isShown()) {
-                historyData.setChecked(isChecked);
-                callback.onCheckBoxChanged();
-            }
-        });
-        if (holder instanceof MonthHeaderViewHolder) {
-            ((MonthHeaderViewHolder) holder).monthHeaderTitle.setText(historyData.getRegisteredAt().getMonth() + 1 + "月");
-//            // DEBUG: 月をまたぐデータがないので
-//            ((MonthHeaderViewHolder) holder).monthHeaderTitle.setText(historyData.getRegisteredAt().getDate() + "日");
-            ((MonthHeaderViewHolder) holder).monthTotalTextView.setText(getMonthTotal(historyData) + "円");
-            ((MonthHeaderViewHolder) holder).checkAllButton.setOnClickListener(v -> {
-                Toast.makeText(v.getContext(), "実装中", Toast.LENGTH_SHORT).show();
-            });
-        }
-    }
-
-    private boolean isFirstOfMonth(HistoryModel historyModel) {
-        // 1個前の要素と比較して月が変わったかどうかを判定する
-        if (historyDataList.getList().indexOf(historyModel) == 0) {
-            return true;
-        } else {
-            HistoryModel previousHistoryModel = historyDataList.getList().get(historyDataList.getList().indexOf(historyModel) - 1);
-            // getMonth()はDeprecated TODO: やめる
-            return historyModel.getRegisteredAt().getMonth() != previousHistoryModel.getRegisteredAt().getMonth();
-            // DEBUG: 月をまたぐデータがないので
-//            return historyModel.getRegisteredAt().getDate() != previousHistoryModel.getRegisteredAt().getDate();
-        }
-    }
-
-    private int getMonthTotal(HistoryModel historyModel) {
-        int total = historyModel.getReward();
-        int index = historyDataList.getList().indexOf(historyModel) + 1;
-        try {
-            while (!isFirstOfMonth(this.historyDataList.getList().get(index))) {
-                total += historyModel.getReward();
-                index++;
-            }
-        } catch (IndexOutOfBoundsException e) {
-            // 1個しかない場合 Workaround
-            // TODO: 例外をひねり潰すのではなく，そもそも発生しないようにするべき
-        }
-        return total;
-    }
-
-    @Override
-    public int getItemCount() {
-        return historyDataList == null ? 0 : historyDataList.getList().size();
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        TextView historyItemNameTextView;
-        TextView historyItemRewardTextView;
-        CheckBox historyItemCheckBox;
-        public ViewHolder(@NonNull View itemView) {
-            super(itemView);
-            historyItemNameTextView = itemView.findViewById(R.id.historyItemNameTextView);
-            historyItemRewardTextView = itemView.findViewById(R.id.historyItemRewardTextView);
-            historyItemCheckBox = itemView.findViewById(R.id.checkBox);
-        }
-    }
-
-    public static class MonthHeaderViewHolder extends HistoryItemListAdapter.ViewHolder {
-        // かなり邪道な方法だけど，とりあえず取得できるので
-
-        TextView monthHeaderTitle;
-        TextView monthTotalTextView;
-        ImageButton checkAllButton;
-
-        public MonthHeaderViewHolder(@NonNull View itemView) {
-            super(itemView);
-            monthHeaderTitle = itemView.findViewById(R.id.monthHeaderTitle);
-            monthTotalTextView = itemView.findViewById(R.id.monthTotalTextView);
-            checkAllButton = itemView.findViewById(R.id.checkAllButton);
-        }
-    }
-}

feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java

@@ -12,16 +12,10 @@ import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.kidshift.data.KSActions;
 import one.nem.kidshift.data.RewardData;
 import one.nem.kidshift.data.UserSettings;
-import one.nem.kidshift.model.HistoryModel;
 import one.nem.kidshift.utils.FabManager;
 import one.nem.kidshift.utils.KSLogger;
-import one.nem.kidshift.utils.RecyclerViewAnimUtils;
 import one.nem.kidshift.utils.ToolBarManager;
 import one.nem.kidshift.utils.factory.KSLoggerFactory;
-import one.nem.kidshift.utils.models.FabEventCallback;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 @AndroidEntryPoint
@@ -40,8 +34,6 @@ public class WalletContentFragment extends Fragment {
 
     @Inject
     UserSettings userSettings;
-    @Inject
-    RecyclerViewAnimUtils recyclerViewAnimUtils;
 
     private KSLogger logger;
     private String childId;
@@ -49,8 +41,6 @@ public class WalletContentFragment extends Fragment {
     private TextView totalRewardTextView;
     private SwipeRefreshLayout swipeRefreshLayout;
 
-    private HistoryItemListAdapter historyItemListAdapter;
-
     public WalletContentFragment() {
         // Required empty public constructor
     }
@@ -95,79 +85,16 @@ public class WalletContentFragment extends Fragment {
         swipeRefreshLayout = view.findViewById(R.id.swipeRefreshLayout);
 
         swipeRefreshLayout.setOnRefreshListener(() -> {
-//            updateTotalReward();
-            updateItems();
+            updateTotalReward();
             swipeRefreshLayout.setRefreshing(false);
         });
 
-        RecyclerView historyItemRecyclerView = view.findViewById(R.id.historyItemRecyclerView);
-        recyclerViewAnimUtils.setSlideUpAnimation(historyItemRecyclerView);
-        historyItemListAdapter = new HistoryItemListAdapter();
-        historyItemRecyclerView.setAdapter(historyItemListAdapter);
-        historyItemRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
-
-        historyItemListAdapter.setHideCheckBox(userSettings.getAppCommonSetting().isChildMode());
-
-        historyItemListAdapter.setCallback(() -> {
-            if (historyItemListAdapter.hasChecked()) {
-                fabManager.show();
-                initFab();
-            } else {
-                fabManager.hide();
-            }
-        });
-
         return view;
     }
 
-    private void initFab() {
-        fabManager.setFabEventCallback(new FabEventCallback() {
-            @Override
-            public void onClicked() {
-                historyItemListAdapter.getCheckedHistoryDataList().forEach(historyModel -> {
-                    rewardData.payReward(historyModel.getId()).thenRun(() -> {
-                        logger.debug("Paid reward: " + historyModel.getId());
-                        updateItems();
-                    }).exceptionally(throwable -> {
-                        logger.error("Failed to pay reward: " + throwable.getMessage());
-                        return null;
-                    });
-                });
-
-                updateItems(); // workaround
-            }
-
-            @Override
-            public void onLongClicked() {
-
-            }
-        });
-    }
-
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-
-        updateItems();
-    }
-
-    private void updateItems() {
-        swipeRefreshLayout.setRefreshing(true);
-        rewardData.getRewardHistoryList(childId).thenAccept(historyList -> {
-            historyItemListAdapter.setHistoryDataList(historyList);
-//            totalRewardTextView.setText(String.valueOf(historyList.stream().mapToInt(HistoryModel::getReward).sum()) + "円");
-            requireActivity().runOnUiThread(() -> {
-                historyItemListAdapter.notifyDataSetChanged();
-                totalRewardTextView.setText(String.valueOf(historyList.stream().filter(item -> !item.isPaid()).mapToInt(HistoryModel::getReward).sum()) + "円");
-            });
-        }).thenRun(() -> {
-            requireActivity().runOnUiThread(() -> {
-                swipeRefreshLayout.setRefreshing(false);
-            });
-        }).exceptionally(throwable -> {
-            logger.error("Failed to get history list: " + throwable.getMessage());
-            return null;
-        });
     }
 
     private void updateTotalReward() {
@@ -183,22 +110,13 @@ public class WalletContentFragment extends Fragment {
             logger.error("Failed to get total reward: " + throwable.getMessage());
             return null;
         });
-
-        rewardData.getRewardHistoryList(childId).thenAccept(historyList -> { // test
-            historyItemListAdapter.setHistoryDataList(historyList);
-            historyItemListAdapter.notifyDataSetChanged();
-        }).exceptionally(throwable -> {
-            logger.error("Failed to get history list: " + throwable.getMessage());
-            return null;
-        });
     }
 
     @Override
     public void onResume() {
         super.onResume();
-//        updateTotalReward();
-//        updateItems();
-//        fabManager.hide();
+        updateTotalReward();
+        fabManager.hide();
         toolBarManager.setTitle("ウォレット");
         toolBarManager.setSubtitle(null);
     }

feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletParentWrapperFragment.java

@@ -26,7 +26,6 @@ import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.kidshift.data.ChildData;
 import one.nem.kidshift.data.RewardData;
 import one.nem.kidshift.model.ChildModel;
-import one.nem.kidshift.model.callback.ChildModelCallback;
 import one.nem.kidshift.utils.FabManager;
 import one.nem.kidshift.utils.KSLogger;
 import one.nem.kidshift.utils.ToolBarManager;
@@ -52,7 +51,6 @@ public class WalletParentWrapperFragment extends Fragment {
 
     private TabLayout tabLayout;
     private ViewPager2 viewPager;
-    private TabAdapter tabAdapter;
 
     public WalletParentWrapperFragment() {
         // Required empty public constructor
@@ -72,50 +70,22 @@ public class WalletParentWrapperFragment extends Fragment {
         tabLayout = view.findViewById(R.id.tabLayout);
         viewPager = view.findViewById(R.id.viewPager);
 
-        tabAdapter = new TabAdapter(requireActivity());
+        TabAdapter tabAdapter = new TabAdapter(requireActivity());
+
+        // デバッグ用
+        List<ChildModel> childList = childData.getChildListDirect().join();
+        tabAdapter.setChildList(childList);
 
         viewPager.setAdapter(tabAdapter);
 
-        setupViewPager();
+        new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
+            tab.setText(childList.get(position).getName());
+        }).attach();
+
 
         return view;
     }
 
-    private void setupViewPager() {
-
-        // デバッグ用
-        childData.getChildList(new ChildModelCallback() {
-            @Override
-            public void onUnchanged() {
-                // TODO: impl
-            }
-
-            @Override
-            public void onUpdated(List<ChildModel> childModelList) {
-                // TODO: impl
-            }
-
-            @Override
-            public void onFailed(String message) {
-                // TODO: impl
-            }
-        }).thenAccept(childModels -> {
-
-//        childData.getChildListDirect().thenAccept(childModels -> {
-
-            tabAdapter.setChildList(childModels);
-            requireActivity().runOnUiThread(() -> {
-
-                tabAdapter.notifyDataSetChanged();
-
-                new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
-                    tab.setText(childModels.get(position).getName());
-                }).attach();
-
-            });
-        });
-    }
-
     private static class TabAdapter extends FragmentStateAdapter {
 
         private List<ChildModel> childList;

feature/wallet/src/main/res/layout/fragment_wallet_content.xml

@@ -16,12 +16,9 @@
             android:id="@+id/frameLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorSurface"
-            android:backgroundTintMode="add"
-            android:elevation="16px"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="24dp"
             app:layout_constraintBottom_toTopOf="@+id/historyItemRecyclerView"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <LinearLayout
@@ -35,7 +32,6 @@
                     android:layout_height="wrap_content"
                     android:text="今月の支払い総額"
                     android:textAppearance="@style/TextAppearance.AppCompat.Display1"
-                    android:textColor="@color/colorOnSurface"
                     android:textSize="20sp" />
 
                 <TextView
@@ -44,8 +40,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="0000円"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Display2"
-                    android:textColor="@color/colorOnSurface" />
+                    android:textAppearance="@style/TextAppearance.AppCompat.Display2" />
             </LinearLayout>
         </FrameLayout>
 

feature/wallet/src/main/res/layout/list_item_history_list_item.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="32px">
-
-    <CheckBox
-        android:id="@+id/checkBox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16px"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/historyItemNameTextView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-        <TextView
-            android:id="@+id/historyItemRewardTextView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

feature/wallet/src/main/res/layout/list_item_history_month_header.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingHorizontal="48px"
-    android:paddingVertical="24px">
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/monthHeaderTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="ふが月"
-            android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
-
-        <TextView
-            android:id="@+id/monthTotalTextView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="0000000円"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/checkAllButton"
-        style="@style/Widget.AppCompat.ImageButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:padding="24px"
-        android:tint="@color/colorOnBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/done_all_24px" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

model/src/main/java/one/nem/kidshift/model/HistoryModel.java

@@ -9,16 +9,14 @@ public class HistoryModel {
     private String childId;
     private Date registeredAt;
     private int reward;
-    private boolean isPaid;
 
-    public HistoryModel(String id, String taskId, String taskName, String childId, Date registeredAt, int reward, boolean isPaid) {
+    public HistoryModel(String id, String taskId, String taskName, String childId, Date registeredAt, int reward) {
         this.id = id;
         this.taskId = taskId;
         this.taskName = taskName;
         this.childId = childId;
         this.registeredAt = registeredAt;
         this.reward = reward;
-        this.isPaid = isPaid;
     }
 
     public HistoryModel(String id, String taskId, String childId, Date registeredAt) { // 他モデルとのマージが必要なので
@@ -78,12 +76,4 @@ public class HistoryModel {
     public void setReward(int reward) {
         this.reward = reward;
     }
-
-    public boolean isPaid() {
-        return isPaid;
-    }
-
-    public void setPaid(boolean isPaid) {
-        this.isPaid = isPaid;
-    }
 }

shared/src/main/res/drawable/password_24px.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M80,760L80,680L880,680L880,760L80,760ZM126,518L74,488L108,428L40,428L40,368L108,368L74,310L126,280L160,338L194,280L246,310L212,368L280,368L280,428L212,428L246,488L194,518L160,458L126,518ZM446,518L394,488L428,428L360,428L360,368L428,368L394,310L446,280L480,338L514,280L566,310L532,368L600,368L600,428L532,428L566,488L514,518L480,458L446,518ZM766,518L714,488L748,428L680,428L680,368L748,368L714,310L766,280L800,338L834,280L886,310L852,368L920,368L920,428L852,428L886,488L834,518L800,458L766,518Z"/>
+</vector>