Version 1.2.4 (as published in Google Play)

• shows new fields: expiration date, activation date, card number • bugfix: fixed IOException on app restart • bugfix: fixed crash on "Settings" page • new menu entry: "Donation"
johnzweng · Jan 19, 2014 · 845e11d · 845e11d
1 parent 714cdf8
commit 845e11d
Show file tree

Hide file tree

Showing 33 changed files with 817 additions and 297 deletions.
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,7 @@
 eclipse.preferences.version=1
 encoding//res/raw-de/changelog.txt=UTF-8
 encoding//res/raw/changelog.txt=UTF-8
+encoding//src/at/zweng/bankomatinfos/iso7816emv/EmvUtils.java=UTF-8
+encoding//src/at/zweng/bankomatinfos/util/Utils.java=UTF-8
 encoding/README.md=UTF-8
+encoding/src=UTF-8
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="at.zweng.bankomatinfos"
-    android:versionCode="6"
-    android:versionName="1.2.3" >
+    android:versionCode="7"
+    android:versionName="1.2.4" >
 
     <uses-sdk
         android:minSdkVersion="15"
@@ -55,8 +55,9 @@
         <activity
             android:name="at.zweng.bankomatinfos.ui.SettingsActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/title_activity_settings" >
+            android:label="@string/title_activity_settings"
+            android:parentActivityName="at.zweng.bankomatinfos.ui.MainActivity" >
         </activity>
-        </application>
+    </application>
 
 </manifest>
diff --git a/doc/google_play_store/changelog_de.txt b/doc/google_play_store/changelog_de.txt
@@ -1,12 +1,11 @@
+Version 1.2.4 (19.01.2014):
+� zeigt nun auch: Ablaufdatum, Austellungsdatum und Kartennummer
+� bugfix: IOException bei App-Neustart behoben
+� bugfix: Absturz auf "Einstellungen" Seite behoben
+� neuer Men�eintrag: "Spenden"
+
+
 Version 1.2.3 (12.01.2014):
 � bessere Aufschl�sselung der Transaktionen
 � bugfix: Lesefehler bei bestimmten Transaktionstypen behoben
 � bugfix: falsche Uhrzeit bei manchen Transaktionen behoben
-
-
-Version 1.2.2 (10.01.2014):
-� Neues App Logo
-� neuer Men�punkt 'Einstellungen'
-� neue Einstellung 'Scanne alle Dateien'
-� Auslesen der noch verf�gbaren PIN-Eingabeversuche
-� bessere Fehlerbehandlung beim Lesen der QUICK Daten
diff --git a/doc/google_play_store/changelog_en.txt b/doc/google_play_store/changelog_en.txt
@@ -1,12 +1,11 @@
+Version 1.2.4 (2014-01-19):
+� shows new fields: expiration date, activation date, card number
+� bugfix: fixed IOException on app restart
+� bugfix: fixed crash on "Settings" page
+� new menu entry: "Donation"
+
+
 Version 1.2.3 (2014-01-12):
 � better decoding of transactions!
 � bugfix: corrected parsing error with some specific transactions
 � bugfix: wrong time displayed in some transaction
-
-
-Version 1.2.2 (2014-01-10):
-� New app icon
-� added 'Settings' menu
-� new setting 'Scan all files'
-� added reading the current PIN-retry-counter
-� better handling parsing error with QUICK data
diff --git a/doc/sreenshots/result_tab_infos_256px.png b/doc/sreenshots/result_tab_infos_256px.png
diff --git a/res/color/background_list_views_not_clickable.xml b/res/color/background_list_views_not_clickable.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/list_item_bg_normal"/>
+
+</selector>
diff --git a/res/layout/fragment_donation_dialog.xml b/res/layout/fragment_donation_dialog.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:id="@+id/creditDialog_layout_root"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="horizontal"
+            android:padding="10dp" >
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="bottom"
+                android:orientation="vertical" >
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10sp"
+                    android:contentDescription="@string/about_dialog_image_description"
+                    android:gravity="bottom"
+                    android:src="@drawable/ic_launcher" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/donate_dialog_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:autoLink="web|email"
+                android:text=""
+                android:textColor="#FFFFFF" />
+        </LinearLayout>
+        <Button
+            android:id="@+id/btnDonateDialogBitcoin"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:text="@string/donate_dialog_btn_bitcoin" >
+        </Button>
+         <Button
+            android:id="@+id/btnDonateDialogPaypal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:text="@string/donate_dialog_btn_paypal" >
+        </Button>
+
+        <Button
+            android:id="@+id/btnDonateDialogEuros"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="50dp"
+            android:text="@string/donate_dialog_btn_euro" >
+        </Button>
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/fragment_result_infos.xml b/res/layout/fragment_result_infos.xml
diff --git a/res/layout/fragment_result_tx_list.xml b/res/layout/fragment_result_tx_list.xml
@@ -2,8 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.FragmentListIncomingInvoices" >
+    android:layout_height="match_parent" >
 
 
     <TextView

diff --git a/res/layout/list_item_general_info.xml b/res/layout/list_item_general_info.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/background_list_views_not_clickable" >
+
+
+<!--  
+     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:text=""
+        android:visibility="invisible" />
+    
+    -->
+    <TextView
+        android:id="@+id/infoListItemName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="2dp"
+        android:text=""
+        android:textAppearance="@style/InfoListLabel" />
+
+    <TextView
+        android:id="@+id/infoListItemValue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/infoListItemName"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:paddingBottom="8dp"
+        android:text=""
+        android:textAppearance="@style/InfoListValue" />
+
+</RelativeLayout>
diff --git a/res/layout/list_item_transaction_collapsed.xml b/res/layout/list_item_transaction_collapsed.xml
@@ -23,7 +23,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:maxLines="1"
-        android:text="23.12.2013  07:12:23"
+        android:text=""
         android:textAppearance="@style/TransactionListTimestamp" />
 
     <TextView
@@ -36,7 +36,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:maxLines="1"
-        android:text="-xxxxx,xx €"
+        android:text=""
         android:textAppearance="@style/TransactionListAmount" />
 
     <ImageView

diff --git a/res/layout/list_item_transaction_expanded.xml b/res/layout/list_item_transaction_expanded.xml
@@ -188,13 +188,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/layoutFrameDetails"
-        android:layout_marginBottom="15dp"
+        android:layout_marginBottom="0dp"
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
         android:layout_marginTop="10dp"
         android:background="#666666"
         android:padding="10dp"
         android:text="00 22 33 44 55 66 77 88 99 AA BB CC DD EE FF EE 00 00 22 33 44 55 66 77 88 99 AA BB CC DD EE FF EE 00 00 22 33 44 55 66 77 88 99 AA BB CC DD EE FF EE 00 00 22 33 44 55 66 77 88 99 AA BB CC DD EE FF EE 00 00 22 33 44 55 66 77 88 99 AA BB CC DD EE FF EE 00"
         android:textAppearance="@style/TransactionListHexData" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="15dp"
+        android:layout_below="@+id/txListRawData"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:text=""
+        android:visibility="invisible" />
+
+
 
 </RelativeLayout>