@Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
- Toolbar menu_toolbar = (Toolbar) getActivity().findViewById(R.id.menu_toolbar);
+ Toolbar menuToolbar = (Toolbar) getActivity().findViewById(R.id.menu_toolbar);
- if (menu_toolbar != null)
- menu_toolbar.inflateMenu(R.menu.menu_fragment);
+ if (menuToolbar != null)
+ menuToolbar.inflateMenu(R.menu.menu_fragment);
}
@Override public void onPrepareOptionsMenu(Menu menu) {
- Toolbar menu_toolbar = (Toolbar) getActivity().findViewById(R.id.menu_toolbar);
// Compute main filters icon visibility
boolean isDossierList = (mViewSwitcher.getDisplayedChild() == 1);
boolean isInLandscape = (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
- MenuItem filterItem = menu_toolbar.getMenu().findItem(R.id.menu_fragment_filter_selection_item);
+ Toolbar menuToolbar = (Toolbar) getActivity().findViewById(R.id.menu_toolbar);
+ MenuItem filterItem = menuToolbar.getMenu().findItem(R.id.menu_fragment_filter_selection_item);
filterItem.setVisible(isDossierList && isInLandscape);
filterItem.setIcon((MyFilters.INSTANCE.getSelectedFilter() != null) ? R.drawable.ic_filter_list_white_24dp : R.drawable.ic_no_filter_white_24dp);
// No filter button (if any filter is available)
List<Filter> filterList = MyFilters.INSTANCE.getFilters();
+// ImageButton filterListPortraitButton = (ImageButton) getActivity().findViewById(R.id.navigation_drawer_filters_menu_header_filters_imagebutton);
SubMenu filterSubMenu = filterItem.getSubMenu();
filterSubMenu.clear();
public static final String REQUEST_JSON_FILTER_TITLE = "cm:title";
public static final String REQUEST_JSON_FILTER_AND = "and";
public static final String REQUEST_JSON_FILTER_OR = "or";
-
- public static final String DEFAULT_ID = "default-filter";
public static final String EDIT_FILTER_ID = "edit-filter";
private static final State DEFAULT_STATE = State.A_TRAITER;
mSubTypeList = new ArrayList<>();
}
-// public Filter(Filter filter) {
-// if (filter.mId.equals(DEFAULT_ID) || filter.mId.equals(EDIT_FILTER_ID)) {
-// mId = UUID.randomUUID().toString();
-// }
-// else {
-// mId = filter.mId;
-// }
-// mName = filter.mName;
-// mTitle = filter.mTitle;
-// mState = filter.mState;
-// mTypeList = filter.mTypeList;
-// mSubTypeList = filter.mSubTypeList;
-// mBeginDate = filter.mBeginDate;
-// mEndDate = filter.mEndDate;
-// }
-
private Filter(Parcel in) {
mId = in.readString();
mName = in.readString();
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:background="@color/primary_500"
+ android:elevation="4dp"
android:orientation="horizontal"
- android:visibility="visible">
+ android:visibility="visible"
+ tools:ignore="UnusedAttribute">
<android.support.v7.widget.Toolbar
android:id="@+id/menu_toolbar"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
- android:background="@color/primary_500"
- android:elevation="4dp"
android:popupTheme="@style/ThemeOverlay.AppCompat.Light"
- android:theme="@style/AppTheme.Main.Toolbar"
- tools:ignore="UnusedAttribute" />
+ android:theme="@style/AppTheme.Main.Toolbar" />
<android.support.v7.widget.Toolbar
android:id="@+id/actions_toolbar"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize"
- android:background="@color/primary_500"
- android:elevation="4dp"
android:popupTheme="@style/ThemeOverlay.AppCompat.Light"
android:theme="@style/AppTheme.Main.Toolbar"
tools:ignore="UnusedAttribute" />
android:layout_height="178dp"
android:background="@drawable/navigation_drawer_header_gradient" />
- <TextView
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:padding="25dp"
- android:text="@string/parapheurs"
- android:textColor="@color/text_white"
- android:textSize="14sp" />
+ android:orientation="horizontal"
+ android:padding="25dp">
+
+ <TextView
+ android:id="@+id/navigation_drawer_filters_menu_header_title"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="16dp"
+ android:layout_marginRight="16dp"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="bottom"
+ android:maxLines="1"
+ android:text="@string/parapheurs"
+ android:textColor="@color/text_white"
+ android:textSize="14sp" />
+
+ <ImageButton
+ android:id="@+id/navigation_drawer_filters_menu_header_filters_imagebutton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent"
+ android:contentDescription="@string/Filter_selection"
+ android:src="@drawable/ic_filter_list_white_24dp" />
+ </LinearLayout>
<View
android:id="@+id/navigation_drawer_fake_status_bar"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:background="@color/primary_500"
+ android:elevation="4dp"
android:orientation="horizontal"
- android:visibility="visible">
+ android:visibility="visible"
+ tools:ignore="UnusedAttribute">
<android.support.v7.widget.Toolbar
android:id="@+id/menu_toolbar"
android:layout_width="@dimen/left_menu_size"
android:layout_height="?attr/actionBarSize"
- android:background="@color/primary_500"
- android:elevation="4dp"
android:popupTheme="@style/ThemeOverlay.AppCompat.Light"
- android:theme="@style/AppTheme.Main.Toolbar"
- tools:ignore="UnusedAttribute" />
+ android:theme="@style/AppTheme.Main.Toolbar" />
<android.support.v7.widget.Toolbar
android:id="@+id/actions_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:background="@color/primary_500"
- android:elevation="4dp"
android:popupTheme="@style/ThemeOverlay.AppCompat.Light"
- android:theme="@style/AppTheme.Main.Toolbar"
- tools:ignore="UnusedAttribute" />
+ android:theme="@style/AppTheme.Main.Toolbar" />
</LinearLayout>
\ No newline at end of file
<item
android:id="@+id/menu_fragment_filter_selection_item"
android:icon="@drawable/ic_filter_list_white_24dp"
- android:title="@string/filter_selection"
+ android:title="@string/Filter_selection"
iparapheur:showAsAction="ifRoom">
<menu />
</item>
<string name="action_dossiers">dossiers</string>
<string name="action_filtrer">Filtrer</string>
<string name="document_selection">Sélection du document</string>
- <string name="filter_selection">Sélection du filtre</string>
+ <string name="Filter_selection">Sélection du filtre</string>
<string name="password">Mot de passe</string>
<string name="Mandatory">Obligatoire</string>
<string name="Optional">Facultatif</string>