diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index ea47a3d..0d4d842 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 2d3ca7e..a74ed83 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/mauriciogior/openqrcode/MainActivity.java b/app/src/main/java/com/mauriciogior/openqrcode/MainActivity.java
index cabe601..0873caa 100644
--- a/app/src/main/java/com/mauriciogior/openqrcode/MainActivity.java
+++ b/app/src/main/java/com/mauriciogior/openqrcode/MainActivity.java
@@ -123,22 +123,22 @@ public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
public boolean onActionItemClicked(final ActionMode actionMode, MenuItem menuItem) {
if (menuItem.getItemId() == R.id.action_remove) {
new AlertDialog.Builder(MainActivity.this)
- .setTitle("Remove")
- .setMessage("Are you sure you want to remove " + checkedItems.size() + " item" + (checkedItems.size() > 1 ? "s" : "") + "?")
- .setPositiveButton("Remove", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int position) {
- for (Integer i : checkedItems) {
- String qrCode = (String) mArrayAdapter.getItem(i);
- removeHistory(qrCode);
+ .setTitle("Remove")
+ .setMessage("Are you sure you want to remove " + checkedItems.size() + " item" + (checkedItems.size() > 1 ? "s" : "") + "?")
+ .setPositiveButton("Remove", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int position) {
+ for (Integer i : checkedItems) {
+ String qrCode = (String) mArrayAdapter.getItem(i);
+ removeHistory(qrCode);
+ }
+
+ actionMode.finish();
}
-
- actionMode.finish();
- }
- })
- .setNegativeButton("Cancel", null)
- .create()
- .show();
+ })
+ .setNegativeButton("Cancel", null)
+ .create()
+ .show();
return true;
} else if (menuItem.getItemId() == R.id.action_select_all) {
@@ -372,34 +372,34 @@ private void showAlertDialog(final String text, final boolean resumeCamera) {
pushHistory(text);
AlertDialog dialog = new AlertDialog.Builder(this)
- .setTitle("QR Code")
- .setMessage(message)
- .setPositiveButton("Copy", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- setClipboard(text);
- }
- })
- .setNeutralButton("Share", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- Intent sendIntent = new Intent();
- sendIntent.setAction(Intent.ACTION_SEND);
- sendIntent.putExtra(Intent.EXTRA_TEXT, text);
- sendIntent.setType("text/plain");
- startActivity(sendIntent);
- }
- })
- .setNegativeButton("Cancel", null)
- .setOnDismissListener(new DialogInterface.OnDismissListener() {
- @Override
- public void onDismiss(DialogInterface dialogInterface) {
- if (resumeCamera) {
- mScannerView.resumeCameraPreview(MainActivity.this);
+ .setTitle("QR Code")
+ .setMessage(message)
+ .setPositiveButton("Copy", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ setClipboard(text);
}
- }
- })
- .show();
+ })
+ .setNeutralButton("Share", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ Intent sendIntent = new Intent();
+ sendIntent.setAction(Intent.ACTION_SEND);
+ sendIntent.putExtra(Intent.EXTRA_TEXT, text);
+ sendIntent.setType("text/plain");
+ startActivity(sendIntent);
+ }
+ })
+ .setNegativeButton("Cancel", null)
+ .setOnDismissListener(new DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface dialogInterface) {
+ if (resumeCamera) {
+ mScannerView.resumeCameraPreview(MainActivity.this);
+ }
+ }
+ })
+ .show();
((TextView) dialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}
@@ -431,13 +431,20 @@ public boolean onCreateOptionsMenu(Menu menu) {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.menu_info) {
- new AlertDialog.Builder(this)
- .setTitle("Info")
- .setMessage("Created by a pissed of developer from apps loaded with ads.\n\n" +
- "Mauricio Giordano \n\n" +
- "Open source software under MIT License")
- .setNegativeButton("Ok", null)
- .show();
+ String text = "Created by a developer pissed off from apps loaded with ads.\n\n"
+ + "Mauricio Giordano \n\n"
+ + "Open source software under MIT License.\n\n"
+ + "GitHub: https://github.com/mauriciogior/open-qrcode";
+ final SpannableString message = new SpannableString(text);
+ Linkify.addLinks(message, Linkify.ALL);
+
+ AlertDialog dialog = new AlertDialog.Builder(this)
+ .setTitle("About the app")
+ .setMessage(message)
+ .setNegativeButton("Ok", null)
+ .show();
+
+ ((TextView) dialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
} else if (item.getItemId() == R.id.action_flash_on) {
mMenu.findItem(R.id.action_flash_off).setVisible(true);
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index 463b737..444803c 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -20,7 +20,7 @@
android:id="@+id/menu_info"
android:icon="@drawable/ic_info"
android:title="@string/title_info"
- android:showAsAction="never"
+ android:showAsAction="always"
app:showAsAction="never" />