Merge pull request #5 from alexstyl/remove_namedays_package

Remove package .namedays
alexstyl · Aug 29, 2016 · 9c9ddcc · 9c9ddcc
2 parents bad0411 + 59cfbf1
commit 9c9ddcc
Show file tree

Hide file tree

Showing 24 changed files with 19 additions and 27 deletions.
diff --git a/mobile/src/main/java/com/alexstyl/specialdates/events/NamedayDatabaseRefresher.java b/mobile/src/main/java/com/alexstyl/specialdates/events/NamedayDatabaseRefresher.java
@@ -19,7 +19,7 @@
 import com.alexstyl.specialdates.events.namedays.NamedayCalendarProvider;
 import com.alexstyl.specialdates.events.namedays.NamedayLocale;
 import com.alexstyl.specialdates.events.namedays.NamedayPreferences;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
+import com.alexstyl.specialdates.events.namedays.NameCelebrations;
 import com.alexstyl.specialdates.util.Utils;
 
 import java.util.ArrayList;

diff --git a/.../specialdates/namedays/CharacterNode.java → ...ldates/events/namedays/CharacterNode.java b/.../specialdates/namedays/CharacterNode.java → ...ldates/events/namedays/CharacterNode.java
@@ -1,4 +1,4 @@
-package com.alexstyl.specialdates.namedays;
+package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.gsc.Index;
 import com.alexstyl.specialdates.events.DayDate;

diff --git a/...alexstyl/specialdates/namedays/Dates.java → ...l/specialdates/events/namedays/Dates.java b/...alexstyl/specialdates/namedays/Dates.java → ...l/specialdates/events/namedays/Dates.java
@@ -1,4 +1,4 @@
-package com.alexstyl.specialdates.namedays;
+package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
 

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/GreekNamedays.java b/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/GreekNamedays.java
@@ -1,7 +1,6 @@
 package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
 import com.novoda.notils.exception.DeveloperError;
 
 import java.util.ArrayList;

diff --git a/...src/main/java/com/alexstyl/specialdates/events/namedays/GreekSpecialNamedaysStrategy.java b/...src/main/java/com/alexstyl/specialdates/events/namedays/GreekSpecialNamedaysStrategy.java
@@ -1,7 +1,6 @@
 package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
 
 import java.util.ArrayList;
 

diff --git a/...ecialdates/namedays/NameCelebrations.java → ...tes/events/namedays/NameCelebrations.java b/...ecialdates/namedays/NameCelebrations.java → ...tes/events/namedays/NameCelebrations.java
@@ -1,4 +1,4 @@
-package com.alexstyl.specialdates.namedays;
+package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
 

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/NamedayBundle.java b/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/NamedayBundle.java
@@ -1,8 +1,6 @@
 package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
-import com.alexstyl.specialdates.namedays.Node;
 
 import java.util.ArrayList;
 

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/NamedayCalendar.java b/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/NamedayCalendar.java
@@ -1,8 +1,6 @@
 package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.Dates;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/NamedayJSONParser.java b/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/NamedayJSONParser.java
@@ -2,9 +2,6 @@
 
 import com.alexstyl.specialdates.ErrorTracker;
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.CharacterNode;
-import com.alexstyl.specialdates.namedays.Node;
-import com.alexstyl.specialdates.namedays.SoundNode;
 import com.novoda.notils.exception.DeveloperError;
 
 import org.joda.time.IllegalFieldValueException;

diff --git a/...le/src/main/java/com/alexstyl/specialdates/events/namedays/NoSpecialNamedaysStrategy.java b/...le/src/main/java/com/alexstyl/specialdates/events/namedays/NoSpecialNamedaysStrategy.java
@@ -1,7 +1,6 @@
 package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
 
 import java.util.ArrayList;
 

diff --git a/.../alexstyl/specialdates/namedays/Node.java → ...yl/specialdates/events/namedays/Node.java b/.../alexstyl/specialdates/namedays/Node.java → ...yl/specialdates/events/namedays/Node.java
@@ -1,4 +1,4 @@
-package com.alexstyl.specialdates.namedays;
+package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
 

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/RomanianNamedays.java b/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/RomanianNamedays.java
@@ -1,8 +1,6 @@
 package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.CharacterNode;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../main/java/com/alexstyl/specialdates/events/namedays/RomanianSpecialNamedaysStrategy.java b/.../main/java/com/alexstyl/specialdates/events/namedays/RomanianSpecialNamedaysStrategy.java
@@ -1,7 +1,6 @@
 package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...styl/specialdates/namedays/SoundNode.java → ...ecialdates/events/namedays/SoundNode.java b/...styl/specialdates/namedays/SoundNode.java → ...ecialdates/events/namedays/SoundNode.java
@@ -1,4 +1,4 @@
-package com.alexstyl.specialdates.namedays;
+package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.gsc.Index;
 import com.alexstyl.gsc.Sound;

diff --git a/...c/main/java/com/alexstyl/specialdates/events/namedays/SpecialGreekNamedaysCalculator.java b/...c/main/java/com/alexstyl/specialdates/events/namedays/SpecialGreekNamedaysCalculator.java
@@ -5,8 +5,6 @@
 import com.alexstyl.specialdates.MementoApp;
 import com.alexstyl.specialdates.R;
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.Node;
-import com.alexstyl.specialdates.namedays.SoundNode;
 
 import java.util.Calendar;
 import java.util.List;

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/SpecialNamedaysStrategy.java b/mobile/src/main/java/com/alexstyl/specialdates/events/namedays/SpecialNamedaysStrategy.java
@@ -1,7 +1,6 @@
 package com.alexstyl.specialdates.events.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
 
 import java.util.ArrayList;
 

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/search/DeviceSearchFragment.java b/mobile/src/main/java/com/alexstyl/specialdates/search/DeviceSearchFragment.java
@@ -24,7 +24,7 @@
 import com.alexstyl.specialdates.datedetails.DateDetailsActivity;
 import com.alexstyl.specialdates.events.DayDate;
 import com.alexstyl.specialdates.events.namedays.NamedayPreferences;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
+import com.alexstyl.specialdates.events.namedays.NameCelebrations;
 import com.alexstyl.specialdates.ui.base.MementoFragment;
 import com.alexstyl.specialdates.ui.widget.SpacesItemDecoration;
 

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/search/NamedayCard.java b/mobile/src/main/java/com/alexstyl/specialdates/search/NamedayCard.java
@@ -1,7 +1,7 @@
 package com.alexstyl.specialdates.search;
 
 import com.alexstyl.specialdates.events.DayDate;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
+import com.alexstyl.specialdates.events.namedays.NameCelebrations;
 
 public class NamedayCard {
 

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/search/NamedaysLoader.java b/mobile/src/main/java/com/alexstyl/specialdates/search/NamedaysLoader.java
@@ -7,7 +7,7 @@
 import com.alexstyl.specialdates.events.namedays.NamedayCalendarProvider;
 import com.alexstyl.specialdates.events.namedays.NamedayLocale;
 import com.alexstyl.specialdates.events.namedays.NamedayPreferences;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
+import com.alexstyl.specialdates.events.namedays.NameCelebrations;
 import com.alexstyl.specialdates.ui.loader.SimpleAsyncTaskLoader;
 
 public class NamedaysLoader extends SimpleAsyncTaskLoader<NameCelebrations> {

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/search/SearchResultAdapter.java b/mobile/src/main/java/com/alexstyl/specialdates/search/SearchResultAdapter.java
@@ -14,7 +14,7 @@
 import com.alexstyl.specialdates.events.namedays.NamedayLocale;
 import com.alexstyl.specialdates.events.namedays.NamedayPreferences;
 import com.alexstyl.specialdates.images.ImageLoader;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
+import com.alexstyl.specialdates.events.namedays.NameCelebrations;
 import com.novoda.notils.exception.DeveloperError;
 
 import java.util.ArrayList;

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/search/SearchResultContactViewHolder.java b/mobile/src/main/java/com/alexstyl/specialdates/search/SearchResultContactViewHolder.java
@@ -14,7 +14,7 @@
 import com.alexstyl.specialdates.events.DayDate;
 import com.alexstyl.specialdates.events.namedays.NamedayCalendar;
 import com.alexstyl.specialdates.images.ImageLoader;
-import com.alexstyl.specialdates.namedays.NameCelebrations;
+import com.alexstyl.specialdates.events.namedays.NameCelebrations;
 import com.alexstyl.specialdates.ui.widget.ColorImageView;
 
 class SearchResultContactViewHolder extends RecyclerView.ViewHolder {

diff --git a/mobile/src/test/java/com/alexstyl/specialdates/namedays/CharacterNodeTest.java b/mobile/src/test/java/com/alexstyl/specialdates/namedays/CharacterNodeTest.java
@@ -1,5 +1,8 @@
 package com.alexstyl.specialdates.namedays;
 
+import com.alexstyl.specialdates.events.namedays.CharacterNode;
+import com.alexstyl.specialdates.events.namedays.Node;
+
 public class CharacterNodeTest extends NodeTest {
 
     @Override

diff --git a/mobile/src/test/java/com/alexstyl/specialdates/namedays/NodeTest.java b/mobile/src/test/java/com/alexstyl/specialdates/namedays/NodeTest.java
@@ -1,6 +1,8 @@
 package com.alexstyl.specialdates.namedays;
 
 import com.alexstyl.specialdates.events.DayDate;
+import com.alexstyl.specialdates.events.namedays.NameCelebrations;
+import com.alexstyl.specialdates.events.namedays.Node;
 
 import org.junit.Test;
 

diff --git a/mobile/src/test/java/com/alexstyl/specialdates/namedays/SoundNodeTest.java b/mobile/src/test/java/com/alexstyl/specialdates/namedays/SoundNodeTest.java
@@ -1,5 +1,8 @@
 package com.alexstyl.specialdates.namedays;
 
+import com.alexstyl.specialdates.events.namedays.Node;
+import com.alexstyl.specialdates.events.namedays.SoundNode;
+
 public class SoundNodeTest extends NodeTest {
 
     @Override