Skip to content

Commit f22f24c

Browse files
codingusercodinguser
committed
Upgraded structure of repository to match latest Android conventions
Upgraded android-maven-plugin to 4.1.1 Upgraded minimum maven version required to 1.1.1 Enabled Spoon testrunner during integration-test phase of build
1 parent f6a157c commit f22f24c

315 files changed

Lines changed: 4631 additions & 4615 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.

‎README.md‎

Lines changed: 2 additions & 2 deletions

‎app/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@
5353
</dependency>
5454
</dependencies>
5555
<build>
56-
<sourceDirectory>src</sourceDirectory>
5756
<plugins>
5857
<plugin>
59-
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
58+
<groupId>com.simpligility.maven.plugins</groupId>
6059
<artifactId>android-maven-plugin</artifactId>
6160
</plugin>
6261
</plugins>

app/AndroidManifest.xml renamed to app/src/main/AndroidManifest.xml

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,105 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
Copyright (c) 2012 Ngewi Fet <ngewif@gmail.com>
4-
5-
Licensed under the Apache License, Version 2.0 (the "License");
6-
you may not use this file except in compliance with the License.
7-
You may obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
11-
Unless required by applicable law or agreed to in writing, software
12-
distributed under the License is distributed on an "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
See the License for the specific language governing permissions and
15-
limitations under the License.
16-
-->
17-
18-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19-
package="org.gnucash.android"
20-
android:versionCode="46"
21-
android:versionName="@string/app_version_name" >
22-
23-
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
24-
25-
<permission-group
26-
android:name="org.gnucash.android.permission.group.GNUCASH"
27-
android:label="@string/label_permission_group"
28-
android:description="@string/description_permission_group" />
29-
30-
<permission android:name="org.gnucash.android.permission.CREATE_ACCOUNT"
31-
android:label="@string/label_permission_create_account"
32-
android:permissionGroup="org.gnucash.android.permission.group.GNUCASH"
33-
android:protectionLevel="dangerous" />
34-
<permission android:name="org.gnucash.android.permission.RECORD_TRANSACTION"
35-
android:label="@string/label_permission_record_transaction"
36-
android:permissionGroup="org.gnucash.android.permission.group.GNUCASH"
37-
android:protectionLevel="dangerous" />
38-
39-
<uses-permission android:label="@string/label_permission_record_transactions"
40-
android:name="org.gnucash.android.permission.RECORD_TRANSACTION" />
41-
<uses-permission android:label="@string/label_permission_create_accounts"
42-
android:name="org.gnucash.android.permission.CREATE_ACCOUNT" />
43-
<uses-permission android:label="@string/permission_access_sdcard"
44-
android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
45-
46-
<application android:name="org.gnucash.android.app.GnuCashApplication"
47-
android:icon="@drawable/ic_launcher"
48-
android:label="@string/app_name"
49-
android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
50-
<activity
51-
android:name=".ui.account.AccountsActivity"
52-
android:label="@string/app_name">
53-
<intent-filter>
54-
<action android:name="android.intent.action.MAIN" />
55-
<category android:name="android.intent.category.LAUNCHER" />
56-
</intent-filter>
57-
</activity>
58-
<activity
59-
android:name=".ui.passcode.PasscodeLockScreenActivity"
60-
android:noHistory="true"
61-
android:windowSoftInputMode="stateAlwaysHidden">
62-
</activity>
63-
<activity android:name=".ui.settings.SettingsActivity"/>
64-
<activity android:name=".ui.passcode.PasscodePreferenceActivity" />
65-
<activity android:name=".ui.transaction.TransactionsActivity"
66-
android:configChanges="orientation|screenSize">
67-
</activity>
68-
<activity android:name=".ui.widget.WidgetConfigurationActivity"
69-
android:label="@string/label_widget_configuration"
70-
android:theme="@style/Dialog.WidgetConfiguration"
71-
android:excludeFromRecents="true">
72-
<intent-filter>
73-
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
74-
</intent-filter>
75-
</activity>
76-
<receiver android:name=".receivers.TransactionRecorder"
77-
android:label="Records transactions received through intents"
78-
android:permission="org.gnucash.android.permission.RECORD_TRANSACTION">
79-
<intent-filter>
80-
<action android:name="android.intent.action.INSERT" />
81-
<category android:name="android.intent.category.DEFAULT" />
82-
<data android:mimeType="vnd.android.cursor.item/vnd.org.gnucash.android.transaction"/>
83-
</intent-filter>
84-
</receiver>
85-
<receiver android:name=".receivers.AccountCreator"
86-
android:label="Creates new accounts"
87-
android:permission="org.gnucash.android.permission.CREATE_ACCOUNT"
88-
android:enabled="true" android:exported="true">
89-
<intent-filter>
90-
<action android:name="android.intent.action.INSERT" />
91-
<category android:name="android.intent.category.DEFAULT" />
92-
<data android:mimeType="vnd.android.cursor.item/vnd.org.gnucash.android.account"/>
93-
</intent-filter>
94-
</receiver>
95-
<receiver android:name=".receivers.TransactionAppWidgetProvider" >
96-
<intent-filter>
97-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
98-
</intent-filter>
99-
<meta-data android:name="android.appwidget.provider"
100-
android:resource="@xml/transaction_appwidget_info" />
101-
</receiver>
102-
103-
</application>
104-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (c) 2012 Ngewi Fet <ngewif@gmail.com>
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19+
package="org.gnucash.android"
20+
android:versionCode="46"
21+
android:versionName="@string/app_version_name" >
22+
23+
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
24+
25+
<permission-group
26+
android:name="org.gnucash.android.permission.group.GNUCASH"
27+
android:label="@string/label_permission_group"
28+
android:description="@string/description_permission_group" />
29+
30+
<permission android:name="org.gnucash.android.permission.CREATE_ACCOUNT"
31+
android:label="@string/label_permission_create_account"
32+
android:permissionGroup="org.gnucash.android.permission.group.GNUCASH"
33+
android:protectionLevel="dangerous" />
34+
<permission android:name="org.gnucash.android.permission.RECORD_TRANSACTION"
35+
android:label="@string/label_permission_record_transaction"
36+
android:permissionGroup="org.gnucash.android.permission.group.GNUCASH"
37+
android:protectionLevel="dangerous" />
38+
39+
<uses-permission android:label="@string/label_permission_record_transactions"
40+
android:name="org.gnucash.android.permission.RECORD_TRANSACTION" />
41+
<uses-permission android:label="@string/label_permission_create_accounts"
42+
android:name="org.gnucash.android.permission.CREATE_ACCOUNT" />
43+
<uses-permission android:label="@string/permission_access_sdcard"
44+
android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
45+
46+
<application android:name="org.gnucash.android.app.GnuCashApplication"
47+
android:icon="@drawable/ic_launcher"
48+
android:label="@string/app_name"
49+
android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
50+
<activity
51+
android:name=".ui.account.AccountsActivity"
52+
android:label="@string/app_name">
53+
<intent-filter>
54+
<action android:name="android.intent.action.MAIN" />
55+
<category android:name="android.intent.category.LAUNCHER" />
56+
</intent-filter>
57+
</activity>
58+
<activity
59+
android:name=".ui.passcode.PasscodeLockScreenActivity"
60+
android:noHistory="true"
61+
android:windowSoftInputMode="stateAlwaysHidden">
62+
</activity>
63+
<activity android:name=".ui.settings.SettingsActivity"/>
64+
<activity android:name=".ui.passcode.PasscodePreferenceActivity" />
65+
<activity android:name=".ui.transaction.TransactionsActivity"
66+
android:configChanges="orientation|screenSize">
67+
</activity>
68+
<activity android:name=".ui.widget.WidgetConfigurationActivity"
69+
android:label="@string/label_widget_configuration"
70+
android:theme="@style/Dialog.WidgetConfiguration"
71+
android:excludeFromRecents="true">
72+
<intent-filter>
73+
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
74+
</intent-filter>
75+
</activity>
76+
<receiver android:name=".receivers.TransactionRecorder"
77+
android:label="Records transactions received through intents"
78+
android:permission="org.gnucash.android.permission.RECORD_TRANSACTION">
79+
<intent-filter>
80+
<action android:name="android.intent.action.INSERT" />
81+
<category android:name="android.intent.category.DEFAULT" />
82+
<data android:mimeType="vnd.android.cursor.item/vnd.org.gnucash.android.transaction"/>
83+
</intent-filter>
84+
</receiver>
85+
<receiver android:name=".receivers.AccountCreator"
86+
android:label="Creates new accounts"
87+
android:permission="org.gnucash.android.permission.CREATE_ACCOUNT"
88+
android:enabled="true" android:exported="true">
89+
<intent-filter>
90+
<action android:name="android.intent.action.INSERT" />
91+
<category android:name="android.intent.category.DEFAULT" />
92+
<data android:mimeType="vnd.android.cursor.item/vnd.org.gnucash.android.account"/>
93+
</intent-filter>
94+
</receiver>
95+
<receiver android:name=".receivers.TransactionAppWidgetProvider" >
96+
<intent-filter>
97+
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
98+
</intent-filter>
99+
<meta-data android:name="android.appwidget.provider"
100+
android:resource="@xml/transaction_appwidget_info" />
101+
</receiver>
102+
103+
</application>
104+
105105
</manifest>

app/src/org/gnucash/android/app/GnuCashApplication.java renamed to app/src/main/java/org/gnucash/android/app/GnuCashApplication.java

File renamed without changes.

app/src/org/gnucash/android/db/AccountsDbAdapter.java renamed to app/src/main/java/org/gnucash/android/db/AccountsDbAdapter.java

File renamed without changes.

app/src/org/gnucash/android/db/DatabaseAdapter.java renamed to app/src/main/java/org/gnucash/android/db/DatabaseAdapter.java

File renamed without changes.

app/src/org/gnucash/android/db/DatabaseCursorLoader.java renamed to app/src/main/java/org/gnucash/android/db/DatabaseCursorLoader.java

File renamed without changes.

app/src/org/gnucash/android/db/DatabaseHelper.java renamed to app/src/main/java/org/gnucash/android/db/DatabaseHelper.java

File renamed without changes.

app/src/org/gnucash/android/db/DatabaseSchema.java renamed to app/src/main/java/org/gnucash/android/db/DatabaseSchema.java

File renamed without changes.

app/src/org/gnucash/android/db/MigrationHelper.java renamed to app/src/main/java/org/gnucash/android/db/MigrationHelper.java

File renamed without changes.

0 commit comments

Comments
 (0)