Commit 0db6c643 authored by fallenstardust's avatar fallenstardust

deck manager不能是抽象类

parent 10c5e5b5
...@@ -111,7 +111,7 @@ import ocgcore.data.Card; ...@@ -111,7 +111,7 @@ import ocgcore.data.Card;
import ocgcore.data.LimitList; import ocgcore.data.LimitList;
import ocgcore.enums.LimitType; import ocgcore.enums.LimitType;
public abstract class DeckManagerActivity extends BaseActivity implements RecyclerViewItemListener.OnItemListener, OnItemDragListener, YGODialogUtil.OnDeckMenuListener, CardLoader.CallBack, CardSearcher.CallBack { public class DeckManagerActivity extends BaseActivity implements RecyclerViewItemListener.OnItemListener, OnItemDragListener, YGODialogUtil.OnDeckMenuListener, CardLoader.CallBack, CardSearcher.CallBack {
public static void start(Context context, String path) { public static void start(Context context, String path) {
Intent starter = new Intent(context, DeckManagerActivity.class); Intent starter = new Intent(context, DeckManagerActivity.class);
starter.putExtra(Intent.EXTRA_TEXT, path); starter.putExtra(Intent.EXTRA_TEXT, path);
......
...@@ -20,12 +20,14 @@ import android.view.ViewGroup; ...@@ -20,12 +20,14 @@ import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ListView; 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.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
...@@ -52,15 +54,16 @@ import cn.garymb.ygomobile.bean.events.ServerInfoEvent; ...@@ -52,15 +54,16 @@ import cn.garymb.ygomobile.bean.events.ServerInfoEvent;
import cn.garymb.ygomobile.lite.BuildConfig; import cn.garymb.ygomobile.lite.BuildConfig;
import cn.garymb.ygomobile.lite.R; import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.loader.ImageLoader; import cn.garymb.ygomobile.loader.ImageLoader;
import cn.garymb.ygomobile.ui.activities.FileLogActivity;
import cn.garymb.ygomobile.ui.activities.WebActivity; import cn.garymb.ygomobile.ui.activities.WebActivity;
import cn.garymb.ygomobile.ui.adapters.ServerListAdapter; import cn.garymb.ygomobile.ui.adapters.ServerListAdapter;
import cn.garymb.ygomobile.ui.adapters.SimpleListAdapter; import cn.garymb.ygomobile.ui.adapters.SimpleListAdapter;
import cn.garymb.ygomobile.ui.cards.CardDetailRandom; import cn.garymb.ygomobile.ui.cards.CardDetailRandom;
import cn.garymb.ygomobile.ui.cards.DeckManagerActivity; import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
import cn.garymb.ygomobile.ui.mycard.MyCardActivity;
import cn.garymb.ygomobile.ui.plus.DialogPlus; import cn.garymb.ygomobile.ui.plus.DialogPlus;
import cn.garymb.ygomobile.ui.plus.VUiKit; import cn.garymb.ygomobile.ui.plus.VUiKit;
import cn.garymb.ygomobile.ui.preference.SettingsActivity; import cn.garymb.ygomobile.ui.preference.SettingsActivity;
import cn.garymb.ygomobile.ui.widget.CardView;
import cn.garymb.ygomobile.ui.widget.Shimmer; import cn.garymb.ygomobile.ui.widget.Shimmer;
import cn.garymb.ygomobile.ui.widget.ShimmerTextView; import cn.garymb.ygomobile.ui.widget.ShimmerTextView;
import cn.garymb.ygomobile.utils.FileUtils; import cn.garymb.ygomobile.utils.FileUtils;
...@@ -81,10 +84,10 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -81,10 +84,10 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
private CardDetailRandom mCardDetailRandom; private CardDetailRandom mCardDetailRandom;
private ImageLoader mImageLoader; private ImageLoader mImageLoader;
View cv_deckmanager; CardView cv_deckmanager;
View cv_donation; CardView cv_donation;
View cv_game; CardView cv_game;
View cv_download_ex; CardView cv_download_ex;
@Nullable @Nullable
@Override @Override
...@@ -135,8 +138,8 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -135,8 +138,8 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
cv_donation = view.findViewById(R.id.nav_webpage); cv_donation = view.findViewById(R.id.nav_webpage);
cv_game = view.findViewById(R.id.action_game); cv_game = view.findViewById(R.id.action_game);
cv_download_ex = view.findViewById(R.id.action_download_ex); cv_download_ex = view.findViewById(R.id.action_download_ex);
/*/萌卡 //萌卡
ImageView iv_mc = view.findViewById(R.id.btn_mycard); CardView iv_mc = view.findViewById(R.id.action_replay);
iv_mc.setOnClickListener((v) -> { iv_mc.setOnClickListener((v) -> {
if (Constants.SHOW_MYCARD) { if (Constants.SHOW_MYCARD) {
startActivity(new Intent(getActivity(), MyCardActivity.class)); startActivity(new Intent(getActivity(), MyCardActivity.class));
...@@ -149,7 +152,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -149,7 +152,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
startActivity(new Intent(getActivity(), FileLogActivity.class)); startActivity(new Intent(getActivity(), FileLogActivity.class));
return true; return true;
} }
});*/ });
tv = (ShimmerTextView) view.findViewById(R.id.shimmer_tv); tv = (ShimmerTextView) view.findViewById(R.id.shimmer_tv);
toggleAnimation(tv); toggleAnimation(tv);
...@@ -529,7 +532,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -529,7 +532,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
//startActivity(new Intent(getContext(), CardSearchActivity.class)); //startActivity(new Intent(getContext(), CardSearchActivity.class));
break; break;
case R.id.action_deck_manager: case R.id.action_deck_manager:
DeckManagerActivity.start(getContext(), null); startActivity(new Intent(getActivity(), DeckManagerActivity.class));
break; break;
case R.id.action_join_qq_group: case R.id.action_join_qq_group:
String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK"; String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK";
......
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</RelativeLayout> </RelativeLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_deck_managerk" android:id="@+id/action_deck_manager"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:targetClass="cn.garymb.ygomobile.ui.cards.CardSearchActivity" android:targetClass="cn.garymb.ygomobile.ui.cards.CardSearchFragment"
android:targetPackage="cn.garymb.ygomobile" /> android:targetPackage="cn.garymb.ygomobile" />
<categories android:name="android.shortcut.conversation" /> <categories android:name="android.shortcut.conversation" />
</shortcut> </shortcut>
......
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