Package naming fail.

joaogouveia · Oct 5, 2011 · 98664f4 · 98664f4
1 parent 9c43477
commit 98664f4
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 24 deletions.
diff --git a/sample/AndroidManifest.xml b/sample/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.viewpagerindicator"
+    package="com.viewpagerindicator.sample"
     android:versionCode="3"
     android:versionName="1.2.0">
 
@@ -146,7 +146,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SampleTitlesWithListener"
+            android:name=".sample.sample.SampleTitlesWithListener"
             android:label="Titles/With Listener">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/sample/res/layout/themed_circles.xml b/sample/res/layout/themed_circles.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.viewpagerindicator"
+    xmlns:app="http://schemas.android.com/apk/res/com.viewpagerindicator.sample"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">

diff --git a/sample/res/layout/themed_titles.xml b/sample/res/layout/themed_titles.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.viewpagerindicator"
+    xmlns:app="http://schemas.android.com/apk/res/com.viewpagerindicator.sample"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">

diff --git a/...iewpagerindicator/BaseSampleActivity.java → ...rindicator/sample/BaseSampleActivity.java b/...iewpagerindicator/BaseSampleActivity.java → ...rindicator/sample/BaseSampleActivity.java
@@ -1,6 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import java.util.Random;
+
+import com.viewpagerindicator.R;
+
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.view.ViewPager;
 import android.view.Menu;

diff --git a/...c/com/viewpagerindicator/ListSamples.java → ...iewpagerindicator/sample/ListSamples.java b/...c/com/viewpagerindicator/ListSamples.java → ...iewpagerindicator/sample/ListSamples.java
@@ -1,4 +1,4 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import java.text.Collator;
 import java.util.ArrayList;

diff --git a/...wpagerindicator/SampleCirclesDefault.java → ...ndicator/sample/SampleCirclesDefault.java b/...wpagerindicator/SampleCirclesDefault.java → ...ndicator/sample/SampleCirclesDefault.java
@@ -1,8 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.R;
 
 public class SampleCirclesDefault extends BaseSampleActivity {
 	@Override

diff --git a/...erindicator/SampleCirclesInitialPage.java → ...ator/sample/SampleCirclesInitialPage.java b/...erindicator/SampleCirclesInitialPage.java → ...ator/sample/SampleCirclesInitialPage.java
@@ -1,8 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.R;
 
 public class SampleCirclesInitialPage extends BaseSampleActivity {
 	@Override

diff --git a/...erindicator/SampleCirclesOrientation.java → ...ator/sample/SampleCirclesOrientation.java b/...erindicator/SampleCirclesOrientation.java → ...ator/sample/SampleCirclesOrientation.java
@@ -1,7 +1,8 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.R;
 import com.directionalviewpager.DirectionalViewPager;
 
 public class SampleCirclesOrientation extends BaseSampleActivity {

diff --git a/...viewpagerindicator/SampleCirclesSnap.java → ...erindicator/sample/SampleCirclesSnap.java b/...viewpagerindicator/SampleCirclesSnap.java → ...erindicator/sample/SampleCirclesSnap.java
@@ -1,8 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.R;
 
 public class SampleCirclesSnap extends BaseSampleActivity {
 	@Override

diff --git a/...rindicator/SampleCirclesStyledLayout.java → ...tor/sample/SampleCirclesStyledLayout.java b/...rindicator/SampleCirclesStyledLayout.java → ...tor/sample/SampleCirclesStyledLayout.java
@@ -1,8 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.R;
 
 public class SampleCirclesStyledLayout extends BaseSampleActivity {
 	@Override

diff --git a/...indicator/SampleCirclesStyledMethods.java → ...or/sample/SampleCirclesStyledMethods.java b/...indicator/SampleCirclesStyledMethods.java → ...or/sample/SampleCirclesStyledMethods.java
@@ -1,8 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.R;
 
 public class SampleCirclesStyledMethods extends BaseSampleActivity {
 	@Override

diff --git a/...erindicator/SampleCirclesStyledTheme.java → ...ator/sample/SampleCirclesStyledTheme.java b/...erindicator/SampleCirclesStyledTheme.java → ...ator/sample/SampleCirclesStyledTheme.java
@@ -1,8 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.R;
 
 public class SampleCirclesStyledTheme extends BaseSampleActivity {
 	@Override

diff --git a/...rindicator/SampleCirclesWithListener.java → ...tor/sample/SampleCirclesWithListener.java b/...rindicator/SampleCirclesWithListener.java → ...tor/sample/SampleCirclesWithListener.java
@@ -1,9 +1,10 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.widget.Toast;
 import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.R;
 
 public class SampleCirclesWithListener extends BaseSampleActivity {
 	@Override

diff --git a/...ewpagerindicator/SampleTitlesDefault.java → ...indicator/sample/SampleTitlesDefault.java b/...ewpagerindicator/SampleTitlesDefault.java → ...indicator/sample/SampleTitlesDefault.java
@@ -1,7 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
+
+import com.viewpagerindicator.R;
 import com.viewpagerindicator.TitlePageIndicator;
 
 public class SampleTitlesDefault extends BaseSampleActivity {

diff --git a/...gerindicator/SampleTitlesInitialPage.java → ...cator/sample/SampleTitlesInitialPage.java b/...gerindicator/SampleTitlesInitialPage.java → ...cator/sample/SampleTitlesInitialPage.java
@@ -1,7 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
+
+import com.viewpagerindicator.R;
 import com.viewpagerindicator.TitlePageIndicator;
 
 public class SampleTitlesInitialPage extends BaseSampleActivity {

diff --git a/...erindicator/SampleTitlesStyledLayout.java → ...ator/sample/SampleTitlesStyledLayout.java b/...erindicator/SampleTitlesStyledLayout.java → ...ator/sample/SampleTitlesStyledLayout.java
@@ -1,7 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
+
+import com.viewpagerindicator.R;
 import com.viewpagerindicator.TitlePageIndicator;
 
 public class SampleTitlesStyledLayout extends BaseSampleActivity {

diff --git a/...rindicator/SampleTitlesStyledMethods.java → ...tor/sample/SampleTitlesStyledMethods.java b/...rindicator/SampleTitlesStyledMethods.java → ...tor/sample/SampleTitlesStyledMethods.java
@@ -1,7 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
+
+import com.viewpagerindicator.R;
 import com.viewpagerindicator.TitlePageIndicator;
 import com.viewpagerindicator.TitlePageIndicator.IndicatorStyle;
 

diff --git a/...gerindicator/SampleTitlesStyledTheme.java → ...cator/sample/SampleTitlesStyledTheme.java b/...gerindicator/SampleTitlesStyledTheme.java → ...cator/sample/SampleTitlesStyledTheme.java
@@ -1,7 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
+
+import com.viewpagerindicator.R;
 import com.viewpagerindicator.TitlePageIndicator;
 
 public class SampleTitlesStyledTheme extends BaseSampleActivity {

diff --git a/...pagerindicator/SampleTitlesUnderline.java → ...dicator/sample/SampleTitlesUnderline.java b/...pagerindicator/SampleTitlesUnderline.java → ...dicator/sample/SampleTitlesUnderline.java
@@ -1,7 +1,9 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
+
+import com.viewpagerindicator.R;
 import com.viewpagerindicator.TitlePageIndicator;
 import com.viewpagerindicator.TitlePageIndicator.IndicatorStyle;
 

diff --git a/...erindicator/SampleTitlesWithListener.java → ...ator/sample/SampleTitlesWithListener.java b/...erindicator/SampleTitlesWithListener.java → ...ator/sample/SampleTitlesWithListener.java
@@ -1,8 +1,10 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.widget.Toast;
+
+import com.viewpagerindicator.R;
 import com.viewpagerindicator.TitlePageIndicator;
 
 public class SampleTitlesWithListener extends BaseSampleActivity {

diff --git a/.../com/viewpagerindicator/TestFragment.java → ...ewpagerindicator/sample/TestFragment.java b/.../com/viewpagerindicator/TestFragment.java → ...ewpagerindicator/sample/TestFragment.java
@@ -1,4 +1,4 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;

diff --git a/...ewpagerindicator/TestFragmentAdapter.java → ...indicator/sample/TestFragmentAdapter.java b/...ewpagerindicator/TestFragmentAdapter.java → ...indicator/sample/TestFragmentAdapter.java
@@ -1,4 +1,4 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;

diff --git a/...erindicator/TestTitleFragmentAdapter.java → ...ator/sample/TestTitleFragmentAdapter.java b/...erindicator/TestTitleFragmentAdapter.java → ...ator/sample/TestTitleFragmentAdapter.java
@@ -1,4 +1,4 @@
-package com.viewpagerindicator;
+package com.viewpagerindicator.sample;
 
 import android.support.v4.app.FragmentManager;
 import com.viewpagerindicator.TitleProvider;