Skip to content

Commit 3725097

Browse files
committed
Merge branch 'develop'
2 parents eaeb5a3 + 42425d3 commit 3725097

51 files changed

Lines changed: 938 additions & 486 deletions

Some content is hidden

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

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="13"
21-
android:versionName="1.2.3" >
20+
android:versionCode="14"
21+
android:versionName="1.2.4" >
2222

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

@@ -61,7 +61,7 @@
6161
</activity>
6262
<activity android:name=".ui.widget.WidgetConfigurationActivity"
6363
android:label="@string/label_widget_configuration"
64-
android:theme="@style/Theme.Sherlock.Light.Dialog"
64+
android:theme="@style/Dialog.WidgetConfiguration"
6565
android:excludeFromRecents="true">
6666
<intent-filter>
6767
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>

app/pom.xml

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

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

3030
<properties>
31-
<abs.version>4.2.0</abs.version>
31+
<abs.version>4.4.0</abs.version>
3232
</properties>
3333

3434
<dependencies>

app/res/layout/activity_transactions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
android:background="@android:color/darker_gray"
3030
android:textColor="@android:color/white"
3131
android:visibility="gone"
32-
android:text="Sub-Accounts"
32+
android:text="@string/section_header_accounts"
3333
/>
3434

3535
<FrameLayout android:id="@+id/sub_accounts_container"
@@ -45,7 +45,7 @@
4545
android:paddingLeft="10dp"
4646
android:background="@android:color/darker_gray"
4747
android:textColor="@android:color/white"
48-
android:text="Transactions"
48+
android:text="@string/section_header_transactions"
4949
/>
5050

5151
<FrameLayout android:id="@+id/transactions_container"

app/res/layout/fragment_new_transaction.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
android:ems="10"
3535
android:layout_marginBottom="@dimen/dialog_padding"
3636
android:inputType="textCapSentences"
37+
android:imeOptions="actionNext"
38+
android:nextFocusDown="@+id/input_transaction_amount"
3739
style="@style/ListItemText" />
3840

3941
<LinearLayout
@@ -62,6 +64,7 @@
6264
android:layout_marginBottom="@dimen/dialog_padding"
6365
android:hint="@string/label_transaction_amount"
6466
android:inputType="number"
67+
android:nextFocusDown="@+id/input_description"
6568
android:textColor="@color/debit_red"
6669
style="@style/ListItemText" />
6770

app/res/layout/list_item_account.xml

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

18-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
18+
<org.gnucash.android.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
1919
android:layout_width="match_parent"
2020
android:layout_height="?android:attr/listPreferredItemHeight"
2121
android:gravity="center_vertical"
@@ -58,4 +58,4 @@
5858
android:focusable="false"
5959
android:contentDescription="@string/description_add_transaction_icon"/>
6060

61-
</LinearLayout>
61+
</org.gnucash.android.util.CheckableLinearLayout>

app/res/layout/list_item_transaction.xml

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

18-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
18+
<org.gnucash.android.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
1919
android:layout_width="match_parent"
2020
android:layout_height="match_parent"
2121
android:orientation="vertical">
@@ -63,4 +63,4 @@
6363
android:layout_marginRight="12dp"
6464
style="@style/ListItemText"/>
6565
</LinearLayout>
66-
</LinearLayout>
66+
</org.gnucash.android.util.CheckableLinearLayout>

app/res/layout/widget_configuration.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
1919
android:layout_width="match_parent"
2020
android:layout_height="match_parent"
21+
android:minWidth="250dp"
2122
android:orientation="vertical" >
2223

2324
<TextView

app/res/values-de/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@
337337
<string name="toast_all_transactions_deleted">All transactions successfully deleted!</string>
338338
<string name="title_progress_importing_accounts">Importing accounts</string>
339339
<string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
340+
<string name="section_header_transactions">Transactions</string>
341+
<string name="section_header_accounts">Sub-Accounts</string>
340342
<plurals name="label_sub_accounts">
341343
<item quantity="one">%d Unterkonto</item>
342344
<item quantity="other">%d Unterkonten</item>

app/res/values-el/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@
351351
με επιτυχία!</string>
352352
<string name="title_progress_importing_accounts">Importing accounts</string>
353353
<string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
354+
<string name="section_header_transactions">Transactions</string>
355+
<string name="section_header_accounts">Sub-Accounts</string>
354356
<plurals name="label_sub_accounts">
355357
<item quantity="one">%d υπο-λογαριασμός</item>
356358
<item quantity="other">%d υπο-λογαριασμοί</item>

app/res/values-es-rMX/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,8 @@
335335
<string name="toast_all_transactions_deleted">&#161;Todas las transacciones han sido borradas con exit&#243;samente!</string>
336336
<string name="title_progress_importing_accounts">Importing accounts</string>
337337
<string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
338+
<string name="section_header_transactions">Transactions</string>
339+
<string name="section_header_accounts">Sub-Accounts</string>
338340
<plurals name="label_sub_accounts">
339341
<item quantity="one">%d subcuenta</item>
340342
<item quantity="other">%d subcuentas</item>

0 commit comments

Comments
 (0)