Set title

davedega · davedega · commit 5103fa506434 · 2018-03-27T18:37:54.000+02:00
Show search view until list is loaded
diff --git a/app/src/main/java/com/dega/backbase/RnDActivity.java b/app/src/main/java/com/dega/backbase/RnDActivity.java
@@ -2,15 +2,7 @@
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.EditText;
 
 import com.dega.backbase.model.Entry;
 import com.google.android.gms.maps.CameraUpdateFactory;
diff --git a/app/src/main/java/com/dega/backbase/RnDFragment.java b/app/src/main/java/com/dega/backbase/RnDFragment.java
@@ -9,11 +9,9 @@
 import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
@@ -40,6 +38,7 @@ public class RnDFragment extends Fragment implements RnDContract.View {
 
     private RnDContract.Presenter presenter;
 
+    private LinearLayout searchContainer;
     private LinearLayout loadingContainer;
     private ListView listView;
     private ProgressBar progressBar;
@@ -80,6 +79,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
             }
         });
         progressBar = rootView.findViewById(R.id.progressBar);
+        searchContainer = rootView.findViewById(R.id.searchContainer);
         loadingContainer = rootView.findViewById(R.id.loadingContainer);
 
         rootView.findViewById(R.id.clearImageView).setOnClickListener(new View.OnClickListener() {
@@ -151,6 +151,7 @@ public void setPresenter(RnDContract.Presenter presenter) {
 
     @Override
     public void showEntriesInList(Context context, List<Entry> loadedEntries) {
+        showSearchCity();
         this.originalentries = new ArrayList<>();
         this.originalentries.addAll(loadedEntries);
         this.entries = loadedEntries;
@@ -168,7 +169,7 @@ public void showErrorMessage(int message) {
 
     @Override
     public void showSearchCity() {
-
+        searchContainer.setVisibility(View.VISIBLE);
     }
 
     // The Adapter lives within the view since is the only class who access it
@@ -193,6 +194,5 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
             textView.setText(entries.get(position).toString());
             return rowView;
         }
-
     }
 }
diff --git a/app/src/main/java/com/dega/backbase/RnDPresenter.java b/app/src/main/java/com/dega/backbase/RnDPresenter.java
@@ -27,16 +27,11 @@ public class RnDPresenter implements RnDContract.Presenter {
     private RnDContract.View view;
     private List<Entry> entries;
 
-
-    public List<Entry> getEntries() {
-        return entries;
-    }
-
-    public void setEntries(List<Entry> entries) {
+    void setEntries(List<Entry> entries) {
         this.entries = entries;
     }
 
-    public RnDPresenter() {
+    RnDPresenter() {
     }
 
     RnDPresenter(Context context, RnDContract.View view) {
@@ -120,13 +115,21 @@ protected void onPostExecute(List<Entry> entries) {
     }
 
 
-    private List<Entry> sortAlphabetical(List<Entry> entries) {
+    public List<Entry> sortAlphabetical(List<Entry> entries) {
         Collections.sort(entries, new Comparator<Entry>() {
             @Override
             public int compare(Entry entry1, Entry entry2) {
                 String s1 = entry1.getName();
                 String s2 = entry2.getName();
-                return s1.compareToIgnoreCase(s2);
+                int i = s1.compareToIgnoreCase(s2);
+                if(i !=0) return i;
+
+                String c1 = entry1.getCountry();
+                String c2 = entry2.getCountry();
+                i = c1.compareToIgnoreCase(c2);
+
+                return i;
+
             }
         });
 
diff --git a/app/src/main/java/com/dega/backbase/model/EntriesResponse.java b/app/src/main/java/com/dega/backbase/model/EntriesResponse.java
diff --git a/app/src/main/java/com/dega/backbase/model/Entry.java b/app/src/main/java/com/dega/backbase/model/Entry.java
@@ -1,9 +1,5 @@
 package com.dega.backbase.model;
 
-import android.support.annotation.NonNull;
-
-import java.util.Comparator;
-
 /**
  * Created by davedega on 25/03/18.
  */
diff --git a/app/src/main/res/layout/action_bar_layout.xml b/app/src/main/res/layout/action_bar_layout.xml
@@ -4,6 +4,7 @@
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    app:title="@string/app_name"
     android:background="?attr/colorPrimary"
     android:minHeight="?attr/actionBarSize"
     android:theme="?attr/actionBarTheme"
@@ -16,7 +17,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal"
-        android:visibility="visible">
+        android:visibility="gone">
 
         <EditText
             android:id="@+id/searchEditText"
diff --git a/app/src/test/java/com/dega/backbase/PresenterTest.java b/app/src/test/java/com/dega/backbase/PresenterTest.java
@@ -8,7 +8,6 @@
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import java.util.TreeSet;
 
 import static org.junit.Assert.*;
 import static org.junit.Assert.assertTrue;
@@ -19,8 +18,8 @@
 public class PresenterTest {
 
     RnDPresenter presenter = new RnDPresenter();
-    TreeSet<Entry> entries = new TreeSet<>();
-    TreeSet<Entry> expected = new TreeSet<>();
+    HashSet<Entry> entries = new HashSet<>();
+    HashSet<Entry> expected = new HashSet<>();
     Set<Entry> result;
 
 
diff --git a/app/src/test/java/com/dega/backbase/SortTest.java b/app/src/test/java/com/dega/backbase/SortTest.java
@@ -0,0 +1,79 @@
+package com.dega.backbase;
+
+import com.dega.backbase.model.Entry;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test requirement: show cities on a scrollable list in alphabetic order (city first, country after)
+ * "Denver, US" should appear before, "Sydney, Australia"
+ * "Anaheim, US" should appear before "Denver, US"
+ * Created by davedega on 27/03/18.
+ */
+public class SortTest {
+
+    RnDPresenter presenter = new RnDPresenter();
+    List<Entry> entries = new ArrayList<>();
+    List<Entry> expected = new ArrayList<>();
+
+
+    @Before
+    public void setUp() {
+
+        presenter = new RnDPresenter();
+
+        entries.add(new Entry("ZH", "Denver"));
+        entries.add(new Entry("FG", "Denver"));
+        entries.add(new Entry("US", "Alabama"));
+        entries.add(new Entry("RT", "Alabama"));
+        entries.add(new Entry("AU", "Sydney"));
+        entries.add(new Entry("US", "Albuquerque"));
+        entries.add(new Entry("US", "Arizona"));
+        entries.add(new Entry("US", "Anaheim"));
+
+        expected.add(new Entry("RT", "Alabama"));
+        expected.add(new Entry("US", "Alabama"));
+        expected.add(new Entry("US", "Albuquerque"));
+        expected.add(new Entry("US", "Anaheim"));
+        expected.add(new Entry("US", "Arizona"));
+        expected.add(new Entry("FG", "Denver"));
+        expected.add(new Entry("ZH", "Denver"));
+        expected.add(new Entry("AU", "Sydney"));
+
+    }
+
+    @Test
+    public void sortAlphabetical() throws Exception {
+
+        List<Entry> sorted = presenter.sortAlphabetical(entries);
+
+        assertArrayEquals(sorted.toArray(), expected.toArray());
+
+        assertTrue(expected.equals(sorted));
+
+    }
+
+    @Test
+    public void sortAlphabeticalFail() throws Exception {
+
+
+//        .toArray(), expected.toArray());
+
+        assertFalse(expected.equals(entries));
+
+    }
+
+
+}
