优化图标资源

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchFragment.java

@@ -6,7 +6,6 @@ import android.graphics.Paint;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -14,15 +13,16 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerViewItemListener;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.FastScrollLinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerViewItemListener;
 
 import com.app.hubert.guide.NewbieGuide;
 import com.app.hubert.guide.model.GuidePage;
@@ -30,7 +30,6 @@ import com.app.hubert.guide.model.HighLight;
 import com.app.hubert.guide.model.HighlightOptions;
 import com.ourygo.lib.duelassistant.util.DuelAssistantManagement;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import cn.garymb.ygomobile.Constants;
@@ -76,7 +75,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
     private TextView mResult_count;
 
     private View layoutView;
-
+    private ImageButton btn_search;
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
@@ -97,7 +96,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
         mCardListAdapter.setItemBg(true);
         mListView.setLayoutManager(new FastScrollLinearLayoutManager(getContext()));
         mListView.setAdapter(mCardListAdapter);
-        Button btn_search = layoutView.findViewById(R.id.btn_search);
+        btn_search = layoutView.findViewById(R.id.btn_search);
         btn_search.setOnClickListener((v) -> showSearch(true));
         mPackManager = DataManager.get().getPackManager();
         mCardManager = DataManager.get().getCardManager();

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java

@@ -13,6 +13,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.Spinner;
 import android.widget.TextView.OnEditorActionListener;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerFragment.java

@@ -5,6 +5,7 @@ import static cn.garymb.ygomobile.Constants.ORI_DECK;
 import static cn.garymb.ygomobile.Constants.YDK_FILE_EX;
 import static cn.garymb.ygomobile.core.IrrlichtBridge.ACTION_SHARE_FILE;
 
+import android.animation.ObjectAnimator;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.DialogInterface;
@@ -14,6 +15,9 @@ import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.RotateDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -41,6 +45,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatSpinner;
+import androidx.core.content.ContextCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.FastScrollLinearLayoutManager;
 import androidx.recyclerview.widget.ItemTouchHelperPlus;
@@ -308,8 +313,9 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
 
         // 初始化撤销/重做按钮
         btnUndo = layoutView.findViewById(R.id.btn_undo);
+        animRotate(btnUndo);
         btnRedo = layoutView.findViewById(R.id.btn_redo);
-
+        animRotate(btnRedo);
         btnUndo.setOnClickListener(v -> undo());
         btnRedo.setOnClickListener(v -> redo());
 
@@ -770,15 +776,15 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
 
                 // 当无法撤销或重做时隐藏对应按钮
                 if (!canUndo()) {
-                    btnUndo.setVisibility(View.GONE);
+                    btnUndo.setVisibility(View.INVISIBLE);
                 }
                 if (!canRedo()) {
-                    btnRedo.setVisibility(View.GONE);
+                    btnRedo.setVisibility(View.INVISIBLE);
                 }
             } else {
                 // 历史记录小于等于1时隐藏按钮
-                btnUndo.setVisibility(View.GONE);
-                btnRedo.setVisibility(View.GONE);
+                btnUndo.setVisibility(View.INVISIBLE);
+                btnRedo.setVisibility(View.INVISIBLE);
             }
         }
     }
@@ -1602,13 +1608,13 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         addMenuButton(mMenuIds, menu, R.id.action_save, R.string.save_deck, R.drawable.save);
         addMenuButton(mMenuIds, menu, R.id.action_clear_deck, R.string.clear_deck, R.drawable.clear_deck);
 
-        addMenuButton(mMenuIds, menu, R.id.action_deck_new, R.string.new_deck, R.drawable.add);
+        addMenuButton(mMenuIds, menu, R.id.action_deck_new, R.string.new_deck, R.drawable.ic_add_2);
         addMenuButton(mMenuIds, menu, R.id.action_rename, R.string.rename_deck, R.drawable.rename);
         addMenuButton(mMenuIds, menu, R.id.action_delete_deck, R.string.delete_deck, R.drawable.delete);
 
         addMenuButton(mMenuIds, menu, R.id.action_unsort, R.string.unsort, R.drawable.unsort);
         addMenuButton(mMenuIds, menu, R.id.action_sort, R.string.sort, R.drawable.sort);
-        addMenuButton(mMenuIds, menu, R.id.action_deck_backup_n_restore, R.string.deck_backup_n_restore, R.drawable.downloadimages);
+        addMenuButton(mMenuIds, menu, R.id.action_deck_backup_n_restore, R.string.deck_backup_n_restore, R.drawable.back_restore);
 
         //设置展开或隐藏的延时。 默认值为 800ms。
         menu.setDuration(150);
@@ -1628,15 +1634,44 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     }
 
     private void addMenuButton(SparseArray<Integer> mMenuIds, BoomMenuButton menuButton, int menuId, String str, int image) {
+        // 创建一个 LayerDrawable 来组合背景和图标
+        LayerDrawable layerDrawable = createDrawableWithBackground(image);
         TextOutsideCircleButton.Builder builder = new TextOutsideCircleButton.Builder()
                 .shadowColor(Color.TRANSPARENT)
                 .normalColor(Color.TRANSPARENT)
-                .normalImageRes(image)
+                .normalImageDrawable(layerDrawable)
                 .normalText(str);
         menuButton.addBuilder(builder);
         mMenuIds.put(mMenuIds.size(), menuId);
     }
 
+    // 创建带背景的 drawable
+    private LayerDrawable createDrawableWithBackground(int imageRes) {
+        Drawable background = ContextCompat.getDrawable(getContext(), R.drawable.button_cube);
+        Drawable icon = ContextCompat.getDrawable(getContext(), imageRes);
+
+        Drawable[] layers = new Drawable[2];
+        layers[0] = background;
+        layers[1] = icon;
+
+        LayerDrawable layerDrawable = new LayerDrawable(layers);
+        // 可以调整图标的位置和大小
+        layerDrawable.setLayerInset(1, 200, 200, 200, 200); // left, top, right, bottom insets
+
+        return layerDrawable;
+    }
+    private void animRotate(View view) {
+        // 获取背景并启动旋转动画
+        LayerDrawable layerDrawable = (LayerDrawable) view.getBackground();
+        RotateDrawable rotateDrawable = (RotateDrawable) layerDrawable.findDrawableByLayerId(R.id.background_layer);
+
+        // 使用属性动画控制旋转
+        ObjectAnimator animator = ObjectAnimator.ofInt(rotateDrawable, "level", 0, 10000);
+        animator.setDuration(25000);//控制旋转速度
+        animator.setRepeatCount(ObjectAnimator.INFINITE);
+        animator.start();
+    }
+
     private void doBackUpDeck() {
         FileUtils.delFile(ORI_DECK);//备份前删除原备份
         try {

mobile/src/main/res/drawable/about.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M588.1,640.5c5.2,3.2 10.9,5.2 16.2,5.2 5.7,0 10.9,-1.6 16.7,-5.2l1.1,-0.5c34.4,-23.5 210.4,-147.4 278.2,-271.4 18.7,-29.2 28.7,-62 28.7,-95.4 0,-97.4 -79.2,-176.6 -176.6,-176.6 -69.8,0 -120.3,54.7 -146.9,85.4 -25.1,-28.7 -77.6,-85.4 -146.9,-85.4 -97.4,0 -176.6,79.2 -176.6,176.6 0,34.4 9.9,67.1 28.1,95.4 73,137 276.1,270.9 278.2,271.8zM751.3,155.6c64.6,0 117.3,52.7 117.3,117.3 0,22.9 -6.2,44.8 -18.7,63.5 -0.5,0.5 -0.5,1.1 -1.1,1.6l-0.5,0.5C796.1,435.3 662.7,537.4 604.4,579c-58.4,-41.7 -192.2,-144.3 -243.7,-240.6l-0.5,-1.1c0,-0.5 -0.5,-1.1 -1.1,-1.6 -11.9,-18.7 -18.7,-41.1 -18.7,-63.5 0,-64.1 52.7,-116.6 117.3,-116.6 46.8,0 86.5,46.3 107.8,71.4 13.5,16.2 22.9,26.5 39,26.5s25.1,-10.5 39,-26c21.3,-25.5 60.8,-71.9 107.8,-71.9z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M901.7,625.9c-10.9,-6.2 -22.4,-9.4 -33.3,-9.4 -32.8,0 -58.4,26 -69.3,37.5 -29.2,30.2 -64.6,60.4 -80.8,74 -6.8,-2.6 -14.6,-4.1 -24,-4.7 -54.7,-3.2 -141.7,-13 -162,-25.5 -22.9,-13.5 -41.1,-26.5 -57.3,-38.6l-2.6,-2.1c-48.4,-34.4 -86.5,-62 -180.7,-62 -26.5,0 -50,6.8 -75.5,14.6l-2.6,1.1c-22.4,6.8 -43.8,13.5 -68.7,13.5 -32.4,0 -58.9,26.5 -58.9,58.9v137c0,32.4 26.5,58.9 58.9,58.9 58.9,0 131.7,3.2 147.4,7.8 31.7,10.5 107.8,55.2 131.7,70.3l1.1,1.1h0.5c9.9,5.2 21.4,8.4 32.8,8.4h249c28.7,0 59.4,-25.5 70.3,-43.8 13,-21.4 49,-73 145.3,-195.8 3.2,-4.1 5.2,-6.8 5.2,-6.8 0,-0.5 0.5,-0.5 0.5,-1.1 0.5,-1.1 1.6,-2.1 2.1,-3.6 16.2,-31 3.6,-70.1 -29.2,-89.4zM692.4,803l-186.5,9.9c-13.5,-0.5 -51.6,-27.6 -69.8,-40.6 -3.2,-2.1 -5.7,-4.1 -8.9,-6.2 -3.2,-2.1 -5.7,-4.1 -8.9,-6.2 -15.1,-10.9 -26.5,-17.8 -35.9,-22.4 -4.1,-2.1 -8.4,-3.2 -13,-3.2 -10.9,0 -21.4,6.2 -26.5,16.2 -7.3,14.1 -1.6,32.4 13,40.1 9.9,4.7 22.4,13.5 35.9,22.9 3.6,2.6 6.8,4.7 10.5,7.3l1.6,1.1c37,26 71.9,50.5 103.1,50.5L693.4,862.4c37.5,-0.5 68.2,-31.3 68.2,-68.7 0,-6.8 -1.1,-14.1 -3.2,-20.8 22.9,-18.7 55.7,-47.9 82.8,-76 12.5,-13 20.8,-19.2 26.5,-19.2 1.1,0 2.6,0.5 3.6,1.1 4.1,2.6 7.8,7.3 6.8,11.9 -9.4,11.9 -118.7,150.6 -152.6,205.8 -3.2,5.2 -15.6,14.1 -19.2,14.6H457.5c-1.6,0 -3.2,-0.5 -4.1,-1.1l-0.5,-0.5c-30.2,-18.7 -104.7,-63 -142.7,-75.5 -32.4,-10.5 -142.7,-10.9 -165.7,-11.4V686.4c35.9,0 66.2,-9.9 88.5,-16.7 20.8,-6.8 38.6,-12.5 57.8,-12.5 76,0 103.1,19.2 147.4,51.6l2.6,2.1c16.7,11.9 35.9,26 59.8,40.6 11.4,7.3 30.2,13 58.9,18.7 50,9.9 109.3,13.5 129.2,14.6h3.2c2.4,0 4.9,1 6.7,2.7 1.7,1.7 2.8,4.1 2.7,6.7 0.5,4.7 -3.6,8.9 -8.9,8.9z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M433.3,121.3c-15.4,3.8 -89.8,23.2 -107.9,80.2 -6.7,20.8 -2.7,40.5 5.5,78.9 11.4,53.8 19.6,92.4 47.1,133.2 17.8,26.4 51.2,51.9 118.1,103 1.3,1.1 32,24.3 75.9,50.6 27.4,16.4 41.2,24.6 52.4,25.9 31.4,3.6 58.1,-22.3 110.3,-82.6 104.1,-120.4 129.8,-170.4 145.8,-212.1 15.4,-40.1 21,-70.2 7.8,-95.8 -10.6,-20.6 -29.6,-31.5 -48.2,-42.2 -13.1,-7.5 -47.6,-27.2 -88.1,-26.5 -79.4,1.5 -128,80.9 -131.4,86.8M714.2,762l10.8,53 -43.4,16.9s-143.4,-4.9 -154.3,0c-10.8,4.9 -89.2,-33.8 -94,-39.8 -4.9,-6.1 -37.3,-47.1 -37.3,-47.1l-38.6,22.9 -18.1,-12s-74.2,30.5 -23.5,79.5c50.6,49 -160.9,16.9 -160.9,16.9l-39.8,-65.1 14.5,-119.3S159.6,649.9 186.2,646.3s131.4,-20.4 153.1,-16.9 96.5,41 102.4,49.4c6.1,8.5 272.5,83.2 272.5,83.2z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M767.2,741.6l92.8,-72.4s26.5,-8.4 27.7,0 0,25.2 0,34.3 -126.5,185.1 -126.5,185.1 -39.8,41 -44.6,41h-77.1c-10.8,0 -188,0 -197.6,-7.2s-73.6,-41 -78.3,-43.4c-4.9,-2.4 -56.8,-52.2 -67.6,-53.3s-25.2,-26.5 -25.2,-28.2c0,-1.7 -8.4,-24.7 7.2,-33.1 15.7,-8.4 69.9,-36.1 73.6,-36.1s415.7,13.3 415.7,13.3z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M719.9,730s7.9,54 -101.8,46.7 -173.4,-38.4 -202.4,-56.6c-28.9,-18.1 -74.8,30.2 -28.9,57.3s250.8,117.5 335.1,51.2c81.2,-63.9 84.3,-116.3 58.6,-149.1 -1.7,-2.1 -3.6,-3.6 -6.9,-0.9l-63.5,46.8 9.9,4.5z"/>
+    
+</vector>

mobile/src/main/res/drawable/back_restore.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M594,937.5c33.6,35.1 -21.5,88.9 -59.5,55 -38.5,-34.6 -77.2,-69.1 -115.8,-103.6 -16.2,-14.5 -15.7,-42.7 -0.4,-57.3 38.1,-36.6 76.1,-73.2 114.2,-109.8 36.6,-35 91.6,17.2 60.9,53.5 189.8,-22 258.1,-230.3 155,-380 -59.6,-86.1 78.1,-163.1 137.1,-77.7C1065.2,577.9 895.8,904.4 594,937.5L594,937.5zM157.4,706.1C-22.3,446 147.1,119.7 448.6,86.5 415.1,51.5 470.2,-2.4 508.1,31.5c38.6,34.4 77.1,68.9 115.8,103.6C640,149.4 639.7,177.6 624.3,192.4 586.2,228.9 548.3,265.4 510.1,302c-36.5,35.1 -91.6,-17.2 -60.8,-53.4 -189.8,21.9 -258.1,230.3 -154.9,379.8C354,714.4 216.4,791.5 157.4,706.1L157.4,706.1z"/>
+    
+</vector>

mobile/src/main/res/drawable/box_deck.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="54" android:viewportWidth="43" android:width="159.25926dp">
+      
+    <path android:fillColor="#FFFFFF" android:pathData="M26,54L26,10.5L43,6L43,45.5ZM24,34 L0,24.5L0,4.5L20,0 42.5,4 24,9.5ZM24,54 L3,45.2v-17l21,8.3Z"/>
+    
+</vector>

mobile/src/main/res/drawable/button_cube.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/button_cube_background_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/button_cube_background" />
+</selector>
\ No newline at end of file

mobile/src/main/res/drawable/clear_deck.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillAlpha="0.01" android:fillColor="#03fbf9" android:pathData="M0,0h1024v1024H0V0z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M911.4,629.8l-216.1,374.3c-10.8,18.9 -34.8,25.1 -53.8,14.3l-102.4,-58.9 137.7,-238.1c9.2,-16.4 5.6,-37.4 -8.7,-49.7l-5.6,-4.1c-16.4,-9.2 -37.4,-5.6 -49.7,8.7l-4.1,5.6L471,920.1l-136.2,-78.8 137.2,-238.1c9.2,-16.4 5.6,-37.4 -8.7,-49.7l-5.6,-4.1c-16.4,-9.2 -37.4,-5.6 -49.7,8.7l-4.1,5.6L266.2,801.8 28.7,665.1c-18.9,-10.8 -25.1,-34.8 -14.3,-53.8L230.4,237.1 911.4,629.8zM840.7,44.5c18.9,10.8 25.1,34.8 14.3,53.8l-98.3,170 238.1,137.7c18.9,10.8 25.1,34.8 14.3,53.8l-39.4,68.1c-10.8,18.9 -34.8,25.1 -53.8,14.3L304.1,188.4c-18.9,-10.8 -25.1,-34.8 -14.3,-53.8L328.7,66.6c10.8,-18.9 34.8,-25.1 53.8,-14.3l238.1,137.7 98.3,-170c10.8,-18.9 34.8,-25.1 53.8,-14.3l68.1,38.9z"/>
+    
+</vector>

mobile/src/main/res/drawable/delete.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M512,16C238.7,16 16,238.7 16,512S238.7,1008 512,1008s496,-222.7 496,-496S785.3,16 512,16zM704,636.2c18.6,18.6 18.6,49.3 0,67.8 -9.6,9.6 -21.8,14.1 -33.9,14.1s-24.3,-4.5 -33.9,-14.1L512,579.8 387.8,704c-9.6,9.6 -21.8,14.1 -33.9,14.1S329.6,713.6 320,704a48.3,48.3 0,0 1,0 -67.8L444.2,512 320,387.8c-18.6,-18.6 -18.6,-49.3 0,-67.8s49.3,-18.6 67.8,0L512,444.2 636.2,320c18.6,-18.6 49.3,-18.6 67.8,0s18.6,49.3 0,67.8L579.8,512 704,636.2z"/>
+    
+</vector>

mobile/src/main/res/drawable/downloadimages.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:alpha="0.8"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="#03fbf9"
+        android:pathData="M1024,832V64H320v73.9l-167.6,23.6 10.9,77.5L0,285.8l211.7,738.2 652.1,-186.9 35.7,-5.1H1024zM384,128h576v640H384V128zM320,196.5V832h162.8l-174.1,24.4L217.9,210.8l102.1,-14.3zM251.5,952.3L71.7,325.5l99.7,-28.6 87.9,625 191.8,-26.9 -199.6,57.2zM928,448l-256,256 -256,-256H576V256h192v192z" />
+
+</vector>

mobile/src/main/res/drawable/help.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M778.9,152.1c-26.2,-43.7 -59.1,-76.5 -105,-98.5 -43.7,-21.8 -94.1,-32.8 -153.2,-32.8 -94.1,0 -170.7,26.2 -225.4,80.9h-2.2C236.3,154.2 205.6,224.3 205.6,307.4c0,6.6 2.2,11 6.6,15.2 4.4,4.4 8.8,6.6 15.2,6.6h157.5c6.6,0 11,-2.2 15.2,-6.6 4.4,-4.4 6.6,-8.8 6.6,-15.2 0,-28.4 11,-50.3 30.6,-67.9 17.5,-17.5 43.7,-26.2 74.4,-26.2 30.6,0 54.7,6.6 74.4,21.8 15.2,15.2 21.8,28.4 24,48.1 0,13.2 -4.4,26.2 -8.8,37.2 -11,13.2 -35,39.4 -76.6,74.4h2.2c-45.9,39.4 -78.8,83.1 -100.6,129.2 -21.8,48.1 -30.6,98.5 -30.6,155.4v26.2c0,6.6 0,11 6.6,15.3 4.4,4.4 8.8,6.6 15.3,6.6h161.9c4.4,0 11,-2.2 15.3,-6.6s6.6,-8.8 6.6,-13.2c0,-37.2 4.4,-63.5 11,-83.1v-2.2c4.4,-19.6 11,-32.8 17.5,-41.6l2.2,-2.2c8.8,-13.2 28.4,-35 61.3,-65.7 37.2,-32.8 61.3,-59.1 72.3,-74.4 17.4,-24 30.6,-50.3 39.4,-74.4 8.8,-26.2 13.2,-52.5 13.2,-76.5 -0.1,-48 -13.3,-94 -39.5,-135.5zM590.7,788.8c-24,-24 -54.7,-35 -89.7,-35 -32.8,0 -63.5,11 -87.5,35h-2.2c-24,26.2 -37.2,54.7 -37.2,89.7 0,32.8 13.2,63.5 39.4,89.7 24,21.8 54.7,35 87.5,35 35,0 65.7,-13.2 91.9,-35v-2.2c24,-24 35,-54.7 35,-87.5 0,-35 -11,-63.5 -35,-89.7h-2.2z"/>
+    
+</vector>

mobile/src/main/res/drawable/ic_add_2.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M512,0a512,512 0,1 0,0 1024A512,512 0,0 0,512 0zM512,937.2A425.2,425.2 0,0 1,512 86.8a425.2,425.2 0,0 1,0 850.4z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M722.3,475.4H548.6V301.7A9.1,9.1 0,0 0,539.4 292.6h-54.9a9.1,9.1 0,0 0,-9.1 9.1V475.4H301.7A9.1,9.1 0,0 0,292.6 484.6v54.9c0,5 4.1,9.1 9.1,9.1H475.4v173.7c0,5 4.1,9.1 9.1,9.1h54.9a9.1,9.1 0,0 0,9.1 -9.1V548.6h173.7A9.1,9.1 0,0 0,731.4 539.4v-54.9a9.1,9.1 0,0 0,-9.1 -9.1z"/>
+    
+</vector>

mobile/src/main/res/drawable/ic_add_circle.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorPrimaryDark"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z" />
-</vector>

mobile/src/main/res/drawable/ic_add_color.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorPrimary"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-</vector>

mobile/src/main/res/drawable/ic_back.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorPrimary"
-        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
-</vector>

mobile/src/main/res/drawable/ic_back_white.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
-</vector>

mobile/src/main/res/drawable/ic_control_point.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/holo_blue_bright"
-        android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
-</vector>

mobile/src/main/res/drawable/ic_edit.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
-</vector>

mobile/src/main/res/drawable/ic_edit_color.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/gold"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
-</vector>

mobile/src/main/res/drawable/ic_file_download_black_24dp.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
-</vector>

mobile/src/main/res/drawable/ic_highlight.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorAccent"
-        android:pathData="M6,14l3,3v5h6v-5l3,-3L18,9L6,9zM11,2h2v3h-2zM3.5,5.875L4.914,4.46l2.12,2.122L5.62,7.997zM16.96,6.585l2.123,-2.12 1.414,1.414L18.375,8z" />
-</vector>

mobile/src/main/res/drawable/ic_redo.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#91BF03" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
-    
-</vector>

mobile/src/main/res/drawable/ic_undo.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#91BF03" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
-    
-</vector>

mobile/src/main/res/drawable/joinqqgroup.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M572.2,30.1c129.8,0 234.9,104.5 234.9,233.4a232.4,232.4 0,0 1,-89.5 183.4c64.4,25.6 120.4,67.8 162.7,121.2a239.4,239.4 0,0 0,-54.4 -14.4l-0.5,-0.1c-4.4,-0.6 -8.3,-1 -12.2,-1.3l-3.1,-0.3a239.4,239.4 0,0 0,-18.2 -1c-132.8,0 -241,108.1 -241,241 0,6.1 0.5,12.2 1,18.1 0.1,1.5 0.3,3.3 0.5,4.9 0.3,3.3 0.6,6.3 1.1,9.8l0.1,0.4a240.9,240.9 0,0 0,69.9 138.6L219.9,963.8a39,39 0,0 1,-39 -34.9l-0.2,-4v-116.7c0,-163.8 101.9,-303.9 246.1,-361.3a232.5,232.5 0,0 1,-89.5 -183.4c0,-128.9 105.2,-233.4 234.9,-233.4zM391.5,60.3c-66.7,41 -110.9,113 -110.9,194.8 0,73.5 35.6,139 91.2,181.3C224.8,493.1 121,631.7 121,793.7v109.8l-54.9,0a35.6,35.6 0,0 1,-35.7 -31.3l-0.2,-3.8v-105.4c0,-147.9 93.5,-274.5 225.8,-326.3 -50,-38.6 -82.1,-98.4 -82.1,-165.6 0,-116.4 96.5,-210.8 215.6,-210.8h2.1z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M791.9,602.4c4.8,0 9.6,0.3 14.4,0.7l2.4,0.3c3.1,0.3 6.1,0.6 9.6,1.1l0.4,0c91.9,13.1 162.8,92.1 162.8,187.5a189.8,189.8 0,0 1,-189.6 189.6c-95.6,0 -174.7,-71.2 -187.5,-163.4l-0.1,-0.3c-0.4,-2.8 -0.5,-5.2 -0.8,-7.7 -0.1,-1.3 -0.3,-2.6 -0.4,-3.8 -0.4,-4.7 -0.7,-9.4 -0.7,-14.3a189.8,189.8 0,0 1,189.6 -189.6zM790.6,677.6a22.6,22.6 0,0 0,-22.6 22.6L768,768h-67.8a22.6,22.6 0,0 0,-22.4 19.5l-0.2,3.1c0,12.5 10.1,22.6 22.6,22.6L768,813.2v67.7c0,11.5 8.5,20.9 19.5,22.4l3.1,0.2c12.5,0 22.6,-10.1 22.6,-22.6v-67.7h67.7a22.6,22.6 0,0 0,22.4 -19.5l0.2,-3.1A22.6,22.6 0,0 0,881 768h-67.7v-67.8a22.6,22.6 0,0 0,-19.5 -22.4z"/>
+    
+</vector>

mobile/src/main/res/drawable/listicon.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:alpha="0.8"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="#03fbf9"
+        android:pathData="M624,232h332.8c34.4,0 64,-25.6 66.4,-60 2.4,-36.8 -27.2,-68 -64,-68H627.2c-34.4,0 -64,25.6 -66.4,60 -2.4,36.8 27.2,68 63.2,68zM624,464h332.8c34.4,0 64,-25.6 66.4,-60 2.4,-36.8 -27.2,-68 -64,-68H627.2c-34.4,0 -64,25.6 -66.4,60 -2.4,36.8 27.2,68 63.2,68zM624,720h332.8c34.4,0 64,-25.6 66.4,-60 2.4,-36.8 -27.2,-68 -64,-68H627.2c-34.4,0 -64,25.6 -66.4,60 -2.4,36.8 27.2,68 63.2,68zM960,832H627.2c-34.4,0 -64,25.6 -66.4,60 -2.4,36.8 27.2,68 64,68h332.8c34.4,0 64,-25.6 66.4,-60 2.4,-36.8 -27.2,-68 -64,-68zM360,104H64c-35.2,0 -64,28.8 -64,64v240c0,35.2 28.8,64 64,64h296c35.2,0 64,-28.8 64,-64V168c0,-35.2 -28.8,-64 -64,-64zM360,592H64c-35.2,0 -64,28.8 -64,64v240c0,35.2 28.8,64 64,64h296c35.2,0 64,-28.8 64,-64V656c0,-35.2 -28.8,-64 -64,-64z" />
+
+</vector>

mobile/src/main/res/drawable/masterrule.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M947.7,623.4l-694.7,0q-11,0 -23.1,6t-22.6,18.1 -17.1,28.6 -6.5,37.6 5.5,39.2 14.6,32.1 22.1,22.1 28.1,8l693.7,0q-12,-12 -21.1,-27.1 -8,-13.1 -14.6,-31.1t-6.5,-41.2q0,-26.1 6.5,-43.2t14.6,-28.1q9,-12 21.1,-21.1zM947.7,897.5q0,17.1 -22.1,17.1l-733.9,0q-34.1,0 -57.2,-14.1t-37.6,-38.7 -20.6,-58.7 -6,-73.3l0,-582.3q0,-77.3 41.2,-111.9t117.5,-34.6l34.1,0 68.3,0 93.4,0q51.2,0 104.9,-0.5t104.9,-0.5l94.4,0 70.3,0 35.1,0q28.1,0 49.2,11.5t35.1,32.1 21.6,48.7 7.5,60.2l0,406.6q-191.7,0 -345.3,-1l-128.5,0q-64.3,0 -114.9,-0.5t-83.8,-0.5l-37.1,0q-21.1,0 -41.2,12.5t-36.1,34.1 -26.1,50.2 -10,59.7q0,38.1 10.5,68.8t27.6,51.7 37.6,32.6 40.7,11.5l685.7,0q8,0 14.6,4.5t6.5,14.6zM515,0l0,388.5 77.3,-108.4 76.3,108.4 0,-388.5 -153.6,0z"/>
+    
+</vector>

mobile/src/main/res/drawable/quit.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M1024,448c0,19.2 -6.4,32 -19.2,44.8l0,0 -128,128 0,0C864,633.6 851.2,640 832,640c-38.4,0 -64,-25.6 -64,-64 0,-19.2 6.4,-32 19.2,-44.8l0,0L806.4,512 640,512C601.6,512 576,486.4 576,448c0,-38.4 25.6,-64 64,-64l166.4,0 -19.2,-19.2 0,0C774.4,352 768,339.2 768,320c0,-38.4 25.6,-64 64,-64 19.2,0 32,6.4 44.8,19.2l0,0 128,128 0,0C1017.6,416 1024,428.8 1024,448zM832,128l-128,0L576,128 294.4,128l121.6,70.4 0,0C435.2,211.2 448,230.4 448,256l0,512 64,0 192,0 128,0c38.4,0 64,25.6 64,64s-25.6,64 -64,64L512,896 448,896l0,64c0,38.4 -25.6,64 -64,64 -12.8,0 -25.6,-6.4 -32,-12.8l0,0 -320,-192 0,0 0,0c-6.4,-6.4 -12.8,-12.8 -19.2,-19.2 0,0 0,0 0,-6.4C6.4,787.2 0,780.8 0,768L0,64c0,-25.6 19.2,-51.2 38.4,-57.6C44.8,0 57.6,0 64,0l0,0 512,0 256,0c38.4,0 64,25.6 64,64C896,102.4 870.4,128 832,128z"/>
+    
+</vector>

mobile/src/main/res/drawable/rename.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M674.9,167.6l3.3,3.2 147.7,147.7a83.6,83.6 0,0 1,3.2 114.9l-3.2,3.3 -431.1,431.1a83.6,83.6 0,0 1,-54.4 24.3l-4.7,0.1L167.2,892.3a62.7,62.7 0,0 1,-62.6 -59L104.5,829.6v-168.6a83.6,83.6 0,0 1,21.2 -55.7l3.3,-3.4L560,170.8a83.6,83.6 0,0 1,114.9 -3.2zM918.2,807a20.9,20.9 0,0 1,20.9 20.9v41.8a20.9,20.9 0,0 1,-20.9 20.9h-334.4a20.9,20.9 0,0 1,-20.9 -20.9v-41.8a20.9,20.9 0,0 1,20.9 -20.9h334.4zM500.9,348.1L188.1,660.9v147.7l147.8,0 312.8,-312.8 -147.8,-147.8zM918.2,639.8a20.9,20.9 0,0 1,20.9 20.9v41.8a20.9,20.9 0,0 1,-20.9 20.9h-167.2a20.9,20.9 0,0 1,-20.9 -20.9v-41.8a20.9,20.9 0,0 1,20.9 -20.9h167.2zM619.1,229.9L560.1,289l147.7,147.7 59.1,-59.1L619.2,229.9z"/>
+    
+</vector>

mobile/src/main/res/drawable/replay.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M460.8,264.8L340.7,123.6h-135.9l120,141.3L460.8,264.9v-0.1zM813.9,264.8L693.8,123.6h-135.9l120,141.3h136v-0.1zM637.4,264.8L517.2,123.6h-135.9l120,141.3h136v-0.1zM865.2,123.6L734.4,123.6l120,141.3h63.6v-88.4c0,-30.1 -23,-52.9 -52.9,-52.9zM164.1,123.6h-5.3c-30.1,0 -52.9,23 -52.9,52.9v88.3L284.3,264.8L164.1,123.6zM105.9,847.5c0,30.1 23,52.9 52.9,52.9h706.3c30.1,0 52.9,-23 52.9,-52.9L918.1,300.1L105.9,300.1L105.9,847.5zM388.4,459c0,-30.1 24.8,-44.1 52.9,-44.1 8.8,0 19.4,1.8 28.3,7.1L670.9,538.5c35.4,19.4 35.4,68.9 0,88.3L469.6,743.3c-8.8,5.3 -17.7,7.1 -28.3,7.1 -28.3,0 -52.9,-14.1 -52.9,-44.1L388.4,459z"/>
+    
+</vector>

mobile/src/main/res/drawable/reset.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M594,937.5c33.6,35.1 -21.5,88.9 -59.5,55 -38.5,-34.6 -77.2,-69.1 -115.8,-103.6 -16.2,-14.5 -15.7,-42.7 -0.4,-57.3 38.1,-36.6 76.1,-73.2 114.2,-109.8 36.6,-35 91.6,17.2 60.9,53.5 189.8,-22 258.1,-230.3 155,-380 -59.6,-86.1 78.1,-163.1 137.1,-77.7C1065.2,577.9 895.8,904.4 594,937.5L594,937.5zM157.4,706.1C-22.3,446 147.1,119.7 448.6,86.5 415.1,51.5 470.2,-2.4 508.1,31.5c38.6,34.4 77.1,68.9 115.8,103.6C640,149.4 639.7,177.6 624.3,192.4 586.2,228.9 548.3,265.4 510.1,302c-36.5,35.1 -91.6,-17.2 -60.8,-53.4 -189.8,21.9 -258.1,230.3 -154.9,379.8C354,714.4 216.4,791.5 157.4,706.1L157.4,706.1z"/>
+    
+</vector>

mobile/src/main/res/drawable/rotate.xml

+<!-- res/drawable/rotating_button_background.xml -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/background_layer" android:state_pressed="true">
+        <rotate
+            android:drawable="@drawable/cube2"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:fromDegrees="0"
+            android:toDegrees="-360" />
+    </item>
+    <item android:id="@id/background_layer">
+        <rotate
+            android:drawable="@drawable/cube2_pressed"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:fromDegrees="0"
+            android:toDegrees="-360" />
+    </item>
+</layer-list>

mobile/src/main/res/drawable/save.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M736.5,96.2V341h-449V88h-86.7C141,88 92,137 92,196.8v622.4C92,879 141,928 200.8,928H218V484h588v444h17.2C883,928 932,879 932,819.2V284z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M549,84h117v178H549zM721.8,562.5l-419,-4h-0.3a33.5,33.5 0,0 0,-0.3 67l419,4h0.3a33.5,33.5 0,0 0,0.3 -67zM721.8,675.2l-419,-4h-0.3a33.5,33.5 0,0 0,-0.3 67l419,4h0.3a33.5,33.5 0,0 0,0.3 -67zM721.8,788l-419,-4h-0.3a33.5,33.5 0,0 0,-0.3 67l419,4h0.3a33.5,33.5 0,0 0,0.3 -67z"/>
+    
+</vector>

mobile/src/main/res/drawable/search.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="500dp" android:viewportHeight="500" android:viewportWidth="500" android:width="500dp">
+      
+    <path android:fillColor="#00000000" android:pathData="M411.08,369.05h27.7l-64.63,83.33h-202.38l33.53,-35.71" android:strokeColor="#FFFFFF" android:strokeWidth="10"/>
+      
+    <path android:fillColor="#00000000" android:pathData="M411.08,333.33h27.7l-64.63,83.33h-202.38l33.53,-35.71" android:strokeColor="#FFFFFF" android:strokeWidth="10"/>
+      
+    <path android:fillColor="#00000000" android:pathData="M250,297.62h188.78l-64.63,83.33h-202.38l78.23,-83.33Z" android:strokeColor="#FFFFFF" android:strokeWidth="10"/>
+      
+    <path android:fillColor="#00000000" android:pathData="M283.54,83.48c42.29,37.88 45.87,102.87 7.98,145.17 -37.88,42.29 -102.88,45.87 -145.17,7.98 -42.29,-37.88 -45.87,-102.88 -7.98,-145.17 37.88,-42.29 102.88,-45.87 145.17,-7.98h0Z" android:strokeColor="#FFFFFF" android:strokeWidth="40"/>
+      
+    <path android:fillColor="#00000000" android:pathData="M53.63,340.22l92.93,-103.75" android:strokeColor="#FFFFFF" android:strokeWidth="40"/>
+    
+</vector>

mobile/src/main/res/drawable/setting.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1025" android:width="200.2dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M1021.5,443.8c-2.9,-38.2 -10,-41.7 -47.8,-38.6 -41.8,3.3 -77.1,-17.5 -91.5,-53.9 -14.8,-37.2 -4.1,-75.6 28.5,-102.3 21.9,-18 24.6,-32.6 4.7,-53.6 -29.9,-31.7 -61.2,-62.3 -93.7,-91.2 -25.3,-22.4 -37,-19.5 -58.4,7.4 -26.1,32.9 -67.9,42.7 -105.8,25 -35.6,-16.6 -52.3,-47 -49.5,-90.1 1.9,-29.6 -6.8,-39.9 -36.3,-42.2 -23,-1.8 -46.1,-3 -67.7,-4.4C481.1,2.4 460,4.2 439,7 409.6,10.9 403.3,19.5 405.8,49.6 409.7,95.2 390.7,129.5 352.9,145.2 316.1,160.4 278.1,149.5 249.3,115.4c-17.1,-20.2 -32,-23.1 -50.9,-5.2C166.7,140 135.5,170.7 106.6,203.3 81.9,231.2 84.7,240.6 113.2,264.4 140.3,287.1 152.1,316.1 144.5,351.1 136.8,386.8 114.2,409.7 78.9,417.9 65.9,420.9 51.6,419 38,418.9 19.5,418.7 7.8,427.1 5.3,445.3 -1.4,495.7 -1.7,546.2 7.5,596.4c3.6,19.8 14.3,27.5 34.3,26.3C52.3,622.1 63,619.6 73.4,620.6c37,3.6 66,28.2 76,62.8 10,34.4 -1.9,69.5 -31.5,93.4 -24.4,19.6 -27.1,33.3 -5.9,55.9 29.4,31.3 59.9,61.7 92.2,90.1 27.4,24.1 37.9,21.3 60.8,-7.9 31.4,-40.2 87.7,-45.6 126.2,-12.6 25.8,22.1 32.8,50.1 29.4,82.6 -2.5,24 6.3,37.8 27.4,38.3 47.3,1 94.7,1.2 141.8,-1.7 30.7,-1.9 36.8,-12.8 33.3,-43.8 -5.1,-44.9 13.8,-80.2 51.5,-96.2 38.1,-16.1 76.6,-5.2 104.9,29.8 17.3,21.4 32.4,24.5 52,5.8 32.4,-30.9 64,-63 93.7,-96.4 21.6,-24.3 18.6,-37.4 -7.5,-57.1 -21.8,-16.4 -34,-38.1 -35.6,-65.2 -3.2,-55.3 41.9,-97.3 98,-91.7 28.6,2.8 42.6,-5.3 43.3,-30.3C1024.5,532.2 1024.8,487.8 1021.5,443.8zM513.4,735c-123,-1.3 -221.6,-101.4 -220,-223.2 1.6,-120.2 100.8,-218.9 219.3,-218.4 122.5,0.5 223.5,101.2 222.2,221.7C733.6,637.2 633.7,736.3 513.4,735z"/>
+    
+</vector>

mobile/src/main/res/drawable/shareicon.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M251.4,725.5s58.1,-180 202.5,-277.6 264.4,-71.3 264.4,-71.3l-1.9,97.5 240.1,-191.3L718.4,95.3v103.1s-174.6,-28.1 -311.3,108.8C253.9,460.6 251.4,725.5 251.4,725.5z"/>
+      
+    <path android:fillColor="#03fbf9" android:pathData="M724.1,840.8c0,2.1 -1.7,3.7 -3.7,3.7H150.6c-2.1,0 -3.7,-1.7 -3.7,-3.7V272.5c0,-2.1 1.7,-3.7 3.7,-3.7h203c12.3,-11.6 26,-22.3 41,-31.9 21.2,-13.4 43.1,-25.1 65,-35.2v-15.4h-309c-47.6,0 -86.2,38.7 -86.2,86.2v568.3c0,47.6 38.7,86.2 86.2,86.2h569.8c47.6,0 86.2,-38.7 86.2,-86.2V488.5l-82.5,47v305.3z"/>
+    
+</vector>

mobile/src/main/res/drawable/sort.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M100.7,565.2l456.6,0c19.9,-0 36,-16.1 36,-36v-34.3c0,-19.9 -16.1,-36 -36,-36l-456.6,-0c-19.9,0 -36,16.1 -36,36l-0,34.3c0,19.9 16.1,36 36,36zM100.7,299.2l456.6,0c19.9,-0 36,-16.1 36,-36v-34.3c0,-19.9 -16.1,-36 -36,-36l-456.6,-0c-19.9,0 -36,16.1 -36,36v34.3c0,19.9 16.1,36 36,36zM557.3,724.8L100.7,724.8c-19.9,0 -36,16.1 -36,36v34.3c0,19.9 16.1,36 36,36h456.6c19.9,0 36,-16.1 36,-36L593.3,760.8c0,-19.9 -16.1,-36 -36,-36zM707.2,831.2h34.3c19.9,0 36,-16.1 36,-36L777.6,433.4h145.8c19.9,0 36,-16.1 36,-36L772.7,210.8c-6.2,-10.7 -17.9,-18 -31.2,-18h-34.3c-19.9,0 -36,16.1 -36,36v566.3c0,19.9 16.1,36 36,36z"/>
+    
+</vector>

mobile/src/main/res/drawable/start.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#0DFCFD" android:pathData="M281.4,572l150.8,150.9 -60.3,60.3 60.4,60.4 -60.3,60.3 -105.6,-105.6 -120.7,120.7L85.3,858.7l120.7,-120.7 -105.6,-105.6 60.3,-60.3 60.3,60.3 60.3,-60.3zM108.6,128l151.3,0.1 504.2,504.2 60.4,-60.3 60.3,60.3 -105.6,105.6 120.7,120.7 -60.3,60.3 -120.7,-120.7 -105.6,105.6 -60.3,-60.3 60.3,-60.4L108.8,278.7 108.6,128zM725.5,128l151.2,0.1 0.1,150.3 -172.9,172.9 -150.9,-150.8L725.5,128z"/>
+    
+</vector>

mobile/src/main/res/drawable/tutorial.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M333.3,324.6c15.4,0 27.6,12.3 27.6,27.1 0,15.4 -12.3,28.2 -27.6,28.2H234.5c-14.8,0 -27.1,-12.8 -27.1,-28.2s11.8,-27.1 27.1,-27.1h98.8zM653.3,379.9c-15.9,0 -27.6,-12.8 -27.6,-28.2s11.8,-27.1 27.6,-27.1h98.3c15.9,0 27.6,12.3 27.6,27.1 0,15.4 -11.8,28.2 -27.6,28.2h-98.3zM520.2,192.5c0,14.8 -11.8,27.1 -27.6,27.1 -14.8,0 -27.1,-11.8 -27.1,-27.1V93.7c0,-14.8 12.3,-27.1 27.1,-27.1 15.9,0 27.6,12.3 27.6,27.1v98.8zM625.7,258.6c-10.8,10.8 -28.2,10.8 -38.9,0 -10.8,-11.3 -10.8,-28.2 0,-38.9l69.6,-70.1c10.8,-10.8 28.2,-10.8 38.9,0 10.8,11.3 10.8,28.2 0,38.9l-69.6,70.1zM399.9,219.6c10.2,10.8 10.2,28.2 0,38.9 -11.3,10.8 -28.7,10.8 -38.9,0L291.3,188.9c-11.3,-10.8 -11.3,-28.2 0,-38.9 10.2,-10.8 27.6,-10.8 38.9,0l69.6,69.6zM871.9,615.4c-5.6,-28.2 -31.7,-50.7 -58.4,-50.7 -17.4,0 -31.7,8.2 -41,19.5V578.6c0,-33.8 -26.1,-58.9 -55.3,-58.9s-55.3,28.2 -55.3,58.9v-30.7c0,-33.8 -26.1,-58.9 -55.3,-58.9s-55.3,28.2 -55.3,58.9V353.8c0,-33.8 -26.1,-58.9 -55.3,-58.9 -29.2,0 -52.2,28.2 -52.2,58.9v343c0,16.9 -11.8,30.7 -29.2,30.7h-8.7l-78.8,-33.8c-8.7,-5.6 -17.4,-2.6 -26.1,-5.6 -29.2,-8.2 -55.3,28.2 -55.3,58.9 0,19.5 23,45.1 34.8,56.3l212.5,210.9H819.2c8.7,-39.4 41,-188.4 52.2,-281.1 3.6,-45.1 6.7,-87 0.5,-117.8z"/>
+    
+</vector>

mobile/src/main/res/drawable/undo.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#ffffff" android:pathData="M67.5,455.6V456h115.8l0.1,-0.4h275.3l-182.1,-180.6a336,336 0,1 1,182.1 568.4v113.5a448,448 0,1 0,-263 -762.2L64,64v391.6h3.5z"/>
+    
+</vector>

mobile/src/main/res/drawable/unsort.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:height="200dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="200dp">
+      
+    <path android:fillColor="#03fbf9" android:pathData="M752.9,356.7h57.6v97.1L957.4,283.1l-146.9,-167v110.8h-57.6c-164.8,0 -272.3,127 -354.4,239.1 -73.7,100.7 -137.5,195.7 -240.3,195.7L66.6,661.7v129.9h91.6c164.8,0 257.8,-135 340,-247.1 73.7,-100.8 151.7,-187.8 254.7,-187.8zM306.3,431l21.3,-28.9c17.5,-23.8 35.8,-49 55.8,-74.1 -59,-57.3 -130.1,-99.5 -225.2,-99.5L66.6,228.5v129.9s24.7,-1.2 91.6,0c64.8,1.4 105.4,29 148.1,72.7zM810.5,666.7h-57.6c-62.8,0 -125.4,-36.4 -170.3,-84.6a929.2,929.2 0,0 1,-13.6 18.5c-19.7,26.9 -40.8,55.8 -64.1,84.3 60.6,61.4 148.4,111.7 248,111.7h57.6v111.4L957.4,736.9 810.5,570.2v96.5z"/>
+    
+</vector>

mobile/src/main/res/layout/fragment_deck_cards.xml

@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:layout_marginLeft="10dp"
+                android:layout_margin="1dp"
                 android:orientation="horizontal">
 
                 <LinearLayout
@@ -45,6 +45,13 @@
                         android:layout_weight="1"
                         android:orientation="horizontal">
 
+                        <ImageView
+                            android:layout_width="15dp"
+                            android:layout_height="15dp"
+                            android:layout_marginEnd="5dp"
+                            android:layout_gravity="bottom"
+                            android:src="@drawable/box_deck" />
+
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -55,6 +62,7 @@
                             android:shadowRadius="2"
                             android:text="@string/deck_name"
                             android:textColor="@color/holo_blue_light"
+                            android:textSize="10sp"
                             android:textStyle="bold" />
 
                         <LinearLayout
@@ -103,7 +111,7 @@
                         android:background="@drawable/button_radius_black_transparents"
                         android:ellipsize="end"
                         android:gravity="center|left"
-                        android:maxLines="1"
+                        android:maxLines="2"
                         android:paddingStart="5dp"
                         android:paddingEnd="5dp"
                         android:shadowColor="@color/black"
@@ -133,28 +141,35 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        android:layout_marginBottom="10dp"
+                        android:layout_marginBottom="20dp"
                         android:orientation="horizontal">
 
                         <ImageButton
                             android:id="@+id/btn_undo"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_width="48dp"
+                            android:layout_height="48dp"
                             android:layout_marginRight="5dp"
-                            android:gravity="center"
+                            android:adjustViewBounds="true"
+                            android:background="@drawable/rotate"
                             android:enabled="false"
-                            android:background="@drawable/ic_radius_bg"
-                            android:src="@drawable/ic_undo" />
+                            android:gravity="center"
+                            android:padding="14dp"
+                            android:scaleType="fitCenter"
+                            android:src="@drawable/undo" />
 
                         <ImageButton
                             android:id="@+id/btn_redo"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_width="48dp"
+                            android:layout_height="48dp"
                             android:layout_marginLeft="5dp"
-                            android:background="@drawable/ic_radius_bg"
-                            android:gravity="center"
+                            android:adjustViewBounds="true"
+                            android:background="@drawable/rotate"
                             android:enabled="false"
-                            android:src="@drawable/ic_redo" />
+                            android:gravity="center"
+                            android:padding="14dp"
+                            android:scaleType="fitCenter"
+                            android:scaleX="-1"
+                            android:src="@drawable/undo" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -167,14 +182,20 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="bottom"
+                            android:layout_margin="2dp"
                             android:orientation="vertical">
 
-                            <ImageView
+                            <ImageButton
                                 android:id="@+id/btn_nav_list"
                                 android:layout_width="48dp"
                                 android:layout_height="48dp"
                                 android:layout_gravity="center"
-                                android:src="@drawable/listicon" />
+                                android:adjustViewBounds="true"
+                                android:background="@drawable/button_cube"
+                                android:padding="12dp"
+                                android:scaleType="fitCenter"
+                                android:src="@drawable/listicon"
+                                app:tint="@color/holo_blue_bright" />
 
                             <TextView
                                 android:layout_width="match_parent"
@@ -195,14 +216,20 @@
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_gravity="bottom"
+                            android:layout_margin="2dp"
                             android:orientation="vertical">
 
-                            <ImageView
+                            <ImageButton
                                 android:id="@+id/btn_nav_search"
                                 android:layout_width="48dp"
                                 android:layout_height="48dp"
                                 android:layout_gravity="center"
-                                android:src="@drawable/search" />
+                                android:adjustViewBounds="true"
+                                android:background="@drawable/button_cube"
+                                android:padding="8dp"
+                                android:scaleType="fitCenter"
+                                android:src="@drawable/search"
+                                app:tint="@color/holo_blue_bright" />
 
                             <TextView
                                 android:layout_width="match_parent"
@@ -223,8 +250,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_gravity="bottom"
-                            android:layout_marginLeft="2dp"
-                            android:layout_marginRight="2dp"
+                            android:layout_margin="2dp"
                             android:orientation="vertical">
 
                             <com.nightonke.boommenu.BoomMenuButton

mobile/src/main/res/layout/fragment_search.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/fragment_search">
 
     <androidx.drawerlayout.widget.DrawerLayout
@@ -35,14 +36,17 @@
                 android:layout_marginBottom="70dp"
                 android:orientation="vertical">
 
-                <Button
+                <ImageButton
                     android:id="@+id/btn_search"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
                     android:layout_gravity="center"
-                    android:layout_marginBottom="10dp"
-                    android:background="@drawable/search"
-                    android:gravity="center" />
+                    android:background="@drawable/button_cube"
+                    android:src="@drawable/search"
+                    android:scaleType="fitCenter"
+                    android:adjustViewBounds="true"
+                    android:padding="8dp"
+                    app:tint="@color/holo_blue_bright"/>
 
                 <TextView
                     android:id="@+id/search_result_count"