Commit 009999cc authored by fallenstardust's avatar fallenstardust

低版本不设置主卡组数字颜色

删除home的NavigationView.OnNavigationItemSelectedListener
添加BaseFragment和ScaleUtils
parent 01ab8609
...@@ -3,6 +3,7 @@ package cn.garymb.ygomobile.ui.adapters; ...@@ -3,6 +3,7 @@ package cn.garymb.ygomobile.ui.adapters;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
...@@ -91,8 +92,10 @@ public class DeckListAdapter<T extends TextSelect> extends BaseQuickAdapter<T, D ...@@ -91,8 +92,10 @@ public class DeckListAdapter<T extends TextSelect> extends BaseQuickAdapter<T, D
if (deckInfo.getMainCount() < 40) { if (deckInfo.getMainCount() < 40) {
holder.main.setTextColor(Color.YELLOW); holder.main.setTextColor(Color.YELLOW);
} else { } else {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
holder.main.setTextColor(mContext.getColor(R.color.holo_blue_bright)); holder.main.setTextColor(mContext.getColor(R.color.holo_blue_bright));
} }
}
holder.extra.setText(String.valueOf(deckInfo.getExtraCount())); holder.extra.setText(String.valueOf(deckInfo.getExtraCount()));
holder.side.setText(String.valueOf(deckInfo.getSideCount())); holder.side.setText(String.valueOf(deckInfo.getSideCount()));
//多选 //多选
......
package cn.garymb.ygomobile.ui.home; package cn.garymb.ygomobile.ui.home;
import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST;
import android.content.Intent; import android.content.Intent;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
...@@ -11,7 +13,6 @@ import android.os.Build; ...@@ -11,7 +13,6 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -28,7 +29,6 @@ import android.widget.ListView; ...@@ -28,7 +29,6 @@ import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
...@@ -40,7 +40,6 @@ import com.app.hubert.guide.listener.OnLayoutInflatedListener; ...@@ -40,7 +40,6 @@ import com.app.hubert.guide.listener.OnLayoutInflatedListener;
import com.app.hubert.guide.model.GuidePage; import com.app.hubert.guide.model.GuidePage;
import com.app.hubert.guide.model.HighLight; import com.app.hubert.guide.model.HighLight;
import com.app.hubert.guide.model.HighlightOptions; import com.app.hubert.guide.model.HighlightOptions;
import com.google.android.material.navigation.NavigationView;
import com.nightonke.boommenu.BoomButtons.BoomButton; import com.nightonke.boommenu.BoomButtons.BoomButton;
import com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton; import com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton;
import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.BoomMenuButton;
...@@ -94,9 +93,7 @@ import ocgcore.CardManager; ...@@ -94,9 +93,7 @@ import ocgcore.CardManager;
import ocgcore.DataManager; import ocgcore.DataManager;
import ocgcore.data.Card; import ocgcore.data.Card;
import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST; public abstract class HomeActivity extends BaseActivity implements OnDuelAssistantListener {
public abstract class HomeActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, OnDuelAssistantListener {
private static final int ID_MAINACTIVITY = 0; private static final int ID_MAINACTIVITY = 0;
...@@ -146,11 +143,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -146,11 +143,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
if (!BuildConfig.BUILD_TYPE.equals("debug")) { if (!BuildConfig.BUILD_TYPE.equals("debug")) {
//release才检查版本 //release才检查版本
if (!Constants.ACTION_OPEN_GAME.equals(getIntent().getAction())) { if (!Constants.ACTION_OPEN_GAME.equals(getIntent().getAction())) {
Log.d(Constants.TAG, "start check update");
//check update
Beta.checkUpgrade(false, false); Beta.checkUpgrade(false, false);
} else {
Log.d(Constants.TAG, "skip check update");
} }
} }
//初始化决斗助手 //初始化决斗助手
...@@ -287,14 +280,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -287,14 +280,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
if (doMenu(item.getItemId())) {
return true;
}
return false;
}
@Override @Override
public HomeActivity getActivity() { public HomeActivity getActivity() {
return this; return this;
...@@ -606,7 +591,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -606,7 +591,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
if (isUrl) { if (isUrl) {
Deck deckInfo = new Deck(getString(R.string.rename_deck) + System.currentTimeMillis(), Uri.parse(deckMessage)); Deck deckInfo = new Deck(getString(R.string.rename_deck) + System.currentTimeMillis(), Uri.parse(deckMessage));
File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir()); File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir());
if (!deckInfo.isCompleteDeck()){ if (!deckInfo.isCompleteDeck()) {
YGOUtil.show("当前卡组缺少完整信息,将只显示已有卡片"); YGOUtil.show("当前卡组缺少完整信息,将只显示已有卡片");
} }
DeckManagerActivity.start(this, file.getAbsolutePath()); DeckManagerActivity.start(this, file.getAbsolutePath());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment