Skip to content

Commit 19e1ab0

Browse files
codingusercodinguser
committed
Merge branch 'develop'
2 parents 9cfaed2 + cba748f commit 19e1ab0

97 files changed

Lines changed: 20001 additions & 1294 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
Change Log
22
===============================================================================
3+
Version 1.3.0 *(2014-02-10)*
4+
----------------------------
5+
* Fixed: Some file managers do not display all files available for import
6+
* Fixed: Crash when deleting account from accounts list
7+
* Fixed: CASH accounts should have normal DEBIT balance
8+
* Fixed: Crash when quickly opening and navigating from transactions list
9+
* Feature: Mark favorite accounts and quickly access them
10+
* Feature: Display different tabs for recent, favorite and all accounts
11+
* Feature: Add, view and delete recurring transactions (daily, weekly, monthly)
12+
* Feature: Mark accounts as placeholder accounts (cannot contain transactions)
13+
* Feature: Set a default transfer account for each account
14+
* Feature: Color code accounts & themed account views
15+
* Feature: Create default GnuCash account structure from within app
16+
* Improved: Enabled one-button click for rating app and sending feedback
17+
* Improved: Clicking on version information now shows changelog
18+
* Improved: Delete account and all its sub-accounts
19+
* Improved: Sub-accounts default to same account type as parent account
20+
* Improved: Use tab views for sub-accounts and transactions inside accounts
21+
322
Version 1.2.7 *(2013-12-18)*
423
----------------------------
524
* Fixed: Export format always defaults to QIF, ignoring user preference

‎CONTRIBUTORS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ Nicolas Barranger <wicowyn@gmail.com>
1616
Sigurd Gartmann <sigurdga-github@sigurdga.no>
1717
Pedro Abel <pedroabel@gmail.com>
1818
windwarrior <lennartbuit@gmail.com>
19-
lxbzmy <lxbzmy@gmail.com>
19+
Lei Xiao Bao <lxbzmy@gmail.com>

‎app/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1919
package="org.gnucash.android"
20-
android:versionCode="22"
21-
android:versionName="1.2.7" >
20+
android:versionCode="25"
21+
android:versionName="1.3.0" >
2222

2323
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
2424

@@ -55,7 +55,7 @@
5555
<category android:name="android.intent.category.LAUNCHER" />
5656
</intent-filter>
5757
</activity>
58-
<activity android:name=".ui.settings.SettingsActivity"></activity>
58+
<activity android:name=".ui.settings.SettingsActivity"/>
5959
<activity android:name=".ui.transactions.TransactionsActivity"
6060
android:configChanges="orientation|screenSize">
6161
</activity>

‎app/pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
<description>Gnucash Android companion application</description>
2323

2424
<parent>
25-
<version>1.2.7-SNAPSHOT</version>
25+
<version>1.3.0-SNAPSHOT</version>
2626
<groupId>org.gnucash.android</groupId>
2727
<artifactId>gnucash-android-parent</artifactId>
2828
</parent>
2929

3030
<properties>
3131
<abs.version>4.4.0</abs.version>
32+
<viewpagerindicator.version>2.4.1</viewpagerindicator.version>
3233
</properties>
3334

3435
<dependencies>
@@ -44,6 +45,12 @@
4445
<version>${abs.version}</version>
4546
<type>apklib</type>
4647
</dependency>
48+
<dependency>
49+
<groupId>com.viewpagerindicator</groupId>
50+
<artifactId>library</artifactId>
51+
<version>${viewpagerindicator.version}</version>
52+
<type>apklib</type>
53+
</dependency>
4754
</dependencies>
4855
<build>
4956
<sourceDirectory>src</sourceDirectory>

‎app/res/drawable-hdpi/ic_colorpicker_swatch_selected.png‎

2.36 KB
Loading

‎app/res/drawable-mdpi/ic_colorpicker_swatch_selected.png‎

1.62 KB
Loading

‎app/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png‎

3.17 KB
Loading

‎app/res/drawable/color_picker_swatch.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (C) 2013 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" />

‎app/res/drawable/color_square.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (C) 2013 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" />

‎app/res/layout/activity_accounts.xml‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,25 @@
1515
limitations under the License.
1616
-->
1717

18-
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
19-
android:id="@+id/fragment_container"
20-
android:layout_width="match_parent"
21-
android:layout_height="match_parent" >
22-
23-
</FrameLayout>
18+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
19+
xmlns:app="http://schemas.android.com/apk/res-auto"
20+
android:id="@+id/fragment_container"
21+
android:orientation="vertical"
22+
android:layout_width="match_parent"
23+
android:layout_height="match_parent" >
24+
25+
<com.viewpagerindicator.TitlePageIndicator
26+
android:id="@+id/titles"
27+
android:layout_height="wrap_content"
28+
android:layout_width="fill_parent"
29+
android:textColor="@color/title_green"
30+
app:footerColor="@color/title_green"
31+
app:selectedColor="@color/title_green"
32+
app:selectedBold="true"/>
33+
34+
<android.support.v4.view.ViewPager
35+
android:id="@+id/pager"
36+
android:layout_width="match_parent"
37+
android:layout_height="match_parent" />
38+
39+
</LinearLayout>

0 commit comments

Comments
 (0)