Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the "Write Dump" layout tab based #276

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
feature_36 [Make the "Write Dump" layout tab based]
  • Loading branch information
jpglmart committed Nov 10, 2019
commit f389a662b3e4245c90e176f82ab24c7c770c69d2
1 change: 1 addition & 0 deletions Mifare Classic Tool/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ android {

dependencies {
implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
implementation 'com.android.support:design:28.0.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use AndroidX dep.

}
6 changes: 6 additions & 0 deletions Mifare Classic Tool/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@
android:icon="@drawable/write_tag"
android:label="@string/title_activity_write_tag" >
</activity>
<activity
android:name="de.syss.MifareClassicTool.Activities.WriteTagFragmentActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="keyboardHidden|orientation|screenSize"
android:icon="@drawable/write_tag">
</activity>
<activity
android:name="de.syss.MifareClassicTool.Activities.ReadTag"
android:configChanges="keyboardHidden|orientation|screenSize"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
* Copyright 2013 Gerhard Klostermeier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http:https://www.gnu.org/licenses/>.
*/

package de.syss.MifareClassicTool.Activities;

import android.app.Activity;
import android.content.Intent;

import androidx.fragment.app.FragmentActivity;

import de.syss.MifareClassicTool.Common;

/**
* A FragmentActivity implementing the NFC foreground dispatch system overwriting
* onResume() and onPause(). New Intents will be treated as new Tags.
* @see Common#enableNfcForegroundDispatch(Activity)
* @see Common#disableNfcForegroundDispatch(Activity)
* @see Common#treatAsNewTag(Intent, android.content.Context)
*
*/

public class BasicFragmentActivity extends FragmentActivity {

/**
* Enable NFC foreground dispatch system.
* @see Common#disableNfcForegroundDispatch(Activity)
*/
@Override
public void onResume() {
super.onResume();
Common.setPendingComponentName(this.getComponentName());
Common.enableNfcForegroundDispatch(this);
}

/**
* Disable NFC foreground dispatch system.
* @see Common#disableNfcForegroundDispatch(Activity)
*/
@Override
public void onPause() {
Common.disableNfcForegroundDispatch(this);
super.onPause();
}

/**
* Handle new Intent as a new tag Intent and if the tag/device does not
* support MIFARE Classic, then run {@link TagInfoTool}.
* @see Common#treatAsNewTag(Intent, android.content.Context)
* @see TagInfoTool
*/
@Override
public void onNewIntent(Intent intent) {
int typeCheck = Common.treatAsNewTag(intent, this);
if (typeCheck == -1 || typeCheck == -2) {
// Device or tag does not support MIFARE Classic.
// Run the only thing that is possible: The tag info tool.
Intent i = new Intent(this, TagInfoTool.class);
startActivity(i);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,18 @@ public void onShowWriteTag(View view) {
startActivity(intent);
}

/**
* Show the {@link WriteTagFragmentActivity}.
* @param view The View object that triggered the method
* (in this case the write tag button).
* @see WriteTagFragmentActivity
*/
public void onShowWriteTagFragmentActivity(View view) {
Intent intent = new Intent(this, WriteTagFragmentActivity.class);
startActivity(intent);
}


/**
* Show the {@link HelpAndInfo}.
* @param view The View object that triggered the method
Expand Down
Loading