Skip to content

Commit eacaa4c

Browse files
yvolkyvolk
committed
#291 Rename application and change application package. Step 1
1 parent 3da91de commit eacaa4c

File tree

55 files changed

+204
-205
lines changed

Some content is hidden

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

55 files changed

+204
-205
lines changed

‎app/calendar-widget/build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
minSdkVersion 15
3333
targetSdkVersion 27
3434

35-
testApplicationId "com.plusonelabs.calendar.tests"
35+
testApplicationId "org.andstatus.todoagenda.tests"
3636
testInstrumentationRunner "android.test.InstrumentationTestRunner"
3737
}
3838

@@ -54,21 +54,21 @@ android {
5454
abortOnError false
5555
}
5656

57-
if (project.hasProperty('calendarStoreFile')) {
57+
if (project.hasProperty('todoagendaStoreFile')) {
5858
signingConfigs {
5959
releaseConfig {
60-
storeFile file(calendarStoreFile)
61-
storePassword calendarStorePassword
62-
keyAlias calendarKeyAlias
63-
keyPassword calendarKeyPassword
60+
storeFile file(todoagendaStoreFile)
61+
storePassword todoagendaStorePassword
62+
keyAlias todoagendaKeyAlias
63+
keyPassword todoagendaKeyPassword
6464
}
6565
}
6666
buildTypes.release.signingConfig signingConfigs.releaseConfig
6767
}
6868
// See https://www.timroes.de/2013/09/22/handling-signing-configs-with-gradle/
69-
if (project.hasProperty("calendar-widget.signing")
70-
&& new File(project.property("calendar-widget.signing").toString() + ".gradle").exists()) {
71-
apply from: project.property("calendar-widget.signing") + ".gradle";
69+
if (project.hasProperty("todoagenda.signing")
70+
&& new File(project.property("todoagenda.signing").toString() + ".gradle").exists()) {
71+
apply from: project.property("todoagenda.signing") + ".gradle";
7272
}
7373
}
7474

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/BirthdayTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/BirthdayTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.test.InstrumentationTestCase;
44

5-
import com.plusonelabs.calendar.calendar.CalendarQueryResultsStorage;
6-
import com.plusonelabs.calendar.calendar.MockCalendarContentProvider;
7-
import com.plusonelabs.calendar.prefs.ApplicationPreferences;
8-
import com.plusonelabs.calendar.widget.CalendarEntry;
5+
import org.andstatus.todoagenda.calendar.CalendarQueryResultsStorage;
6+
import org.andstatus.todoagenda.calendar.MockCalendarContentProvider;
7+
import org.andstatus.todoagenda.prefs.ApplicationPreferences;
8+
import org.andstatus.todoagenda.widget.CalendarEntry;
99

1010
import org.joda.time.DateTime;
1111
import org.json.JSONException;
@@ -37,7 +37,7 @@ protected void tearDown() throws Exception {
3737

3838
public void testBirthdayOneDayOnly() throws IOException, JSONException {
3939
CalendarQueryResultsStorage inputs = provider.loadResults(this.getInstrumentation().getContext(),
40-
com.plusonelabs.calendar.tests.R.raw.birthday);
40+
org.andstatus.todoagenda.tests.R.raw.birthday);
4141

4242
provider.startEditing();
4343
ApplicationPreferences.setEventsEnded(provider.getContext(), EndedSomeTimeAgo.NONE);

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/IllegalInstantDueToTimeZoneTransitionTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/IllegalInstantDueToTimeZoneTransitionTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.test.InstrumentationTestCase;
44
import android.util.Log;
55

6-
import com.plusonelabs.calendar.calendar.CalendarQueryRow;
7-
import com.plusonelabs.calendar.calendar.MockCalendarContentProvider;
6+
import org.andstatus.todoagenda.calendar.CalendarQueryRow;
7+
import org.andstatus.todoagenda.calendar.MockCalendarContentProvider;
88

99
import org.joda.time.DateTime;
1010
import org.joda.time.DateTimeZone;

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/MultidayAllDayEventTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/MultidayAllDayEventTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.test.InstrumentationTestCase;
44
import android.util.Log;
55

6-
import com.plusonelabs.calendar.calendar.CalendarQueryResultsStorage;
7-
import com.plusonelabs.calendar.calendar.MockCalendarContentProvider;
8-
import com.plusonelabs.calendar.prefs.ApplicationPreferences;
9-
import com.plusonelabs.calendar.widget.DayHeader;
10-
import com.plusonelabs.calendar.widget.WidgetEntry;
6+
import org.andstatus.todoagenda.calendar.CalendarQueryResultsStorage;
7+
import org.andstatus.todoagenda.calendar.MockCalendarContentProvider;
8+
import org.andstatus.todoagenda.prefs.ApplicationPreferences;
9+
import org.andstatus.todoagenda.widget.DayHeader;
10+
import org.andstatus.todoagenda.widget.WidgetEntry;
1111

1212
import org.joda.time.DateTime;
1313
import org.json.JSONException;
@@ -40,7 +40,7 @@ protected void tearDown() throws Exception {
4040
public void testInsidePeriod() throws IOException, JSONException {
4141
final String method = "testInsidePeriod";
4242
CalendarQueryResultsStorage inputs = provider.loadResults(this.getInstrumentation().getContext(),
43-
com.plusonelabs.calendar.tests.R.raw.multi_day);
43+
org.andstatus.todoagenda.tests.R.raw.multi_day);
4444
provider.addResults(inputs.getResults());
4545

4646
int dateRange = 30;

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/MultidayEventTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/MultidayEventTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.test.InstrumentationTestCase;
44
import android.util.Log;
55

6-
import com.plusonelabs.calendar.calendar.CalendarEvent;
7-
import com.plusonelabs.calendar.calendar.MockCalendarContentProvider;
8-
import com.plusonelabs.calendar.widget.CalendarEntry;
9-
import com.plusonelabs.calendar.widget.WidgetEntry;
6+
import org.andstatus.todoagenda.calendar.CalendarEvent;
7+
import org.andstatus.todoagenda.calendar.MockCalendarContentProvider;
8+
import org.andstatus.todoagenda.widget.CalendarEntry;
9+
import org.andstatus.todoagenda.widget.WidgetEntry;
1010

1111
import org.joda.time.DateTime;
1212

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/OngoingEventTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/OngoingEventTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.test.InstrumentationTestCase;
44

5-
import com.plusonelabs.calendar.calendar.CalendarEvent;
6-
import com.plusonelabs.calendar.calendar.MockCalendarContentProvider;
7-
import com.plusonelabs.calendar.widget.CalendarEntry;
8-
import com.plusonelabs.calendar.widget.WidgetEntry;
5+
import org.andstatus.todoagenda.calendar.CalendarEvent;
6+
import org.andstatus.todoagenda.calendar.MockCalendarContentProvider;
7+
import org.andstatus.todoagenda.widget.CalendarEntry;
8+
import org.andstatus.todoagenda.widget.WidgetEntry;
99

1010
import org.joda.time.DateTime;
1111

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/RecurringEventsTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/RecurringEventsTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.test.InstrumentationTestCase;
44

5-
import com.plusonelabs.calendar.calendar.CalendarQueryRow;
6-
import com.plusonelabs.calendar.calendar.MockCalendarContentProvider;
7-
import com.plusonelabs.calendar.prefs.ApplicationPreferences;
8-
import com.plusonelabs.calendar.widget.CalendarEntry;
9-
import com.plusonelabs.calendar.widget.WidgetEntry;
5+
import org.andstatus.todoagenda.calendar.CalendarQueryRow;
6+
import org.andstatus.todoagenda.calendar.MockCalendarContentProvider;
7+
import org.andstatus.todoagenda.prefs.ApplicationPreferences;
8+
import org.andstatus.todoagenda.widget.CalendarEntry;
9+
import org.andstatus.todoagenda.widget.WidgetEntry;
1010

1111
import org.joda.time.DateTime;
1212

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/SingleEventTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/SingleEventTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.test.InstrumentationTestCase;
44

5-
import com.plusonelabs.calendar.calendar.CalendarEvent;
6-
import com.plusonelabs.calendar.calendar.MockCalendarContentProvider;
7-
import com.plusonelabs.calendar.widget.CalendarEntry;
8-
import com.plusonelabs.calendar.widget.WidgetEntry;
5+
import org.andstatus.todoagenda.calendar.CalendarEvent;
6+
import org.andstatus.todoagenda.calendar.MockCalendarContentProvider;
7+
import org.andstatus.todoagenda.widget.CalendarEntry;
8+
import org.andstatus.todoagenda.widget.WidgetEntry;
99

1010
import org.joda.time.DateTime;
1111
import org.joda.time.DateTimeZone;

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/WrongDatesLostEventsTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/WrongDatesLostEventsTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.test.InstrumentationTestCase;
44
import android.util.Log;
55

6-
import com.plusonelabs.calendar.calendar.CalendarQueryResultsStorage;
7-
import com.plusonelabs.calendar.calendar.MockCalendarContentProvider;
8-
import com.plusonelabs.calendar.widget.CalendarEntry;
6+
import org.andstatus.todoagenda.calendar.CalendarQueryResultsStorage;
7+
import org.andstatus.todoagenda.calendar.MockCalendarContentProvider;
8+
import org.andstatus.todoagenda.widget.CalendarEntry;
99

1010
import org.json.JSONException;
1111

@@ -40,7 +40,7 @@ protected void tearDown() throws Exception {
4040
public void testIssue205() throws IOException, JSONException {
4141
final String method = "testIssue205";
4242
CalendarQueryResultsStorage inputs = provider.loadResults(this.getInstrumentation().getContext(),
43-
com.plusonelabs.calendar.tests.R.raw.wrong_dates_lost_events);
43+
org.andstatus.todoagenda.tests.R.raw.wrong_dates_lost_events);
4444
provider.addResults(inputs.getResults());
4545
Log.d(method, "Results executed at " + inputs.getResults().get(0).getExecutedAt());
4646

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/calendar/KeywordsFilterTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/calendar/KeywordsFilterTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.plusonelabs.calendar.calendar;
1+
package org.andstatus.todoagenda.calendar;
22

33
import android.test.InstrumentationTestCase;
44

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/calendar/MockCalendarContentProvider.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/calendar/MockCalendarContentProvider.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.plusonelabs.calendar.calendar;
1+
package org.andstatus.todoagenda.calendar;
22

33
import android.content.Context;
44
import android.content.ContextWrapper;
@@ -13,12 +13,11 @@
1313
import android.test.mock.MockContentResolver;
1414
import android.util.Log;
1515

16-
import com.plusonelabs.calendar.DateUtil;
17-
import com.plusonelabs.calendar.EventAppWidgetProvider;
18-
import com.plusonelabs.calendar.prefs.ApplicationPreferences;
19-
import com.plusonelabs.calendar.prefs.InstanceSettings;
20-
import com.plusonelabs.calendar.util.RawResourceUtils;
21-
16+
import org.andstatus.todoagenda.DateUtil;
17+
import org.andstatus.todoagenda.EventAppWidgetProvider;
18+
import org.andstatus.todoagenda.prefs.ApplicationPreferences;
19+
import org.andstatus.todoagenda.prefs.InstanceSettings;
20+
import org.andstatus.todoagenda.util.RawResourceUtils;
2221
import org.joda.time.DateTimeZone;
2322
import org.json.JSONArray;
2423
import org.json.JSONException;
@@ -28,10 +27,10 @@
2827
import java.util.ArrayList;
2928
import java.util.List;
3029

31-
import static com.plusonelabs.calendar.calendar.CalendarQueryResultsStorage.KEY_SETTINGS;
32-
import static com.plusonelabs.calendar.prefs.ApplicationPreferences.PREF_WIDGET_ID;
3330
import static junit.framework.Assert.assertFalse;
3431
import static junit.framework.Assert.assertTrue;
32+
import static org.andstatus.todoagenda.calendar.CalendarQueryResultsStorage.KEY_SETTINGS;
33+
import static org.andstatus.todoagenda.prefs.ApplicationPreferences.PREF_WIDGET_ID;
3534

3635
/**
3736
* @author [email protected]

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/calendar/MockCalendarContentProviderTest.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/calendar/MockCalendarContentProviderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.plusonelabs.calendar.calendar;
1+
package org.andstatus.todoagenda.calendar;
22

33
import android.database.Cursor;
44
import android.net.Uri;
55
import android.provider.CalendarContract;
66
import android.test.InstrumentationTestCase;
77

8-
import com.plusonelabs.calendar.DateUtil;
8+
import org.andstatus.todoagenda.DateUtil;
99

1010
import org.joda.time.DateTime;
1111
import org.json.JSONException;
@@ -111,7 +111,7 @@ private CalendarQueryResult queryList(Uri uri, String selection) {
111111

112112
public void testJsonToAndFrom() throws IOException, JSONException {
113113
CalendarQueryResultsStorage inputs1 = provider.loadResults(getInstrumentation().getContext(),
114-
com.plusonelabs.calendar.tests.R.raw.birthday);
114+
org.andstatus.todoagenda.tests.R.raw.birthday);
115115
JSONObject jsonOutput = inputs1.toJson(provider.getContext(), provider.getWidgetId());
116116
CalendarQueryResultsStorage inputs2 =
117117
CalendarQueryResultsStorage.fromJson(provider.getContext(), jsonOutput);

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/calendar/MockSettingsProvider.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/calendar/MockSettingsProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.plusonelabs.calendar.calendar;
1+
package org.andstatus.todoagenda.calendar;
22

33
import android.os.Bundle;
44
import android.test.mock.MockContentProvider;

‎app/calendar-widget/src/androidTest/java/com/plusonelabs/calendar/util/RawResourceUtils.java ‎app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/util/RawResourceUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://stackoverflow.com/questions/4087674/android-read-text-raw-resource-file
44
*/
55

6-
package com.plusonelabs.calendar.util;
6+
package org.andstatus.todoagenda.util;
77

88
import android.content.Context;
99
import android.content.res.Resources;

‎app/calendar-widget/src/main/AndroidManifest.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.plusonelabs.calendar"
2+
<manifest package="org.andstatus.todoagenda"
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:installLocation="internalOnly">
55

@@ -11,7 +11,7 @@
1111
android:label="@string/app_name"
1212
android:theme="@style/Theme.CalendarConfiguration.Dark">
1313

14-
<activity android:name=".MainActivity"
14+
<activity android:name="org.andstatus.todoagenda.MainActivity"
1515
android:exported="true"
1616
android:launchMode="singleTask"
1717
android:finishOnTaskLaunch="true"
@@ -27,13 +27,13 @@
2727
</intent-filter>
2828
</activity>
2929

30-
<activity android:name=".WidgetConfigurationActivity"
30+
<activity android:name="org.andstatus.todoagenda.WidgetConfigurationActivity"
3131
android:excludeFromRecents="true"
3232
android:finishOnTaskLaunch="true">
3333
</activity>
3434

3535
<receiver
36-
android:name=".EventAppWidgetProvider"
36+
android:name="org.andstatus.todoagenda.EventAppWidgetProvider"
3737
android:label="@string/widget_name">
3838
<intent-filter>
3939
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -43,7 +43,7 @@
4343
android:name="android.appwidget.provider"
4444
android:resource="@xml/calendar_appwidget_info"/>
4545
</receiver>
46-
<receiver android:name=".EnvironmentChangedReceiver">
46+
<receiver android:name="org.andstatus.todoagenda.EnvironmentChangedReceiver">
4747
<intent-filter>
4848
<action android:name="android.intent.action.TIMEZONE_CHANGED"/>
4949
<action android:name="android.intent.action.DATE_CHANGED"/>
@@ -57,10 +57,10 @@
5757
<data android:host="com.android.calendar"/>
5858
</intent-filter>
5959
<intent-filter>
60-
<action android:name="com.plusonelabs.calendar.action.REFRESH"/>
60+
<action android:name="org.andstatus.todoagenda.action.REFRESH"/>
6161
</intent-filter>
6262
</receiver>
63-
<receiver android:name=".AlarmReceiver">
63+
<receiver android:name="org.andstatus.todoagenda.AlarmReceiver">
6464
<intent-filter>
6565
<action android:name="android.intent.action.TIMEZONE_CHANGED"/>
6666
<action android:name="android.intent.action.BOOT_COMPLETED"/>
@@ -69,7 +69,7 @@
6969
</receiver>
7070

7171
<service
72-
android:name=".EventWidgetService"
72+
android:name="org.andstatus.todoagenda.EventWidgetService"
7373
android:exported="false"
7474
android:permission="android.permission.BIND_REMOTEVIEWS">
7575
</service>

‎app/calendar-widget/src/main/java/com/plusonelabs/calendar/AlarmReceiver.java ‎app/calendar-widget/src/main/java/org/andstatus/todoagenda/AlarmReceiver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.app.AlarmManager;
44
import android.app.PendingIntent;

‎app/calendar-widget/src/main/java/com/plusonelabs/calendar/Alignment.java ‎app/calendar-widget/src/main/java/org/andstatus/todoagenda/Alignment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
public enum Alignment {
44

‎app/calendar-widget/src/main/java/com/plusonelabs/calendar/CalendarIntentUtil.java ‎app/calendar-widget/src/main/java/org/andstatus/todoagenda/CalendarIntentUtil.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.app.PendingIntent;
44
import android.content.ContentUris;
@@ -7,8 +7,8 @@
77
import android.provider.CalendarContract;
88
import android.provider.CalendarContract.Events;
99

10-
import com.plusonelabs.calendar.prefs.InstanceSettings;
11-
import com.plusonelabs.calendar.util.PermissionsUtil;
10+
import org.andstatus.todoagenda.prefs.InstanceSettings;
11+
import org.andstatus.todoagenda.util.PermissionsUtil;
1212

1313
import org.joda.time.DateTime;
1414
import org.joda.time.DateTimeZone;

‎app/calendar-widget/src/main/java/com/plusonelabs/calendar/DateUtil.java ‎app/calendar-widget/src/main/java/org/andstatus/todoagenda/DateUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import android.support.annotation.NonNull;
44
import android.text.TextUtils;
55
import android.text.format.DateUtils;
66
import android.util.Log;
77

8-
import com.plusonelabs.calendar.prefs.InstanceSettings;
8+
import org.andstatus.todoagenda.prefs.InstanceSettings;
99

1010
import org.joda.time.DateTime;
1111
import org.joda.time.DateTimeZone;

‎app/calendar-widget/src/main/java/com/plusonelabs/calendar/EndedSomeTimeAgo.java ‎app/calendar-widget/src/main/java/org/andstatus/todoagenda/EndedSomeTimeAgo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.plusonelabs.calendar;
1+
package org.andstatus.todoagenda;
22

33
import org.joda.time.DateTime;
44

0 commit comments

Comments
 (0)