fix #6: Select first row of notifications after refresh on tablet

wordpress-mobile · Sep 23, 2013 · 1702e8b · 1702e8b
1 parent 105d47a
commit 1702e8b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/res/layout-sw600dp/notifications.xml b/res/layout-sw600dp/notifications.xml
@@ -15,6 +15,7 @@
       <fragment
         android:name="org.wordpress.android.ui.notifications.NotificationsListFragment"
         android:id="@+id/notes_list"
+        android:tag="tablet-view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
     </FrameLayout>

diff --git a/res/layout-sw720dp/notifications.xml b/res/layout-sw720dp/notifications.xml
@@ -15,6 +15,7 @@
       <fragment
         android:name="org.wordpress.android.ui.notifications.NotificationsListFragment"
         android:id="@+id/notes_list"
+        android:tag="tablet-view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
     </FrameLayout>

diff --git a/src/org/wordpress/android/ui/notifications/NotificationsActivity.java b/src/org/wordpress/android/ui/notifications/NotificationsActivity.java
@@ -75,6 +75,9 @@ public void onCreate(Bundle savedInstanceState){
         mNotesList.setNoteProvider(new NoteProvider());
         mNotesList.setOnNoteClickListener(new NoteClickListener());
 
+        // Load notes
+        notes = WordPress.wpDB.loadNotes();
+
         fragmentDetectors.add(new FragmentDetector(){
             @Override
             public Fragment getFragment(Note note){
@@ -85,15 +88,15 @@ public Fragment getFragment(Note note){
                 return null;
             }
         });
-        fragmentDetectors.add(new FragmentDetector(){
-           @Override
-           public Fragment getFragment(Note note){
-               if (note.isSingleLineListTemplate()) {
-                   Fragment fragment = new SingleLineListFragment();
-                   return fragment;
-               }
-               return null;
-           } 
+        fragmentDetectors.add(new FragmentDetector() {
+            @Override
+            public Fragment getFragment(Note note) {
+                if (note.isSingleLineListTemplate()) {
+                    Fragment fragment = new SingleLineListFragment();
+                    return fragment;
+                }
+                return null;
+            }
         });
         fragmentDetectors.add(new FragmentDetector(){
             @Override
@@ -112,8 +115,6 @@ public Fragment getFragment(Note note){
         if (savedInstanceState == null)
             launchWithNoteId();
 
-        // Load notes
-        notes = WordPress.wpDB.loadNotes();
         refreshNotificationsListFragment(notes);
 
         if (savedInstanceState != null)
@@ -160,7 +161,6 @@ private void launchWithNoteId(){
                 openNote(note);
             }
         } else if (intent.hasExtra(NOTE_ID_EXTRA)) {
-            // FIXME: check if in DB and not placeholder...
             // find it/load it etc
             Map<String, String> params = new HashMap<String, String>();
             params.put("ids", intent.getStringExtra(NOTE_ID_EXTRA));
@@ -176,9 +176,20 @@ public void onNotes(List<Note> notes){
             };
             restClient.getNotifications(params, handler, handler);
         } else {
+            // on a tablet: open first note if none selected
+            String fragmentTag = mNotesList.getTag();
+            if (fragmentTag != null && fragmentTag.equals("tablet-view")) {
+                if (notes != null && notes.size() > 0) {
+                    Note note = notes.get(0);
+                    if (note != null) {
+                        openNote(note);
+                    }
+                }
+            }
             refreshNotes();
         }
     }
+
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.equals(mRefreshMenuItem)) {