Compare commits

..

7 Commits
v0.6 ... v0.7

Author SHA1 Message Date
Branden Archer
5965b82251 Merge pull request #51 from brarcher/pre-v0.7
Update for release v0.7
2016-07-14 16:00:10 -04:00
Branden Archer
a5650e6382 Update for release v0.7 2016-07-14 15:37:35 -04:00
Branden Archer
6befc99ccc Merge pull request #50 from brarcher/id-to-clipboard
Copy card id to clipboard
2016-07-14 14:56:20 -04:00
Branden Archer
0e124b2550 Allow long-click of card to copy id to clipboard
https://github.com/brarcher/loyalty-card-locker/issues/49
2016-07-14 13:38:42 -04:00
Branden Archer
06a7db0e6d Update Android gradle plugin to 2.1.2 2016-07-14 13:38:42 -04:00
Branden Archer
f2f56b06dd Merge pull request #47 from brarcher/back-button
Let pushing back button in menu end import/export activity
2016-05-26 23:12:22 -04:00
Branden Archer
518f339c7a Let pushing back button in menu end import/export activity 2016-05-24 07:55:04 -04:00
8 changed files with 75 additions and 3 deletions

View File

@@ -14,8 +14,8 @@ android {
applicationId "protect.card_locker"
minSdkVersion 11
targetSdkVersion 23
versionCode 6
versionName "0.6"
versionCode 7
versionName "0.7"
}
buildTypes {
release {

View File

@@ -9,6 +9,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;
@@ -128,4 +129,18 @@ public class ImportExportActivity extends AppCompatActivity
}
super.onDestroy();
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
int id = item.getItemId();
if(id == android.R.id.home)
{
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
}

View File

@@ -1,7 +1,9 @@
package protect.card_locker;
import android.content.ClipData;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.ClipboardManager;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.database.Cursor;
@@ -10,13 +12,16 @@ import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.ContextMenu;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.webkit.WebView;
import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import java.util.Calendar;
@@ -65,6 +70,8 @@ public class MainActivity extends AppCompatActivity
final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
cardList.setAdapter(adapter);
registerForContextMenu(cardList);
cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
{
@Override
@@ -83,6 +90,39 @@ public class MainActivity extends AppCompatActivity
});
}
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
{
super.onCreateContextMenu(menu, v, menuInfo);
if (v.getId()==R.id.list)
{
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.card_longclick_menu, menu);
}
}
@Override
public boolean onContextItemSelected(MenuItem item)
{
AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
ListView listView = (ListView) findViewById(R.id.list);
Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
if(card != null && item.getItemId() == R.id.action_clipboard)
{
ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(card.store, card.cardId);
clipboard.setPrimaryClip(clip);
Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
return true;
}
return super.onContextItemSelected(item);
}
@Override
public boolean onCreateOptionsMenu(Menu menu)
{

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_clipboard"
android:title="@string/copy_to_clipboard"
app:showAsAction="always"/>
</menu>

View File

@@ -52,4 +52,6 @@
<string name="enterCard">Inserisci carta</string>
<string name="selectBarcodeTitle">Seleziona codice a barre</string>
<string name="enterBarcodeInstructions">Digita il valore del codice a barre, quindi seleziona l\'immagine che rappresenta il codice a barre che vuoi usare.</string>
<string name="copy_to_clipboard">Copia ID negli appunti</string>
<string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
</resources>

View File

@@ -52,4 +52,6 @@
<string name="enterCard">Voer kaart in</string>
<string name="selectBarcodeTitle">Selecteer barcode</string>
<string name="enterBarcodeInstructions">Voer de waarde van de barcode in en kies daarna de afbeelding die de barcode die je wil gebruiken representeert</string>
<string name="copy_to_clipboard">Kopieer het ID naar het klembord</string>
<string name="copy_to_clipboard_toast">Het ID is naar het klembord gekopieerd</string>
</resources>

View File

@@ -18,6 +18,7 @@
<string name="edit">Edit</string>
<string name="delete">Delete</string>
<string name="ok">OK</string>
<string name="copy_to_clipboard">Copy ID to clipboard</string>
<string name="editCardTitle">Edit Loyalty Card</string>
<string name="addCardTitle">Add Loyalty Card</string>
@@ -55,4 +56,7 @@
<string name="selectBarcodeTitle">Select Barcode</string>
<string name="enterBarcodeInstructions">Enter the barcode value then select the image which represents the barcode you want to use</string>
<string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>
</resources>

View File

@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.android.tools.build:gradle:2.1.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files