From 8869dc0edb52738929bcfc9f20878bfff14662ad Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Sun, 1 Jun 2014 21:23:20 +0200 Subject: [PATCH] PluginQR: added menu option to display license information --- .../bin/keepass2androidpluginsdk.jar | Bin 19574 -> 19574 bytes .../gen/keepass2android/plugin/qr/R.java | 3 +++ src/java/PluginQR/res/menu/main.xml | 6 +++++- src/java/PluginQR/res/values-ar/strings.xml | 2 -- src/java/PluginQR/res/values-bg/strings.xml | 2 -- src/java/PluginQR/res/values-ca/strings.xml | 2 -- src/java/PluginQR/res/values/arrays.xml | 6 +++--- src/java/PluginQR/res/values/stringsqr.xml | 2 ++ .../plugin/qr/MainActivity.java | 20 ++++++++++++++++++ 9 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar b/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar index bc49092e9fc06d52863cab2bc87d55a5a9735cb9..eaa0f5a6b31270bedfc77178a9af46f0dbb3673c 100644 GIT binary patch delta 286 zcmex1gYnx8M&1B#W)=|!4h{|msZ|Fj^13sNuR6FfT$dk2Pv#ZU*}R!QoC(C)%qtYb z3TEVpzko2pWktbKlaxIt_j^cfz9g^B3{tU4xfP07(!77Nz zOyjrgV9RpEjVFKbmfn2b+76;b!toCaGtgC&#oe62Dq`It!1NBcFfc9X4xzK$Gr;_- s?g?Pp!lM?V4oX{imV^15Je$C@xmN{*?^Ow=^}OrA^m=cIIZ{3`03_*b>i_@% delta 286 zcmex1gYnx8M&1B#W)=|!4h{~63C;T^^13rmFx|c}T$dk2Pv#ZU*}R!QoC(C)%qtYb z3TEVpzko2pWkrEf&HE-Pdrt26klK7nUYi-j-=y3M7T?^VdLF`v(wGQgywmy()Z4so z^BaRz5RsY2Z`na2lXJw4Cx7sk-hAEKj+I%qch6=C$3HA!8F4pfuybPFBEa+xw=gg* z=nkQ?+%v%ZtL_P4^%fqrV0s6Xw(u+m^EY`mfoXHE3JBk;5=`rP*MaHv-Wec^CrkOn F004?AasL1S diff --git a/src/java/PluginQR/gen/keepass2android/plugin/qr/R.java b/src/java/PluginQR/gen/keepass2android/plugin/qr/R.java index d108f95a..30ed6b1b 100644 --- a/src/java/PluginQR/gen/keepass2android/plugin/qr/R.java +++ b/src/java/PluginQR/gen/keepass2android/plugin/qr/R.java @@ -82,6 +82,7 @@ public final class R { public static final int history_title=0x7f0b0025; public static final int image_view=0x7f0b0019; public static final int launch_product_query=0x7f0b0003; + public static final int menu_about=0x7f0b0036; public static final int menu_encode=0x7f0b0033; public static final int menu_history_clear_text=0x7f0b0035; public static final int menu_history_send=0x7f0b0034; @@ -142,6 +143,8 @@ public final class R { public static final int beep=0x7f050000; } public static final class string { + public static final int about=0x7f070086; + public static final int about_msg=0x7f070087; public static final int action_show_qr=0x7f070077; public static final int all_fields=0x7f070079; public static final int app_name=0x7f070000; diff --git a/src/java/PluginQR/res/menu/main.xml b/src/java/PluginQR/res/menu/main.xml index e61c2d88..84b255ad 100644 --- a/src/java/PluginQR/res/menu/main.xml +++ b/src/java/PluginQR/res/menu/main.xml @@ -1,5 +1,9 @@ - + diff --git a/src/java/PluginQR/res/values-ar/strings.xml b/src/java/PluginQR/res/values-ar/strings.xml index 2aef9ebf..81518e8c 100644 --- a/src/java/PluginQR/res/values-ar/strings.xml +++ b/src/java/PluginQR/res/values-ar/strings.xml @@ -115,8 +115,6 @@ ابحث عن بلد محاولة لاسترداد مزيد من المعلومات حول محتويات الباركود استرداد مزيد من المعلومات - محاولة الباركود + - معززة مع الميزات الجديدة واجهة اهتزاز تم العثور على معلومات جهة الاتصال تم العثور على حدث التقويم diff --git a/src/java/PluginQR/res/values-bg/strings.xml b/src/java/PluginQR/res/values-bg/strings.xml index 37e0174b..c2806f8e 100644 --- a/src/java/PluginQR/res/values-bg/strings.xml +++ b/src/java/PluginQR/res/values-bg/strings.xml @@ -115,8 +115,6 @@ Държава при търсене Опитай да получиш повече информация за баркода Търсене на разширения - Опитайте Баркод Скенер+ - Обогатен с нови характеристики и интерфейс Вибрация Намерих информация за контакт Намерих календарно събитие diff --git a/src/java/PluginQR/res/values-ca/strings.xml b/src/java/PluginQR/res/values-ca/strings.xml index 463610d4..faa6588e 100644 --- a/src/java/PluginQR/res/values-ca/strings.xml +++ b/src/java/PluginQR/res/values-ca/strings.xml @@ -114,8 +114,6 @@ Cerca per país Intenta obtenir més informació sobre els continguts del codi de barres Aconsegueix més informació - Intenta Barcode Scanner+ - Millorat amb noves característiques i la interfície de Vibració S\'ha trobat informació de contacte S\'ha trobat un esdeveniment diff --git a/src/java/PluginQR/res/values/arrays.xml b/src/java/PluginQR/res/values/arrays.xml index 9c803da7..ed625261 100644 --- a/src/java/PluginQR/res/values/arrays.xml +++ b/src/java/PluginQR/res/values/arrays.xml @@ -1,6 +1,6 @@ - + - AR AU @@ -34,12 +34,12 @@ TW US - + ON AUTO OFF - + @string/preferences_front_light_on @string/preferences_front_light_auto @string/preferences_front_light_off diff --git a/src/java/PluginQR/res/values/stringsqr.xml b/src/java/PluginQR/res/values/stringsqr.xml index c7d45231..4cb3b0ba 100644 --- a/src/java/PluginQR/res/values/stringsqr.xml +++ b/src/java/PluginQR/res/values/stringsqr.xml @@ -18,4 +18,6 @@ Text found on QR code. How do you want to handle this text? Create new entry Search and open existing entry + About + This app is built based on the ZXing library and barcode scanner app (Copyright by the ZXing team, licensed under the Apache 2.0 license). \ No newline at end of file diff --git a/src/java/PluginQR/src/keepass2android/plugin/qr/MainActivity.java b/src/java/PluginQR/src/keepass2android/plugin/qr/MainActivity.java index cd5fd859..9a9e5d14 100644 --- a/src/java/PluginQR/src/keepass2android/plugin/qr/MainActivity.java +++ b/src/java/PluginQR/src/keepass2android/plugin/qr/MainActivity.java @@ -56,6 +56,26 @@ public class MainActivity extends Activity { getMenuInflater().inflate(R.menu.main, menu); return true; } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + + new Builder(this) + .setMessage(R.string.about_msg) + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, int which) { + // TODO Auto-generated method stub + + } + + + }) + .create().show(); + + return true; + } @Override