Skip to content

Commit

Permalink
Merge branch 'release/v1.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
codinguser committed Oct 1, 2014
2 parents 75376d4 + 47c2784 commit bee9dc9
Show file tree
Hide file tree
Showing 79 changed files with 3,456 additions and 1,274 deletions.
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
Change Log
===============================================================================
Version 1.5.0 *(2014-10-01)*
----------------------------
* Need for speed! Lots of performance optimizations in the application
- Application balances are now computed faster
- App loads faster and is more responsive
- Faster recording of opening balances before delete operations
- Import and export operations rewritten to perform faster and use less resources
* Fixed: Crash after saving opening balances and trying to create new transactions
* Fixed: Parent account title color sometimes not propagated to child accounts
* Fixed: Recurring transactions scheduled but not saved to database during import
* Fixed: Crash caused by null exception message during import
* Fixed: Poor word-wrap of transaction type labels
* Fixed: Amount values not always displaying the correct sign
* Feature: Select default currency upon first run of application
* Feature: Creating account hierarchy uses the user currency preference
* Feature: Support for reading and writing compressed GnuCash XML files.
* Feature: Set a passcode lock to restrict access to the application
* Feature: Export a QIF file for transactions of each currency in use
* Improved: Increased stability of import/export operations
* Improved: Exclude multi-currency transactions from QIF exports
* Improved: Display warnings/limitations of different export formats in the export dialog
* Improved: Preserve split memos in QIF export (as much as possible)
* Improved: Child accounts now assigned to account parent upon deletion of account
* Improved: Descendant accounts cannot be selected as a parent account (no cyclic dependencies)

Version 1.4.3 *(2014-09-09)*
----------------------------
* Fixed: Cannot edit transactions when in single-entry mode
Expand Down
6 changes: 4 additions & 2 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ several different people.
Appreciation goes to Muslim Chochlov and the to whole GnuCash community for guiding the
project through the early phases and providing valuable feedback.

The following people contributed translations to GnuCash for Android:
The following people contributed (code and translations) to GnuCash for Android:
Christian Stimming <[email protected]>
Cristian Marchi <[email protected]>
Menelaos Maglis <[email protected]>
Expand All @@ -16,4 +16,6 @@ Nicolas Barranger <[email protected]>
Sigurd Gartmann <[email protected]>
Pedro Abel <[email protected]>
windwarrior <[email protected]>
Lei Xiao Bao <[email protected]>
Oleksandr Tyshkovets <[email protected]>
Lei Xiao Bao <[email protected]>
Yongxin Wang <[email protected]>
8 changes: 7 additions & 1 deletion app/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.gnucash.android"
android:versionCode="40"
android:versionCode="42"
android:versionName="@string/app_version_name" >

<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
Expand Down Expand Up @@ -55,7 +55,13 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ui.passcode.PasscodeLockScreenActivity"
android:noHistory="true"
android:windowSoftInputMode="stateAlwaysHidden">
</activity>
<activity android:name=".ui.settings.SettingsActivity"/>
<activity android:name=".ui.passcode.PasscodePreferenceActivity" />
<activity android:name=".ui.transaction.TransactionsActivity"
android:configChanges="orientation|screenSize">
</activity>
Expand Down
2 changes: 1 addition & 1 deletion app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<description>Gnucash Android companion application</description>

<parent>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<groupId>org.gnucash.android</groupId>
<artifactId>gnucash-android-parent</artifactId>
</parent>
Expand Down
Binary file added app/res/drawable-mdpi/clear_btn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
android:layout_height="wrap_content"
android:text="OFX"/>
</RadioGroup>
<TextView android:id="@+id/export_warning"
android:layout_marginLeft="@dimen/dialog_padding"
android:text="Some format-based export warning"
android:textColor="@color/account_red"
style="@style/TextAppearance.Hint"
android:visibility="gone" />

<CheckBox android:id="@+id/checkbox_export_all"
android:layout_width="wrap_content"
Expand Down
231 changes: 231 additions & 0 deletions app/res/layout/fragment_numeric_keyboard.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
<?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.
-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true">

<LinearLayout
android:id="@+id/zero"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_alignParentBottom="true"
android:orientation="horizontal"
android:weightSum="3" >

<Button
android:id="@+id/empty_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text=""
android:textSize="25sp"
android:enabled="false" />

<Button
android:id="@+id/zero_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="0"
android:textSize="25sp"/>

<ImageButton
android:id="@+id/delete_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:src="@drawable/clear_btn" />

</LinearLayout>

<LinearLayout
android:id="@+id/seven_to_nine"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_above="@+id/zero"
android:orientation="horizontal"
android:weightSum="3" >

<Button
android:id="@+id/seven_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="7"
android:textSize="25sp" />

<Button
android:id="@+id/eight_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="8"
android:textSize="25sp" />

<Button
android:id="@+id/nine_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="9"
android:textSize="25sp" />
</LinearLayout>

<LinearLayout
android:id="@+id/four_to_six"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_above="@+id/seven_to_nine"
android:orientation="horizontal"
android:weightSum="3" >

<Button
android:id="@+id/four_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="4"
android:textSize="25sp" />

<Button
android:id="@+id/five_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="5"
android:textSize="25sp" />

<Button
android:id="@+id/six_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="6"
android:textSize="25sp" />
</LinearLayout>

<LinearLayout
android:id="@+id/one_to_three"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_above="@+id/four_to_six"
android:orientation="horizontal"
android:weightSum="3" >

<Button
android:id="@+id/one_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="1"
android:textSize="25sp" />

<Button
android:id="@+id/two_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="2"
android:textSize="25sp" />

<Button
android:id="@+id/three_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="3"
android:textSize="25sp" />
</LinearLayout>

<LinearLayout
android:id="@+id/pass_label"
android:layout_width="match_parent"
android:layout_height="100dp"
android:orientation="horizontal" >

<TextView
android:id="@+id/passcode_label"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="Enter passcode"
android:textSize="25sp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_below="@+id/pass_label"
android:orientation="horizontal"
android:gravity="center" >

<EditText
android:id="@+id/passcode1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:cursorVisible="false"
android:focusableInTouchMode="false"
android:hint="*"
android:inputType="textPassword|number"
android:password="true"
android:maxLength="1"
android:textSize="33sp" />

<EditText
android:id="@+id/passcode2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:cursorVisible="false"
android:focusableInTouchMode="false"
android:hint="*"
android:inputType="textPassword|number"
android:password="true"
android:maxLength="1"
android:textSize="33sp" />

<EditText
android:id="@+id/passcode3"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:cursorVisible="false"
android:focusableInTouchMode="false"
android:hint="*"
android:inputType="textPassword|number"
android:password="true"
android:maxLength="1"
android:textSize="33sp" />

<EditText
android:id="@+id/passcode4"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:cursorVisible="false"
android:focusableInTouchMode="false"
android:hint="*"
android:inputType="textPassword|number"
android:password="true"
android:maxLength="1"
android:textSize="33sp" />

</LinearLayout>

</RelativeLayout>
2 changes: 1 addition & 1 deletion app/res/layout/item_split_entry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ limitations under the License.

<org.gnucash.android.ui.util.TransactionTypeToggleButton android:id="@+id/btn_split_type"
android:layout_width="0dp"
android:layout_weight="2"
android:layout_weight="3"
android:layout_height="wrap_content"
android:textOn="@string/label_debit"
android:textOff="@string/label_credit"
Expand Down
30 changes: 30 additions & 0 deletions app/res/layout/passcode_lockscreen.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?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.
-->

<LinearLayout 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"
android:orientation="vertical" >

<fragment android:id="@+id/listFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_numeric_keyboard"
class="org.gnucash.android.ui.passcode.KeyboardFragment" />

</LinearLayout>
14 changes: 7 additions & 7 deletions app/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,11 @@
<string name="summary_xml_ofx_header">Diese Option aktivieren, wenn Sie die OFX-Dateien für ein anderes Programm als GnuCash auf dem Desktop exportieren</string>
<string name="title_whats_new">Neuigkeiten in dieser Version</string>
<string name="whats_new">
- Create multiple splits per transaction\n
- Fixed computation of account balances for different account types\n
- Use account-specific labels for CREDIT/DEBITs\n
- Automated backup of database before deletion operations\n
- Restore most recent backup of database (in Settings -> General)\n
- Read transactions from GnuCash XML files (limited support)\n
- Option to save opening balances before deleting transactions\n
- General resource and performance optimization\n
- Faster computation of account balances\n
- Set passcode to restrict access to app (in Settings)\n
- Export separate QIF files for each currency in use\n
- Use currencey settings when creating account hierarchy\n
- Multiple bug fixes and improvements\n
</string>
<string name="label_dismiss">Schließen</string>
Expand Down Expand Up @@ -416,4 +414,6 @@
<string name="summary_save_opening_balances">Möglichkeit aktivieren, den aktuellen Saldo als neuen Anfangsbestand nach dem Löschen der Buchungen zu übernehmen
</string>
<string name="title_save_opening_balances">Saldo als neuen Anfangsbestand übernehmen</string>
<string name="export_warning_ofx">OFX does not support double-entry transactions</string>
<string name="export_warning_qif">A separate QIF file will be generated for each currency in use</string>
</resources>
Loading

0 comments on commit bee9dc9

Please sign in to comment.