diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
index ea2d96703..a192bfaef 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
@@ -172,17 +172,17 @@ public class MainActivity extends AppCompatActivity
fragmentTag = "HOME_TIMELINE";
break;
case 1:
+ fragmentTag = "NOTIFICATIONS";
+ item = navigationView.getMenu().findItem(R.id.nav_notification);
+ break;
+ case 2:
fragmentTag = "LOCAL_TIMELINE";
item = navigationView.getMenu().findItem(R.id.nav_local);
break;
- case 2:
+ case 3:
item = navigationView.getMenu().findItem(R.id.nav_global);
fragmentTag = "PUBLIC_TIMELINE";
break;
- case 3:
- fragmentTag = "NOTIFICATIONS";
- item = navigationView.getMenu().findItem(R.id.nav_notification);
- break;
}
if( item != null){
toolbarTitle.setText(item.getTitle());
@@ -401,7 +401,7 @@ public class MainActivity extends AppCompatActivity
if (extras.getInt(INTENT_ACTION) == NOTIFICATION_INTENT){
changeUser(MainActivity.this, userIdIntent, false); //Connects the account which is related to the notification
unCheckAllMenuItems(navigationView);
- tabLayout.getTabAt(3).select();
+ tabLayout.getTabAt(1).select();
matchingIntent = true;
}else if( extras.getInt(INTENT_ACTION) == HOME_TIMELINE_INTENT){
changeUser(MainActivity.this, userIdIntent, true); //Connects the account which is related to the notification
@@ -471,16 +471,16 @@ public class MainActivity extends AppCompatActivity
navigationView.getMenu().findItem(R.id.nav_home).setChecked(true);
break;
case 1:
+ toolbarTitle.setText(R.string.notifications);
+ navigationView.getMenu().findItem(R.id.nav_notification).setChecked(true);
+ break;
+ case 2:
toolbarTitle.setText(R.string.local_menu);
navigationView.getMenu().findItem(R.id.nav_local).setChecked(true);
break;
- case 2:
- toolbarTitle.setText(R.string.global_menu);
- navigationView.getMenu().findItem(R.id.nav_global).setChecked(true);
- break;
case 3:
- toolbarTitle.setText(R.string.notifications);
- navigationView.getMenu().findItem(R.id.nav_notification).setChecked(true);
+ toolbarTitle.setText(R.string.global_menu);
+ navigationView.getMenu().findItem(R.id.nav_global).setChecked(true);
break;
}
}
@@ -648,15 +648,15 @@ public class MainActivity extends AppCompatActivity
//noinspection ConstantConditions
tabLayout.getTabAt(0).select();
return true;
- } else if (id == R.id.nav_local) {
+ } else if( id == R.id.nav_notification){
//noinspection ConstantConditions
tabLayout.getTabAt(1).select();
return true;
- } else if (id == R.id.nav_global) {
+ }else if (id == R.id.nav_local) {
//noinspection ConstantConditions
tabLayout.getTabAt(2).select();
return true;
- } else if( id == R.id.nav_notification){
+ } else if (id == R.id.nav_global) {
//noinspection ConstantConditions
tabLayout.getTabAt(3).select();
return true;
@@ -787,18 +787,19 @@ public class MainActivity extends AppCompatActivity
statusFragment.setArguments(bundle);
return statusFragment;
case 1:
+ return new DisplayNotificationsFragment();
+
+ case 2:
statusFragment = new DisplayStatusFragment();
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.LOCAL);
statusFragment.setArguments(bundle);
return statusFragment;
- case 2:
+ case 3:
statusFragment = new DisplayStatusFragment();
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.PUBLIC);
statusFragment.setArguments(bundle);
return statusFragment;
- case 3:
- return new DisplayNotificationsFragment();
}
return null;
diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml
index c18ed88e5..653efc0b0 100644
--- a/app/src/main/res/layout-sw600dp/activity_main.xml
+++ b/app/src/main/res/layout-sw600dp/activity_main.xml
@@ -93,6 +93,12 @@
android:layout_height="wrap_content"
android:icon="@drawable/ic_action_home_tl"/>
+
+
-
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f5841b11f..c433a3a15 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -86,21 +86,25 @@
android:layout_height="wrap_content"
android:id="@+id/tab_home"
android:icon="@drawable/ic_action_home_tl"/>
-
-
+
+
+
+
+
+