Skip to content

Commit a818025

Browse files
committed
Upgraded actionbarsherlock library to 4.4.0 - closes #79
Updated app versions for next iteration
1 parent 2f54bc3 commit a818025

8 files changed

Lines changed: 15 additions & 8 deletions

File tree

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.beta" >
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/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-v14/styles.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
<style name="ImageButton.Transparent" parent="@android:style/Widget.ImageButton">
44
<item name="android:background">?android:attr/selectableItemBackground</item>
55
</style>
6+
7+
<style name="Dialog.WidgetConfiguration" parent="android:Theme.Holo.Light.Dialog">
8+
</style>
69
</resources>

app/res/values/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@
1818
<color name="debit_red">#c11b17</color>
1919
<color name="credit_green">#4cc552</color>
2020
<color name="light_gray">#FFAAAAAA</color>
21+
<color name="abs__holo_blue_light">#ff33b5e5</color>
2122
</resources>

app/res/values/styles.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,6 @@
8585
<item name="android:background">@drawable/selected_background</item>
8686
</style>
8787

88+
<style name="Dialog.WidgetConfiguration" parent="android:Theme.Dialog">
89+
</style>
8890
</resources>

integration-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1818
<modelVersion>4.0.0</modelVersion>
1919
<parent>
20-
<version>1.2.3</version>
20+
<version>1.2.4-SNAPSHOT</version>
2121
<groupId>org.gnucash.android</groupId>
2222
<artifactId>gnucash-android-parent</artifactId>
2323
</parent>
@@ -65,7 +65,7 @@
6565
<!-- optional: compile time dependency, in this case so that we can read from the R.java for example. -->
6666
<groupId>org.gnucash.android</groupId>
6767
<artifactId>gnucash-android</artifactId>
68-
<version>1.1.3-SNAPSHOT</version>
68+
<version>1.2.4-SNAPSHOT</version>
6969
<scope>provided</scope>
7070
<type>jar</type>
7171
</dependency>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
20-
<version>1.2.3</version>
20+
<version>1.2.4-SNAPSHOT</version>
2121
<groupId>org.gnucash.android</groupId>
2222
<artifactId>gnucash-android-parent</artifactId>
2323
<name>GnuCash Android parent</name>

0 commit comments

Comments
 (0)