private SwipeRefreshLayout mDossierSwipeRefreshLayout;
private View mBureauEmptyView;
private View mDossierEmptyView;
+ private View mDossierEmptyFiltersAlertView;
// Data
private List<Bureau> mBureauList = new ArrayList<>();
mDossierListView = (ListView) view.findViewById(R.id.menu_fragment_dossier_listview);
mBureauEmptyView = view.findViewById(R.id.menu_fragment_bureaux_empty);
mDossierEmptyView = view.findViewById(R.id.menu_fragment_dossier_empty);
+ mDossierEmptyFiltersAlertView = view.findViewById(R.id.menu_fragment_dossier_empty_filter_alert_textview);
// Setting up listeners, etc
//
+ mDossierEmptyFiltersAlertView.setVisibility(isListFiltered ? View.VISIBLE : View.INVISIBLE);
super.onPrepareOptionsMenu(menu);
}
MyFilters.INSTANCE.selectFilter(null);
getActivity().invalidateOptionsMenu();
executeAsyncTask(new DossiersLoadingTask());
+
return true;
case R.id.action_add_filter:
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/no_bureaux"
- android:id="@+id/textView"
+ android:id="@+id/dossiers_list_no_dossier_textview"
android:textColor="@android:color/darker_gray"
android:textStyle="bold"
android:layout_margin="8dp"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/public_annotation"
- android:id="@+id/textView" />
+ android:id="@+id/dossiers_list_no_dossier_textview" />
<EditText
android:layout_width="match_parent"
android:ems="10"
android:id="@+id/action_import_password"
android:lines="4"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/dossiers_list_no_dossier_textview"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@android:color/background_light">
-
- <FrameLayout
- android:id="@android:id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <ListView
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:drawSelectorOnTop="false"
- android:choiceMode="singleChoice"
- android:divider="@android:color/holo_blue_light"
- android:visibility="visible"
- android:dividerHeight="1dp"/>
-
- <LinearLayout
- android:id="@android:id/empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:visibility="gone"
- android:orientation="vertical"
- android:gravity="center">
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_action_collection"
- android:contentDescription="@string/no_dossiers"
- android:clickable="true"/>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:text="@string/no_dossiers"
- android:id="@+id/textView"
- android:textColor="@android:color/darker_gray"
- android:textStyle="bold"
- android:gravity="center_horizontal"
- android:layout_margin="8dp"
- android:layout_marginTop="24dp"
- android:clickable="true"/>
-
- </LinearLayout>
- </FrameLayout>
-
- <FrameLayout
- android:id="@android:id/progress"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:background="@android:color/background_light">
-
- <ProgressBar
- style="?android:progressBarStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:indeterminate="true"
- android:layout_gravity="center"/>
- </FrameLayout>
-
-</FrameLayout>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light">
<ViewSwitcher
android:id="@+id/menu_fragment_viewswitcher"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ tools:ignore="UselessParent">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/menu_fragment_bureaux_swiperefreshlayout"
android:clickable="true"
android:gravity="center"
android:text="@string/no_dossiers"
- android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@android:color/darker_gray"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/menu_fragment_dossier_empty_filter_alert_textview"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:clickable="true"
+ android:gravity="center_horizontal"
+ android:text="@string/no_dossiers_filter_alert"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/darker_gray"
android:textStyle="bold" />
</LinearLayout>
<string name="action_transfert">Transfert d\'action</string>
<string name="no_content">Pas de contenu</string>
<string name="no_dossiers">Vos dossiers s\'afficheront ici</string>
+ <string name="no_dossiers_filter_alert">Désactivez le filtre pour obtenir plus de résultats</string>
<string name="no_bureaux">Vos bureaux s\'afficheront ici</string>
<string name="action_mode_nb_dossiers">%d dossier(s)</string>
<string name="Error_on_typology_update">Erreur à la récupération de la typologie du dossier</string>