Moved all classes to package org.codepond.wizardroid instead of `or…

…g.codepond.android.wizardroid` to keep consistency with Group ID on maven central

wizardroid-sample/src/main/AndroidManifest.xml

@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.codepond.android.wizardroid" android:versionCode="1" android:versionName="1.0.0">
+  package="org.codepond.wizardroid.sample"
+    android:versionCode="1" android:versionName="1.0.0">
 
   <uses-sdk android:minSdkVersion="14"
             android:targetSdkVersion="18"
             android:theme="@android:style/Theme.Holo.Light.DarkActionBar"/>
   <application android:icon="@drawable/icon"
                android:label="@string/app_name"
                android:uiOptions="splitActionBarWhenNarrow">
-    <activity android:name=".sample.MainActivity">
+    <activity android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
-      <activity android:name=".sample.TutorialActivity"
+      <activity android:name=".TutorialActivity"
                 android:parentActivityName=".sample.MainActivity"/>
-      <activity android:name=".sample.FormActivity"
+      <activity android:name=".FormActivity"
                 android:parentActivityName=".sample.MainActivity"/>
   </application>
 

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/FormActivity.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/FormActivity.java

@@ -1,9 +1,8 @@
-package org.codepond.android.wizardroid.sample;
+package org.codepond.wizardroid.sample;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 
-import org.codepond.android.wizardroid.R;
 
 public class FormActivity extends FragmentActivity {
     @Override

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/MainActivity.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/MainActivity.java

@@ -1,4 +1,4 @@
-package org.codepond.android.wizardroid.sample;
+package org.codepond.wizardroid.sample;
 
 import android.app.Activity;
 import android.app.ListActivity;
@@ -7,9 +7,6 @@
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import org.codepond.android.wizardroid.R;
-import org.codepond.android.wizardroid.sample.wizards.FormWizard;
-import org.codepond.android.wizardroid.sample.wizards.TutorialWizard;
 
 /**
  * The launchpad activity for this sample project. This activity launches other activities that

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/TutorialActivity.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/TutorialActivity.java

@@ -1,10 +1,8 @@
-package org.codepond.android.wizardroid.sample;
+package org.codepond.wizardroid.sample;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 
-import org.codepond.android.wizardroid.R;
-
 public class TutorialActivity extends FragmentActivity {
 
     @Override

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/steps/FormStep1.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/steps/FormStep1.java

@@ -1,14 +1,13 @@
-package org.codepond.android.wizardroid.sample.steps;
+package org.codepond.wizardroid.sample.steps;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
-import org.codepond.android.wizardroid.persistence.ContextVariable;
-import org.codepond.android.wizardroid.R;
-import org.codepond.android.wizardroid.WizardStep;
+import org.codepond.wizardroid.persistence.ContextVariable;
+import org.codepond.wizardroid.WizardStep;
+import org.codepond.wizardroid.sample.R;
 
 public class FormStep1 extends WizardStep {
 

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/steps/FormStep2.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/steps/FormStep2.java

@@ -1,14 +1,13 @@
-package org.codepond.android.wizardroid.sample.steps;
+package org.codepond.wizardroid.sample.steps;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
-import org.codepond.android.wizardroid.persistence.ContextVariable;
-import org.codepond.android.wizardroid.R;
-import org.codepond.android.wizardroid.WizardStep;
+import org.codepond.wizardroid.persistence.ContextVariable;
+import org.codepond.wizardroid.WizardStep;
+import org.codepond.wizardroid.sample.R;
 
 public class FormStep2 extends WizardStep {
 

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/steps/TutorialStep1.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/steps/TutorialStep1.java

@@ -1,13 +1,12 @@
-package org.codepond.android.wizardroid.sample.steps;
+package org.codepond.wizardroid.sample.steps;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
-import org.codepond.android.wizardroid.R;
-import org.codepond.android.wizardroid.WizardStep;
+import org.codepond.wizardroid.WizardStep;
+import org.codepond.wizardroid.sample.R;
 
 public class TutorialStep1 extends WizardStep {
 

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/steps/TutorialStep2.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/steps/TutorialStep2.java

@@ -1,13 +1,12 @@
-package org.codepond.android.wizardroid.sample.steps;
+package org.codepond.wizardroid.sample.steps;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
-import org.codepond.android.wizardroid.R;
-import org.codepond.android.wizardroid.WizardStep;
+import org.codepond.wizardroid.WizardStep;
+import org.codepond.wizardroid.sample.R;
 
 public class TutorialStep2 extends WizardStep {
 

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/wizards/FormWizard.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/wizards/FormWizard.java

@@ -1,10 +1,10 @@
-package org.codepond.android.wizardroid.sample.wizards;
+package org.codepond.wizardroid.sample.wizards;
 
-import org.codepond.android.wizardroid.WizardFlow;
-import org.codepond.android.wizardroid.layouts.BasicWizardLayout;
-import org.codepond.android.wizardroid.persistence.ContextVariable;
-import org.codepond.android.wizardroid.sample.steps.FormStep1;
-import org.codepond.android.wizardroid.sample.steps.FormStep2;
+import org.codepond.wizardroid.WizardFlow;
+import org.codepond.wizardroid.layouts.BasicWizardLayout;
+import org.codepond.wizardroid.persistence.ContextVariable;
+import org.codepond.wizardroid.sample.steps.FormStep1;
+import org.codepond.wizardroid.sample.steps.FormStep2;
 
 /**
  * A sample to demonstrate a form in multiple steps.

wizardroid-sample/src/main/java/org/codepond/android/wizardroid/sample/wizards/TutorialWizard.java → wizardroid-sample/src/main/java/org/codepond/wizardroid/sample/wizards/TutorialWizard.java

@@ -1,9 +1,9 @@
-package org.codepond.android.wizardroid.sample.wizards;
+package org.codepond.wizardroid.sample.wizards;
 
-import org.codepond.android.wizardroid.WizardFlow;
-import org.codepond.android.wizardroid.layouts.BasicWizardLayout;
-import org.codepond.android.wizardroid.sample.steps.TutorialStep1;
-import org.codepond.android.wizardroid.sample.steps.TutorialStep2;
+import org.codepond.wizardroid.WizardFlow;
+import org.codepond.wizardroid.layouts.BasicWizardLayout;
+import org.codepond.wizardroid.sample.steps.TutorialStep1;
+import org.codepond.wizardroid.sample.steps.TutorialStep2;
 
 public class TutorialWizard extends BasicWizardLayout {
 

wizardroid-sample/src/main/res/layout/activity_form.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout  xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
     <fragment
         android:id="@+id/form_wizard_fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:name="org.codepond.android.wizardroid.sample.wizards.FormWizard"/>
-</LinearLayout>
+        android:name="org.codepond.wizardroid.sample.wizards.FormWizard"/>
+</FrameLayout >

wizardroid-sample/src/main/res/layout/activity_tutorial.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout  xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
     <fragment
         android:id="@+id/tutorial_wizard_fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:name="org.codepond.android.wizardroid.sample.wizards.TutorialWizard"/>
-</LinearLayout>
+        android:name="org.codepond.wizardroid.sample.wizards.TutorialWizard"/>
+</FrameLayout >

wizardroid/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0.0" package="org.codepond.android.wizardroid">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0.0" package="org.codepond.wizardroid">
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="18"/>
     <application/>
 </manifest>

wizardroid/src/main/java/org/codepond/android/wizardroid/Wizard.java → wizardroid/src/main/java/org/codepond/wizardroid/Wizard.java

@@ -1,4 +1,4 @@
-package org.codepond.android.wizardroid;
+package org.codepond.wizardroid;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
@@ -8,7 +8,7 @@
 import android.util.Log;
 import android.view.ViewGroup;
 
-import org.codepond.android.wizardroid.persistence.ContextManager;
+import org.codepond.wizardroid.persistence.ContextManager;
 
 /**
  * The engine of the Wizard. This class controls the flow of the wizard
@@ -47,7 +47,7 @@ public static interface WizardCallbacks {
     /**
      * Constructor for Wizard
      * @param wizardFlow WizardFlow instance. See WizardFlow.Builder for more information on creating WizardFlow objects.
-     * @param contextManager ContextManager instance would normally be {@link org.codepond.android.wizardroid.persistence.ContextManagerImpl}
+     * @param contextManager ContextManager instance would normally be {@link org.codepond.wizardroid.persistence.ContextManagerImpl}
      * @param callbacks implementation of WizardCallbacks
      * @param activity the hosting activity
      */

wizardroid/src/main/java/org/codepond/android/wizardroid/WizardFlow.java → wizardroid/src/main/java/org/codepond/wizardroid/WizardFlow.java

@@ -1,12 +1,8 @@
-package org.codepond.android.wizardroid;
+package org.codepond.wizardroid;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-
 /**
  * WizardFlow holds information regarding the wizard's steps and flow.
  * Use {@link WizardFlow.Builder} to create an instance of WizardFlow.

wizardroid/src/main/java/org/codepond/android/wizardroid/WizardFragment.java → wizardroid/src/main/java/org/codepond/wizardroid/WizardFragment.java

@@ -1,15 +1,12 @@
-package org.codepond.android.wizardroid;
+package org.codepond.wizardroid;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
-import org.codepond.android.wizardroid.persistence.ContextManager;
-import org.codepond.android.wizardroid.persistence.ContextManagerImpl;
+import org.codepond.wizardroid.persistence.ContextManager;
+import org.codepond.wizardroid.persistence.ContextManagerImpl;
 
 /**
  * Base class for fragments that want to implement step-by-step wizard functionality.

wizardroid/src/main/java/org/codepond/android/wizardroid/WizardStep.java → wizardroid/src/main/java/org/codepond/wizardroid/WizardStep.java

@@ -1,9 +1,9 @@
-package org.codepond.android.wizardroid;
+package org.codepond.wizardroid;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import org.codepond.android.wizardroid.persistence.ContextVariable;
+import org.codepond.wizardroid.persistence.ContextVariable;
 
 import java.lang.reflect.Field;
 import java.util.Date;

wizardroid/src/main/java/org/codepond/android/wizardroid/layouts/BasicWizardLayout.java → wizardroid/src/main/java/org/codepond/wizardroid/layouts/BasicWizardLayout.java

@@ -1,12 +1,12 @@
-package org.codepond.android.wizardroid.layouts;
+package org.codepond.wizardroid.layouts;
 
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.*;
 import android.widget.Button;
 
-import org.codepond.android.wizardroid.R;
-import org.codepond.android.wizardroid.WizardFragment;
+import org.codepond.wizardroid.R;
+import org.codepond.wizardroid.WizardFragment;
 
 /**
  * Basic Wizard UI class with built-in layout.

wizardroid/src/main/java/org/codepond/android/wizardroid/persistence/ContextManager.java → wizardroid/src/main/java/org/codepond/wizardroid/persistence/ContextManager.java

@@ -1,10 +1,8 @@
-package org.codepond.android.wizardroid.persistence;
+package org.codepond.wizardroid.persistence;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 
-import org.codepond.android.wizardroid.WizardStep;
-
 /**
  * This interface defines the wizard context manager API
  * used to pass data between steps.

wizardroid/src/main/java/org/codepond/android/wizardroid/persistence/ContextManagerImpl.java → wizardroid/src/main/java/org/codepond/wizardroid/persistence/ContextManagerImpl.java

@@ -1,4 +1,4 @@
-package org.codepond.android.wizardroid.persistence;
+package org.codepond.wizardroid.persistence;
 
 import android.os.Bundle;
 import android.os.Parcelable;

wizardroid/src/main/java/org/codepond/android/wizardroid/persistence/ContextVariable.java → wizardroid/src/main/java/org/codepond/wizardroid/persistence/ContextVariable.java

@@ -1,4 +1,4 @@
-package org.codepond.android.wizardroid.persistence;
+package org.codepond.wizardroid.persistence;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

wizardroid/src/test/java/org/codepond/android/wizardroid/Persistence/ContextManagerImplTest.java

@@ -1,9 +1,9 @@
 package org.codepond.android.wizardroid.Persistence;
 
 import android.os.Bundle;
-import org.codepond.android.wizardroid.TestStep;
-import org.codepond.android.wizardroid.persistence.ContextManager;
-import org.codepond.android.wizardroid.persistence.ContextManagerImpl;
+import org.codepond.wizardroid.TestStep;
+import org.codepond.wizardroid.persistence.ContextManager;
+import org.codepond.wizardroid.persistence.ContextManagerImpl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,7 +13,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.sql.Time;
 import java.util.Date;
 
 @RunWith(RobolectricTestRunner.class)

wizardroid/src/test/java/org/codepond/android/wizardroid/TestStep.java

@@ -1,6 +1,7 @@
 package org.codepond.android.wizardroid;
 
-import org.codepond.android.wizardroid.persistence.ContextVariable;
+import org.codepond.wizardroid.WizardStep;
+import org.codepond.wizardroid.persistence.ContextVariable;
 
 import java.util.Date;
 

wizardroid/src/test/java/org/codepond/android/wizardroid/WizardFlowTest.java

@@ -1,5 +1,6 @@
 package org.codepond.android.wizardroid;
 
+import org.codepond.wizardroid.WizardFlow;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

wizardroid/src/test/java/org/codepond/android/wizardroid/WizardTest.java

@@ -1,7 +1,11 @@
 package org.codepond.android.wizardroid;
 
 import android.support.v4.app.FragmentActivity;
-import org.codepond.android.wizardroid.persistence.ContextManager;
+
+import org.codepond.wizardroid.Wizard;
+import org.codepond.wizardroid.WizardFlow;
+import org.codepond.wizardroid.WizardStep;
+import org.codepond.wizardroid.persistence.ContextManager;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,7 +21,7 @@
 import static org.junit.Assert.assertEquals;
 
 /**
- * JUnit test class for {@link Wizard}
+ * JUnit test class for {@link org.codepond.wizardroid.Wizard}
  */
 @RunWith(RobolectricTestRunner.class)
 public class WizardTest {