Applies changes to main tool bar
|
@ -125,7 +125,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
private HashMap<String, String> tagTile = new HashMap<>();
|
private HashMap<String, String> tagTile = new HashMap<>();
|
||||||
private HashMap<String, Integer> tagItem = new HashMap<>();
|
private HashMap<String, Integer> tagItem = new HashMap<>();
|
||||||
private TextView toolbarTitle;
|
private TextView toolbarTitle;
|
||||||
private ImageView pp_actionBar;
|
|
||||||
private SearchView toolbar_search;
|
private SearchView toolbar_search;
|
||||||
private ImageLoader imageLoader;
|
private ImageLoader imageLoader;
|
||||||
private DisplayImageOptions options;
|
private DisplayImageOptions options;
|
||||||
|
@ -223,7 +222,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
||||||
setSupportActionBar(toolbar);
|
setSupportActionBar(toolbar);
|
||||||
toolbarTitle = (TextView) toolbar.findViewById(R.id.toolbar_title);
|
toolbarTitle = (TextView) toolbar.findViewById(R.id.toolbar_title);
|
||||||
pp_actionBar = (ImageView) toolbar.findViewById(R.id.pp_actionBar);
|
|
||||||
toolbar_search = (SearchView) toolbar.findViewById(R.id.toolbar_search);
|
toolbar_search = (SearchView) toolbar.findViewById(R.id.toolbar_search);
|
||||||
tabLayout = (TabLayout) findViewById(R.id.tabLayout);
|
tabLayout = (TabLayout) findViewById(R.id.tabLayout);
|
||||||
TabLayout.Tab tabHome = tabLayout.newTab();
|
TabLayout.Tab tabHome = tabLayout.newTab();
|
||||||
|
@ -295,29 +293,9 @@ public class MainActivity extends AppCompatActivity
|
||||||
} else {
|
} else {
|
||||||
stackBack.push(tab.getPosition());
|
stackBack.push(tab.getPosition());
|
||||||
}
|
}
|
||||||
final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
|
|
||||||
MenuItem item = null;
|
|
||||||
String fragmentTag = null;
|
|
||||||
main_app_container.setVisibility(View.GONE);
|
main_app_container.setVisibility(View.GONE);
|
||||||
viewPager.setVisibility(View.VISIBLE);
|
viewPager.setVisibility(View.VISIBLE);
|
||||||
Helper.switchLayout(MainActivity.this);
|
Helper.switchLayout(MainActivity.this);
|
||||||
if( tab.getPosition() == 0) {
|
|
||||||
fragmentTag = "HOME_TIMELINE";
|
|
||||||
}else if( tab.getPosition() == 1) {
|
|
||||||
fragmentTag = "NOTIFICATIONS";
|
|
||||||
}else if( tab.getPosition() == 2 && display_local) {
|
|
||||||
fragmentTag = "LOCAL_TIMELINE";
|
|
||||||
}else if( tab.getPosition() == 2 && !display_local) {
|
|
||||||
fragmentTag = "PUBLIC_TIMELINE";
|
|
||||||
}else if( tab.getPosition() == 3){
|
|
||||||
fragmentTag = "PUBLIC_TIMELINE";
|
|
||||||
}
|
|
||||||
if( item != null){
|
|
||||||
toolbarTitle.setText(item.getTitle());
|
|
||||||
populateTitleWithTag(fragmentTag, item.getTitle().toString(), item.getItemId());
|
|
||||||
unCheckAllMenuItems(navigationView);
|
|
||||||
item.setChecked(true);
|
|
||||||
}
|
|
||||||
if( tab.getPosition() != 1 )
|
if( tab.getPosition() != 1 )
|
||||||
toot.setVisibility(View.VISIBLE);
|
toot.setVisibility(View.VISIBLE);
|
||||||
else
|
else
|
||||||
|
@ -431,7 +409,7 @@ public class MainActivity extends AppCompatActivity
|
||||||
toolbar_search.setQuery("", false);
|
toolbar_search.setQuery("", false);
|
||||||
toolbar_search.setIconified(true);
|
toolbar_search.setIconified(true);
|
||||||
toolbarTitle.setVisibility(View.VISIBLE);
|
toolbarTitle.setVisibility(View.VISIBLE);
|
||||||
pp_actionBar.setVisibility(View.VISIBLE);
|
tabLayout.setVisibility(View.VISIBLE);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
@ -445,8 +423,17 @@ public class MainActivity extends AppCompatActivity
|
||||||
toolbar_search.setOnCloseListener(new SearchView.OnCloseListener() {
|
toolbar_search.setOnCloseListener(new SearchView.OnCloseListener() {
|
||||||
@Override
|
@Override
|
||||||
public boolean onClose() {
|
public boolean onClose() {
|
||||||
toolbarTitle.setVisibility(View.VISIBLE);
|
if( main_app_container.getVisibility() == View.VISIBLE){
|
||||||
pp_actionBar.setVisibility(View.VISIBLE);
|
main_app_container.setVisibility(View.VISIBLE);
|
||||||
|
viewPager.setVisibility(View.GONE);
|
||||||
|
tabLayout.setVisibility(View.GONE);
|
||||||
|
toolbarTitle.setVisibility(View.VISIBLE);
|
||||||
|
}else {
|
||||||
|
main_app_container.setVisibility(View.GONE);
|
||||||
|
viewPager.setVisibility(View.VISIBLE);
|
||||||
|
tabLayout.setVisibility(View.VISIBLE);
|
||||||
|
toolbarTitle.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
//your code here
|
//your code here
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -455,11 +442,20 @@ public class MainActivity extends AppCompatActivity
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if( toolbar_search.isIconified()){
|
if( toolbar_search.isIconified()){
|
||||||
toolbarTitle.setVisibility(View.VISIBLE);
|
if( main_app_container.getVisibility() == View.VISIBLE){
|
||||||
pp_actionBar.setVisibility(View.VISIBLE);
|
main_app_container.setVisibility(View.VISIBLE);
|
||||||
|
viewPager.setVisibility(View.GONE);
|
||||||
|
tabLayout.setVisibility(View.GONE);
|
||||||
|
toolbarTitle.setVisibility(View.VISIBLE);
|
||||||
|
}else {
|
||||||
|
main_app_container.setVisibility(View.GONE);
|
||||||
|
viewPager.setVisibility(View.VISIBLE);
|
||||||
|
tabLayout.setVisibility(View.VISIBLE);
|
||||||
|
toolbarTitle.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
}else {
|
}else {
|
||||||
toolbarTitle.setVisibility(View.GONE);
|
toolbarTitle.setVisibility(View.GONE);
|
||||||
pp_actionBar.setVisibility(View.GONE);
|
tabLayout.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -697,9 +693,11 @@ public class MainActivity extends AppCompatActivity
|
||||||
super.onBackPressed();
|
super.onBackPressed();
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
viewPager.setVisibility(View.VISIBLE);
|
|
||||||
Helper.switchLayout(MainActivity.this);
|
Helper.switchLayout(MainActivity.this);
|
||||||
main_app_container.setVisibility(View.GONE);
|
main_app_container.setVisibility(View.GONE);
|
||||||
|
viewPager.setVisibility(View.VISIBLE);
|
||||||
|
tabLayout.setVisibility(View.VISIBLE);
|
||||||
|
toolbarTitle.setVisibility(View.GONE);
|
||||||
final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
|
final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
|
||||||
unCheckAllMenuItems(navigationView);
|
unCheckAllMenuItems(navigationView);
|
||||||
toot.setVisibility(View.VISIBLE);
|
toot.setVisibility(View.VISIBLE);
|
||||||
|
@ -915,8 +913,6 @@ public class MainActivity extends AppCompatActivity
|
||||||
item.setChecked(true);
|
item.setChecked(true);
|
||||||
//Remove the search bar
|
//Remove the search bar
|
||||||
if( !toolbar_search.isIconified() ) {
|
if( !toolbar_search.isIconified() ) {
|
||||||
toolbarTitle.setVisibility(View.VISIBLE);
|
|
||||||
pp_actionBar.setVisibility(View.VISIBLE);
|
|
||||||
toolbar_search.setIconified(true);
|
toolbar_search.setIconified(true);
|
||||||
}
|
}
|
||||||
toolbarTitle.setText(item.getTitle());
|
toolbarTitle.setText(item.getTitle());
|
||||||
|
@ -929,6 +925,7 @@ public class MainActivity extends AppCompatActivity
|
||||||
main_app_container.setVisibility(View.VISIBLE);
|
main_app_container.setVisibility(View.VISIBLE);
|
||||||
viewPager.setVisibility(View.GONE);
|
viewPager.setVisibility(View.GONE);
|
||||||
tabLayout.setVisibility(View.GONE);
|
tabLayout.setVisibility(View.GONE);
|
||||||
|
toolbarTitle.setVisibility(View.VISIBLE);
|
||||||
if (id == R.id.nav_settings) {
|
if (id == R.id.nav_settings) {
|
||||||
toot.setVisibility(View.GONE);
|
toot.setVisibility(View.GONE);
|
||||||
TabLayoutSettingsFragment tabLayoutSettingsFragment= new TabLayoutSettingsFragment();
|
TabLayoutSettingsFragment tabLayoutSettingsFragment= new TabLayoutSettingsFragment();
|
||||||
|
@ -1060,7 +1057,7 @@ public class MainActivity extends AppCompatActivity
|
||||||
//Remove the search bar
|
//Remove the search bar
|
||||||
if( !toolbar_search.isIconified() ) {
|
if( !toolbar_search.isIconified() ) {
|
||||||
toolbarTitle.setVisibility(View.VISIBLE);
|
toolbarTitle.setVisibility(View.VISIBLE);
|
||||||
pp_actionBar.setVisibility(View.VISIBLE);
|
tabLayout.setVisibility(View.VISIBLE);
|
||||||
toolbar_search.setIconified(true);
|
toolbar_search.setIconified(true);
|
||||||
}
|
}
|
||||||
//Selection comes from another menu, no action to do
|
//Selection comes from another menu, no action to do
|
||||||
|
|
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 353 B |
Before Width: | Height: | Size: 257 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 171 B After Width: | Height: | Size: 247 B |
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 439 B |
Before Width: | Height: | Size: 349 B After Width: | Height: | Size: 646 B |
Before Width: | Height: | Size: 416 B After Width: | Height: | Size: 1.5 KiB |
|
@ -1,141 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright 2017 Thomas Schneider
|
|
||||||
|
|
||||||
This file is a part of Mastalab
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it under the terms of the
|
|
||||||
GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
|
||||||
License, or (at your option) any later version.
|
|
||||||
|
|
||||||
Mastalab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
|
||||||
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
|
||||||
Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License along with Mastalab; if not,
|
|
||||||
see <http://www.gnu.org/licenses>
|
|
||||||
-->
|
|
||||||
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:id="@+id/drawer_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:fitsSystemWindows="true"
|
|
||||||
tools:openDrawer="start">
|
|
||||||
|
|
||||||
<android.support.design.widget.CoordinatorLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context="mastodon.etalab.gouv.fr.mastodon.fr.etalab.gouv.fr.mastodon.activities.MainActivity">
|
|
||||||
|
|
||||||
<android.support.design.widget.AppBarLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:theme="@style/AppTheme.AppBarOverlay"
|
|
||||||
>
|
|
||||||
<android.support.v7.widget.Toolbar
|
|
||||||
android:id="@+id/toolbar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:background="?attr/colorPrimary"
|
|
||||||
app:popupTheme="?attr/popupOverlay">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/toolbar_search_container"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="40dp"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/pp_actionBar"
|
|
||||||
android:layout_width="30dp"
|
|
||||||
android:layout_height="30dp"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
tools:ignore="ContentDescription"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/toolbar_title"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:textSize="16sp"/>
|
|
||||||
|
|
||||||
<android.support.v7.widget.SearchView
|
|
||||||
android:id="@+id/toolbar_search"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:background="@null"
|
|
||||||
android:gravity="end"/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</android.support.v7.widget.Toolbar>
|
|
||||||
<android.support.design.widget.TabLayout
|
|
||||||
android:id="@+id/tabLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="60dp"
|
|
||||||
app:tabGravity="fill"
|
|
||||||
app:tabMaxWidth="0dp"
|
|
||||||
app:tabSelectedTextColor="?attr/colorAccent"/>
|
|
||||||
</android.support.design.widget.AppBarLayout>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Framelayout to display Fragments -->
|
|
||||||
<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/viewpager"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
|
||||||
tools:context="mastodon.etalab.gouv.fr.mastodon.fr.etalab.gouv.fr.mastodon.activities.MainActivity"
|
|
||||||
>
|
|
||||||
</android.support.v4.view.ViewPager>
|
|
||||||
|
|
||||||
<!-- Framelayout to display Fragments -->
|
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:id="@+id/main_app_container"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
|
||||||
tools:context="mastodon.etalab.gouv.fr.mastodon.fr.etalab.gouv.fr.mastodon.activities.MainActivity"
|
|
||||||
>
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
|
||||||
android:id="@+id/toot"
|
|
||||||
android:layout_width="60dp"
|
|
||||||
android:layout_height="60dp"
|
|
||||||
android:layout_gravity="bottom|end"
|
|
||||||
android:layout_margin="@dimen/fab_margin"
|
|
||||||
app:srcCompat="@drawable/ic_action_edit" />
|
|
||||||
|
|
||||||
</android.support.design.widget.CoordinatorLayout>
|
|
||||||
|
|
||||||
<android.support.design.widget.NavigationView
|
|
||||||
android:id="@+id/nav_view"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_gravity="start"
|
|
||||||
android:fitsSystemWindows="false"
|
|
||||||
app:headerLayout="@layout/nav_header_main"
|
|
||||||
app:menu="@menu/activity_main_drawer" />
|
|
||||||
|
|
||||||
</android.support.v4.widget.DrawerLayout>
|
|
|
@ -47,16 +47,9 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="40dp"
|
android:layout_height="40dp"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
|
||||||
android:id="@+id/pp_actionBar"
|
|
||||||
android:layout_width="30dp"
|
|
||||||
android:layout_height="30dp"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
tools:ignore="ContentDescription" />
|
|
||||||
<TextView
|
<TextView
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
|