remove BaseActivity showToast

tweak layout

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java

@@ -24,6 +24,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.utils.YGOUtil;
 import ocgcore.data.Card;
 
 
@@ -288,52 +289,8 @@ public class BaseActivity extends AppCompatActivity {
 //                getContext().startActivity(new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:" + getContext().getPackageName())).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
 //            }
         } else {
-            showToast("喵不给我权限让我怎么运行？！");
+            YGOUtil.showTextToast("喵不给我权限让我怎么运行？！");
             finish();
         }
     }
-
-    @SuppressLint("ShowToast")
-    private Toast makeToast() {
-        if (mToast == null) {
-            mToast = Toast.makeText(this, "", Toast.LENGTH_SHORT);
-        }
-        return mToast;
-    }
-
-    /**
-     * Set how long to show the view for.
-     *
-     * @see android.widget.Toast#LENGTH_SHORT
-     * @see android.widget.Toast#LENGTH_LONG
-     */
-    public void showToast(int id, int duration) {
-        showToast(getString(id), duration);
-    }
-
-    public void showToast(CharSequence text) {
-        showToast(text, Toast.LENGTH_SHORT);
-    }
-
-    public void showToast(int id) {
-        showToast(getString(id));
-    }
-
-    /**
-     * Set how long to show the view for.
-     *
-     * @see android.widget.Toast#LENGTH_SHORT
-     * @see android.widget.Toast#LENGTH_LONG
-     */
-    public void showToast(CharSequence text, int duration) {
-        if (Looper.myLooper() != Looper.getMainLooper()) {
-            runOnUiThread(() -> showToast(text, duration));
-            return;
-        }
-        Toast toast = makeToast();
-        toast.setText(text);
-        toast.setGravity(Gravity.TOP, 0, 0);
-        toast.setDuration(duration);
-        toast.show();
-    }
 }

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/FileLogActivity.java

@@ -13,6 +13,7 @@ import java.io.IOException;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.utils.FileLogUtil;
+import cn.garymb.ygomobile.utils.YGOUtil;
 
 public class FileLogActivity extends BaseActivity {
 
@@ -51,10 +52,10 @@ public class FileLogActivity extends BaseActivity {
                     public void onClick(DialogInterface dialog, int which) {
                         try {
                             FileLogUtil.clear();
-                            showToast("清空完毕");
+                            YGOUtil.showTextToast("清空完毕");
                             tv_log.setText("");
                         } catch (IOException e) {
-                            showToast("清空失败，原因为"+e.getMessage());
+                            YGOUtil.showTextToast("清空失败，原因为"+e.getMessage());
                         }
                         dialog.dismiss();
                     }

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

@@ -735,12 +735,12 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
         int position = getCurPosition();
         CardListProvider provider = getProvider();
         if (position == 0) {
-            getContext().showToast(R.string.already_top, Toast.LENGTH_SHORT);
+            YGOUtil.showTextToast(R.string.already_top, Toast.LENGTH_SHORT);
         } else {
             int index = position;
             do {
                 if (index == 0) {
-                    getContext().showToast(R.string.already_top, Toast.LENGTH_SHORT);
+                    YGOUtil.showTextToast(R.string.already_top, Toast.LENGTH_SHORT);
                     return;
                 } else {
                     index--;
@@ -749,7 +749,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
 
             bind(provider.getCard(index), index, provider);
             if (position == 1) {
-                getContext().showToast(R.string.already_top, Toast.LENGTH_SHORT);
+                YGOUtil.showTextToast(R.string.already_top, Toast.LENGTH_SHORT);
             }
         }
     }
@@ -761,7 +761,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
             int index = position;
             do {
                 if (index == provider.getCardsCount() - 1) {
-                    getContext().showToast(R.string.already_end, Toast.LENGTH_SHORT);
+                    YGOUtil.showTextToast(R.string.already_end, Toast.LENGTH_SHORT);
                     return;
                 } else {
                     index++;
@@ -770,10 +770,10 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
 
             bind(provider.getCard(index), index, provider);
             if (position == provider.getCardsCount() - 1) {
-                getContext().showToast(R.string.already_end, Toast.LENGTH_SHORT);
+                YGOUtil.showTextToast(R.string.already_end, Toast.LENGTH_SHORT);
             }
         } else {
-            getContext().showToast(R.string.already_end, Toast.LENGTH_SHORT);
+            YGOUtil.showTextToast(R.string.already_end, Toast.LENGTH_SHORT);
         }
     }
 

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

@@ -634,9 +634,9 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         if (checkLimit(cardInfo)) {
             boolean rs = mDeckAdapater.AddCard(cardInfo, DeckItemType.SideCard);
             if (rs) {
-                activity.showToast(R.string.add_card_tip_ok);
+                YGOUtil.showTextToast(R.string.add_card_tip_ok);
             } else {
-                activity.showToast(R.string.add_card_tip_fail);
+                YGOUtil.showTextToast(R.string.add_card_tip_fail);
             }
             return rs;
         }
@@ -652,9 +652,9 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                 rs = mDeckAdapater.AddCard(cardInfo, DeckItemType.MainCard);
             }
             if (rs) {
-                activity.showToast(R.string.add_card_tip_ok);
+                YGOUtil.showTextToast(R.string.add_card_tip_ok);
             } else {
-                activity.showToast(R.string.add_card_tip_fail);
+                YGOUtil.showTextToast(R.string.add_card_tip_fail);
             }
             return rs;
         }

mobile/src/main/java/cn/garymb/ygomobile/ui/home/ImageUpdater.java

@@ -26,6 +26,7 @@ import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.utils.IOUtils;
+import cn.garymb.ygomobile.utils.YGOUtil;
 import ocgcore.DataManager;
 import ocgcore.data.Card;
 import ocgcore.enums.CardType;
@@ -328,9 +329,9 @@ public class ImageUpdater implements DialogInterface.OnCancelListener {
         }
         VUiKit.post(() -> {
             if (mError == 0) {
-                mContext.showToast(R.string.downloading_images_ok, Toast.LENGTH_SHORT);
+                YGOUtil.showTextToast(R.string.downloading_images_ok, Toast.LENGTH_SHORT);
             } else {
-                mContext.showToast(mContext.getString(R.string.download_image_error, mError), Toast.LENGTH_SHORT);
+                YGOUtil.showTextToast(mContext.getString(R.string.download_image_error, mError), Toast.LENGTH_SHORT);
             }
         });
     }

mobile/src/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java

@@ -65,7 +65,7 @@ public class MainActivity extends HomeActivity implements BottomNavigationBar.On
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 //        for(int i=0;i<permissions.length;i++){
 //            if(grantResults[i] == PackageManager.PERMISSION_DENIED){
-//                showToast(getString(R.string.tip_no_permission,permissions[i]));
+//                YGOUtil.showTextToast(getString(R.string.tip_no_permission,permissions[i]));
 //                break;
 //            }
 //        }

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

@@ -40,7 +40,6 @@
                 android:layout_marginLeft="5dp"
                 android:background="@drawable/button2_bg"
                 android:gravity="center"
-                android:paddingRight="16dp"
                 android:shadowColor="@color/black"
                 android:text="@string/card_faq"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"