Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,24 @@
 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

CONTRIBUTORS

@@ -16,4 +16,4 @@ Nicolas Barranger <[email protected]>
 Sigurd Gartmann <[email protected]>
 Pedro Abel <[email protected]>
 windwarrior <[email protected]>
-lxbzmy <[email protected]>
+Lei Xiao Bao <[email protected]>

app/AndroidManifest.xml

@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="22"
-    android:versionName="1.2.7" >
+    android:versionCode="25"
+    android:versionName="1.3.0" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
 
@@ -55,7 +55,7 @@
                 <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>

app/pom.xml

@@ -22,13 +22,14 @@
     <description>Gnucash Android companion application</description>
 
     <parent>
-        <version>1.2.7-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <groupId>org.gnucash.android</groupId>
         <artifactId>gnucash-android-parent</artifactId>
     </parent>
 
     <properties>
         <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/color_picker_swatch.xml

@@ -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/color_square.xml

@@ -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/layout/activity_accounts.xml

@@ -15,9 +15,25 @@
  limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-</FrameLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:id="@+id/fragment_container"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent" >
+
+    <com.viewpagerindicator.TitlePageIndicator
+            android:id="@+id/titles"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:textColor="@color/title_green"
+            app:footerColor="@color/title_green"
+            app:selectedColor="@color/title_green"
+            app:selectedBold="true"/>
+
+    <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+</LinearLayout>

app/res/layout/activity_transactions.xml

@@ -16,28 +16,12 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
               android:id="@+id/fragment_container"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <TextView
-            android:id="@+id/section_header_sub_accounts"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/section_header_height"
-            android:paddingLeft="10dp"
-            android:background="@android:color/darker_gray"
-            android:textColor="@android:color/white"
-            android:visibility="gone"
-            android:text="@string/section_header_accounts"
-            />
-
-    <FrameLayout android:id="@+id/sub_accounts_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1"
-                 android:visibility="gone"/>
-
     <TextView
             android:id="@+id/section_header_transactions"
             android:layout_width="match_parent"
@@ -48,10 +32,18 @@
             android:text="@string/section_header_transactions"
             />
 
-    <FrameLayout android:id="@+id/transactions_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="3"
-                 />
+    <com.viewpagerindicator.TitlePageIndicator
+            android:id="@+id/titles"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:textColor="@color/title_green"
+            app:footerColor="@color/title_green"
+            app:selectedColor="@color/title_green"
+            app:selectedBold="true"/>
+
+    <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
 </LinearLayout>

app/res/layout/color_picker_dialog.xml

@@ -0,0 +1,45 @@
+<?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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center" >
+
+    <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:padding="28dp" >
+
+        <ProgressBar
+                android:id="@android:id/progress"
+                style="?android:attr/progressBarStyleLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center" />
+
+        <org.gnucash.android.ui.colorpicker.ColorPickerPalette
+                android:id="@+id/color_picker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:visibility="gone" />
+    </FrameLayout>
+</ScrollView>

app/res/layout/color_picker_swatch.xml

@@ -0,0 +1,28 @@
+<?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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <ImageView
+            android:id="@+id/color_picker_swatch"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    <ImageView
+            android:id="@+id/color_picker_checkmark"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/ic_colorpicker_swatch_selected"
+            android:scaleType="fitXY"
+            android:visibility="gone" />
+</merge>

app/res/layout/dialog_account_delete.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@+id/checkbox_delete_sub_accounts"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:text="@string/label_delete_sub_accounts" />