Merge branch 'hotfix/patches'

CHANGELOG.md

@@ -1,5 +1,12 @@
 Change Log
 ===============================================================================
+Version 1.5.3 *(2015-02-02)*
+----------------------------
+* Fixed: Unable to edit double-entry transactions
+* Fixed: Edited transactions not flagged unexported
+* Fixed: Random crashes when editing transaction splits
+* Improved: Long press on transactions triggers context menu
+
 Version 1.5.2 *(2015-01-26)*
 ----------------------------
 * Fixed: Crash when importing XML with TRADING accounts

app/AndroidManifest.xml

@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="45"
+    android:versionCode="46"
     android:versionName="@string/app_version_name" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>

app/pom.xml

@@ -22,7 +22,7 @@
     <description>Gnucash Android companion application</description>
 
     <parent>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
         <groupId>org.gnucash.android</groupId>
         <artifactId>gnucash-android-parent</artifactId>
     </parent>

app/res/drawable/numeric_button.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ Copyright (c) 2014 Oleksandr Tyshkovets <[email protected]>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="@color/default_line_indicator_selected_color" />
+            <corners
+                android:radius="200dp" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/abs__bright_foreground_disabled_holo_light" />
+        </shape>
+    </item>
+    <item android:state_enabled="false" >
+        <shape>
+            <solid
+                android:color="@color/abs__primary_text_disable_only_holo_dark" />
+            <corners
+                android:radius="200dp" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/abs__bright_foreground_disabled_holo_light" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@android:color/transparent" />
+            <corners
+                android:radius="200dp" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/abs__bright_foreground_disabled_holo_light" />
+        </shape>
+    </item>
+</selector>

app/res/layout/dialog_split_editor.xml

@@ -55,7 +55,7 @@ limitations under the License.
                     android:layout_height="match_parent"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:gravity="center_vertical"
-                    android:text="Imbalance:"/>
+                    android:text="@string/label_imbalance"/>
 
             <TextView android:id="@+id/imbalance_textview"
                       android:layout_width="0dp"
@@ -69,7 +69,7 @@ limitations under the License.
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/content_new_holo_light"
-                android:text="Add split"/>
+                android:text="@string/btn_add_split"/>
 
     </TableLayout>
 </RelativeLayout>