diff --git a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java index b6f5c54..d428192 100644 --- a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java +++ b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java @@ -21,6 +21,8 @@ package com.vsmartcard.remotesmartcardreader.app; import android.app.Activity; import android.app.PendingIntent; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.Intent; import android.net.Uri; import android.nfc.NfcAdapter; @@ -32,12 +34,16 @@ import android.text.Editable; import android.text.Layout; import android.text.method.ScrollingMovementMethod; import android.view.KeyEvent; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.EditText; import android.widget.ProgressBar; import android.widget.TextView; +import android.widget.Toast; import com.vsmartcard.remotesmartcardreader.app.screaders.DummyReader; import com.vsmartcard.remotesmartcardreader.app.screaders.NFCReader; @@ -147,6 +153,31 @@ public class MainActivity extends Activity { updateLabels(); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.main, menu); + + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle presses on the action bar items + switch (item.getItemId()) { + case R.id.action_copy: + // Code to Copy the content of Text View to the Clip board. + ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); + ClipData clip = ClipData.newPlainText("simple text", textViewVPCDStatus.getText()); + clipboard.setPrimaryClip(clip); + Toast.makeText(getApplicationContext(), "Log copied to clipboard.", + Toast.LENGTH_LONG).show(); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + private static String saved_status_key = "textViewVPCDStatus"; @Override public void onRestoreInstanceState(Bundle savedInstanceState) { diff --git a/remote-reader/app/src/main/res/drawable-hdpi/ic_action_copy.png b/remote-reader/app/src/main/res/drawable-hdpi/ic_action_copy.png new file mode 100644 index 0000000..f97df1d Binary files /dev/null and b/remote-reader/app/src/main/res/drawable-hdpi/ic_action_copy.png differ diff --git a/remote-reader/app/src/main/res/drawable-mdpi/ic_action_copy.png b/remote-reader/app/src/main/res/drawable-mdpi/ic_action_copy.png new file mode 100644 index 0000000..d846e72 Binary files /dev/null and b/remote-reader/app/src/main/res/drawable-mdpi/ic_action_copy.png differ diff --git a/remote-reader/app/src/main/res/drawable-xhdpi/ic_action_copy.png b/remote-reader/app/src/main/res/drawable-xhdpi/ic_action_copy.png new file mode 100644 index 0000000..a6e1aa2 Binary files /dev/null and b/remote-reader/app/src/main/res/drawable-xhdpi/ic_action_copy.png differ diff --git a/remote-reader/app/src/main/res/drawable-xxhdpi/ic_action_copy.png b/remote-reader/app/src/main/res/drawable-xxhdpi/ic_action_copy.png new file mode 100644 index 0000000..a381cdc Binary files /dev/null and b/remote-reader/app/src/main/res/drawable-xxhdpi/ic_action_copy.png differ diff --git a/remote-reader/app/src/main/res/layout-w480dp/activity_main.xml b/remote-reader/app/src/main/res/layout-w480dp/activity_main.xml index 812f750..0a3eb9e 100644 --- a/remote-reader/app/src/main/res/layout-w480dp/activity_main.xml +++ b/remote-reader/app/src/main/res/layout-w480dp/activity_main.xml @@ -58,17 +58,23 @@ android:layout_alignRight="@+id/buttonDisConnect" android:layout_alignEnd="@+id/buttonDisConnect" /> - + android:layout_below="@+id/editTextHostname" > + + + + \ No newline at end of file diff --git a/remote-reader/app/src/main/res/layout/activity_main.xml b/remote-reader/app/src/main/res/layout/activity_main.xml index f476465..8c762d6 100644 --- a/remote-reader/app/src/main/res/layout/activity_main.xml +++ b/remote-reader/app/src/main/res/layout/activity_main.xml @@ -13,6 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" + android:scrollHorizontally="true" android:text="@string/vpcd_config_info" android:id="@+id/textViewInfo" android:layout_alignParentTop="true" @@ -59,18 +60,21 @@ android:layout_alignParentEnd="true" android:layout_alignTop="@+id/buttonDisConnect" /> - + android:layout_below="@+id/buttonDisConnect" > + + \ No newline at end of file diff --git a/remote-reader/app/src/main/res/menu/main.xml b/remote-reader/app/src/main/res/menu/main.xml index 1d86db7..c6344bb 100644 --- a/remote-reader/app/src/main/res/menu/main.xml +++ b/remote-reader/app/src/main/res/menu/main.xml @@ -2,9 +2,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context="com.vsmartcard.remotesmartcardreader.app.MainActivity" > - - + + + diff --git a/remote-reader/app/src/main/res/values/strings.xml b/remote-reader/app/src/main/res/values/strings.xml index 81588a3..b67c9ff 100644 --- a/remote-reader/app/src/main/res/values/strings.xml +++ b/remote-reader/app/src/main/res/values/strings.xml @@ -26,6 +26,8 @@ Using default port Settings + Copy Log + Verbose logging Data transmission failed. Is the card still present?