Permalink
Browse files

working on the map step

  • Loading branch information...
1 parent 5f131da commit efdd3e9de619835559e3253a099366f5c7bdcf10 @mattia-battiston committed Feb 20, 2012
View
2 android/catchme-unit-tests/src/com/catchme/CatchmeActivityTest.java
@@ -9,7 +9,7 @@
import org.mockito.MockitoAnnotations;
import com.catchme.base.CustomTestRunner;
-import com.catchme.steps.map.WelcomePresenter;
+import com.catchme.steps.text.WelcomePresenter;
@RunWith(CustomTestRunner.class)
public class CatchmeActivityTest {
View
2 android/catchme-unit-tests/src/com/catchme/WelcomePresenterTest.java
@@ -5,7 +5,7 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import com.catchme.steps.map.WelcomePresenter;
+import com.catchme.steps.text.WelcomePresenter;
import android.content.Intent;
import android.view.View;
View
4 android/catchme/AndroidManifest.xml
@@ -25,8 +25,8 @@
</intent-filter>
</activity>
- <activity android:label="Welcome" android:name=".steps.map.WelcomeActivity"></activity>
- <activity android:label="Catchme Map" android:name=".steps.text.CatchmeMapActivity"></activity>
+ <activity android:label="Welcome" android:name=".steps.text.WelcomeActivity"></activity>
+ <activity android:label="Catchme Map" android:name=".steps.map.CatchmeMapActivity"></activity>
</application>
View
4 android/catchme/src/com/catchme/flow/AppController.java
@@ -6,8 +6,8 @@
import android.content.Context;
import android.content.Intent;
-import com.catchme.steps.map.WelcomePresenter;
-import com.catchme.steps.text.CatchmeMapPresenter;
+import com.catchme.steps.map.CatchmeMapPresenter;
+import com.catchme.steps.text.WelcomePresenter;
public class AppController {
View
2 ...atchme/steps/text/CatchmeMapActivity.java → ...catchme/steps/map/CatchmeMapActivity.java
@@ -1,4 +1,4 @@
-package com.catchme.steps.text;
+package com.catchme.steps.map;
import android.os.Bundle;
View
2 ...tchme/steps/text/CatchmeMapPresenter.java → ...atchme/steps/map/CatchmeMapPresenter.java
@@ -1,4 +1,4 @@
-package com.catchme.steps.text;
+package com.catchme.steps.map;
import android.content.Context;
import android.content.Intent;
View
4 ...om/catchme/steps/map/WelcomeActivity.java → ...m/catchme/steps/text/WelcomeActivity.java
@@ -1,12 +1,12 @@
-package com.catchme.steps.map;
+package com.catchme.steps.text;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.widget.Button;
import com.catchme.R;
-import com.catchme.steps.map.WelcomePresenter.PresenterView;
+import com.catchme.steps.text.WelcomePresenter.PresenterView;
public class WelcomeActivity extends Activity implements PresenterView {
View
2 ...m/catchme/steps/map/WelcomePresenter.java → .../catchme/steps/text/WelcomePresenter.java
@@ -1,4 +1,4 @@
-package com.catchme.steps.map;
+package com.catchme.steps.text;
import android.app.Activity;
import android.content.Context;

0 comments on commit efdd3e9

Please sign in to comment.