Merge pull request #2 from codinguser/develop

update develop branch

Author: lxbzmy

CHANGELOG.md

@@ -1,5 +1,60 @@
 Change Log
 ===============================================================================
+Version 1.3.0 *(2014-02-10)*
+----------------------------
+* Fixed: Some file managers do not display all files available for import
+* Fixed: Crash when deleting account from accounts list
+* Fixed: CASH accounts should have normal DEBIT balance
+* Fixed: Crash when quickly opening and navigating from transactions list
+* Feature: Mark favorite accounts and quickly access them
+* Feature: Display different tabs for recent, favorite and all accounts
+* Feature: Add, view and delete recurring transactions (daily, weekly, monthly)
+* Feature: Mark accounts as placeholder accounts (cannot contain transactions)
+* Feature: Set a default transfer account for each account
+* Feature: Color code accounts & themed account views
+* Feature: Create default GnuCash account structure from within app
+* Improved: Enabled one-button click for rating app and sending feedback
+* Improved: Clicking on version information now shows changelog
+* Improved: Delete account and all its sub-accounts
+* Improved: Sub-accounts default to same account type as parent account
+* Improved: Use tab views for sub-accounts and transactions inside accounts
+
+Version 1.2.7 *(2013-12-18)*
+----------------------------
+* Fixed: Export format always defaults to QIF, ignoring user preference
+* Improved: Better responsiveness of add transaction and add account buttons
+* Improved: Russian translation
+
+Version 1.2.6 *(2013-12-06)*
+----------------------------
+* Feature: Support for QIF export format
+* Improved: CREDIT/DEBIT meaning now matches GnuCash desktop. Effect on account balance depends on type of account
+
+Version 1.2.5 *(2013-09-17)*
+----------------------------
+* Feature: Search accounts by name
+* Fixed: crash when deleting accounts
+* Fixed: auto-completing transaction names does not copy the time or export flag
+* Fixed: random crash when opening app (or loading accounts)
+
+Version 1.2.4 *(2013-09-05)*
+----------------------------
+* Added support for detecting placeholder accounts during import
+* Use full qualified account names in account selection spinners
+* Loads complete transaction as a template when the autocomplete suggestion is selected
+* Fixed: selecting items from lists caused multiple to be selected in the wrong positions
+* Fixed: widgets not updated when all accounts or all transactions are deleted
+* Other minor bug fixes.
+
+Version 1.2.3 *(2013-08-28)*
+----------------------------
+* Fixed: crashes when editing/creating transactions
+* Feature: Added Chinese language translation
+* Feature: Autocomplete transaction descriptions
+* Improved reliability of importing stock accounts
+* Improved speed of loading account balance
+* Improved increased touch target area of "new transaction" button in accounts list view
+
 Version 1.2.2 *(2013-06-23)*
 ----------------------------
 * Fixed: bug with importing accounts

CONTRIBUTORS

@@ -15,4 +15,5 @@ Geert Janssens <janssens-geert@telenet.be>
 Nicolas Barranger <wicowyn@gmail.com>
 Sigurd Gartmann <sigurdga-github@sigurdga.no>
 Pedro Abel <pedroabel@gmail.com>
-windwarrior <lennartbuit@gmail.com>
+windwarrior <lennartbuit@gmail.com>
+Lei Xiao Bao <lxbzmy@gmail.com>

app/AndroidManifest.xml

@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="10"
-    android:versionName="1.2.2" >
+    android:versionCode="24"
+    android:versionName="1.3.0.beta2" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
 
@@ -55,13 +55,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.settings.SettingsActivity"></activity>
+        <activity android:name=".ui.settings.SettingsActivity"/>
         <activity android:name=".ui.transactions.TransactionsActivity" 
             android:configChanges="orientation|screenSize">
         </activity>
         <activity android:name=".ui.widget.WidgetConfigurationActivity"
             android:label="@string/label_widget_configuration"
-            android:theme="@style/Theme.Sherlock.Light.Dialog"
+            android:theme="@style/Dialog.WidgetConfiguration"
             android:excludeFromRecents="true">
 		    <intent-filter>
 		        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>

app/pom.xml

@@ -22,13 +22,14 @@
     <description>Gnucash Android companion application</description>
 
     <parent>
-        <version>1.2.2</version>
+        <version>1.3.0-SNAPSHOT</version>
         <groupId>org.gnucash.android</groupId>
         <artifactId>gnucash-android-parent</artifactId>
     </parent>
 
     <properties>
-        <abs.version>4.2.0</abs.version>
+        <abs.version>4.4.0</abs.version>
+        <viewpagerindicator.version>2.4.1</viewpagerindicator.version>
     </properties>
 
     <dependencies>
@@ -44,6 +45,12 @@
             <version>${abs.version}</version>
             <type>apklib</type>
         </dependency>
+        <dependency>
+            <groupId>com.viewpagerindicator</groupId>
+            <artifactId>library</artifactId>
+            <version>${viewpagerindicator.version}</version>
+            <type>apklib</type>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src</sourceDirectory>

app/res/drawable-hdpi/ic_colorpicker_swatch_selected.png

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"  />

app/res/drawable-mdpi/ic_colorpicker_swatch_selected.png

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" />

app/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/abs__item_background_holo_light"
+          android:state_pressed="true" />
+    <item android:drawable="@drawable/abs__item_background_holo_light"
+          android:state_focused="true" />
+</selector>