Remove core only card

This commit is contained in:
topjohnwu
2019-01-30 14:45:45 -05:00
parent 4df1047b07
commit 3e9174deed
5 changed files with 25 additions and 45 deletions

View File

@@ -19,6 +19,7 @@ public class UpdateCardHolder {
@BindView(R.id.status) public TextView status;
@BindView(R.id.current_version) public TextView currentVersion;
@BindView(R.id.latest_version) public TextView latestVersion;
@BindView(R.id.additional) public TextView additional;
@BindView(R.id.install) public Button install;
public View itemView;

View File

@@ -57,8 +57,6 @@ public class MagiskFragment extends BaseFragment
@BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
@BindView(R.id.linearLayout) LinearLayout root;
@BindView(R.id.core_only_notice) CardView coreOnlyNotice;
@BindView(R.id.safetyNet_card) CardView safetyNetCard;
@BindView(R.id.safetyNet_refresh) ImageView safetyNetRefreshIcon;
@BindView(R.id.safetyNet_status) TextView safetyNetStatusText;
@@ -138,8 +136,6 @@ public class MagiskFragment extends BaseFragment
magisk = new UpdateCardHolder(inflater, root);
manager = new UpdateCardHolder(inflater, root);
magisk.install.setOnClickListener(this::magiskInstall);
manager.install.setOnClickListener(this::managerInstall);
root.addView(magisk.itemView, 0);
root.addView(manager.itemView, 1);
@@ -150,7 +146,17 @@ public class MagiskFragment extends BaseFragment
mSwipeRefreshLayout.setOnRefreshListener(this);
coreOnlyNotice.setVisibility(Config.get(Config.Key.COREONLY) ? View.VISIBLE : View.GONE);
magisk.install.setOnClickListener(this::magiskInstall);
manager.install.setOnClickListener(this::managerInstall);
if (Config.get(Config.Key.COREONLY)) {
magisk.additional.setText(R.string.core_only_enabled);
magisk.additional.setVisibility(View.VISIBLE);
}
if (!app.getPackageName().equals(BuildConfig.APPLICATION_ID)) {
manager.additional.setText("(" + app.getPackageName() + ")");
manager.additional.setVisibility(View.VISIBLE);
}
safetyNetCard.setVisibility(hasGms() && Networking.checkNetworkStatus(app) ?
View.VISIBLE : View.GONE);