Week 6 Exercise 2a: Display the map

ThoughtWorksAustralia · May 3, 2014 · d5976f1 · d5976f1
1 parent ac29230
commit d5976f1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/...Bootcamp/src/androidTest/java/com/thoughtworks/androidbootcamp/test/HelloAndroidTest.java b/...Bootcamp/src/androidTest/java/com/thoughtworks/androidbootcamp/test/HelloAndroidTest.java
@@ -11,6 +11,8 @@
 import static com.google.android.apps.common.testing.ui.espresso.action.ViewActions.click;
 import static com.google.android.apps.common.testing.ui.espresso.action.ViewActions.typeText;
 import static com.google.android.apps.common.testing.ui.espresso.assertion.ViewAssertions.matches;
+import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
+import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.withId;
 import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.containsString;
@@ -61,7 +63,7 @@ public void testMap() throws InterruptedException {
 
  When.iOpenTheMenuAndSelectItem("Map");
 
- onView(withId(R.id.section_label)).check(matches(withText(containsString("Map:"))));
+ onView(withId(R.id.map)).check(matches(withEffectiveVisibility(VISIBLE)));
  }
 
 

diff --git a/AndroidBootcamp/src/main/java/com/thoughtworks/androidbootcamp/controller/HelloAndroid.java b/AndroidBootcamp/src/main/java/com/thoughtworks/androidbootcamp/controller/HelloAndroid.java
@@ -11,7 +11,7 @@
 
 import com.thoughtworks.androidbootcamp.R;
 import com.thoughtworks.androidbootcamp.controller.fragment.HighScoresFragment;
-import com.thoughtworks.androidbootcamp.controller.fragment.MapFragment;
+import com.thoughtworks.androidbootcamp.controller.fragment.TreasureMapFragment;
 import com.thoughtworks.androidbootcamp.controller.fragment.TreasureListFragment;
 import com.thoughtworks.androidbootcamp.model.Game;
 import com.thoughtworks.androidbootcamp.model.Treasure;
@@ -145,7 +145,7 @@ public boolean onNavigationItemSelected(int position, long id) {
 
  protected void showMap() {
  getFragmentManager().beginTransaction()
- .replace(R.id.container, new MapFragment())
+ .replace(R.id.container, new TreasureMapFragment())
  .commit();
  }
 

diff --git a/...camp/controller/fragment/MapFragment.java → ...troller/fragment/TreasureMapFragment.java b/...camp/controller/fragment/MapFragment.java → ...troller/fragment/TreasureMapFragment.java
@@ -1,7 +1,6 @@
 package com.thoughtworks.androidbootcamp.controller.fragment;
 
 
-
 import android.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -11,17 +10,7 @@
 import com.thoughtworks.androidbootcamp.R;
 
 
-/**
- * A simple {@link android.support.v4.app.Fragment} subclass.
- *
- */
-public class MapFragment extends Fragment {
-
-
- public MapFragment() {
- // Required empty public constructor
- }
-
+public class TreasureMapFragment extends Fragment {
 
  @Override
  public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -30,5 +19,4 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
  return inflater.inflate(R.layout.fragment_map, container, false);
  }
 
-
 }
diff --git a/AndroidBootcamp/src/main/res/layout/fragment_map.xml b/AndroidBootcamp/src/main/res/layout/fragment_map.xml
@@ -3,13 +3,13 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:orientation="vertical"
- tools:context="com.thoughtworks.androidbootcamp.controller.fragment.MapFragment">
-
- <TextView
- android:id="@+id/section_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/map_heading"
- style="@style/SectionHeading"/>
+ tools:context="com.thoughtworks.androidbootcamp.controller.fragment.TreasureMapFragment">
 
+ <fragment xmlns:android="http:https://schemas.android.com/apk/res/android"
+ android:id="@+id/map"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:contentDescription="Map showing location of attempts"
+ android:tag="The Map"
+ android:name="com.google.android.gms.maps.MapFragment"/>
 </LinearLayout>