-<android.support.v4.widget.DrawerLayout
- android:id="@+id/activity_dossiers_drawer_layout"
+<android.support.v4.widget.DrawerLayout android:id="@+id/activity_dossiers_drawer_layout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:divider="@android:drawable/divider_horizontal_bright"
android:elevation="7dp"
android:orientation="vertical"
- tools:context=".MainActivity"
+ tools:context=".controller.MainActivity"
tools:ignore="UnusedAttribute">
<!-- The main content view -->
android:fitsSystemWindows="true"
android:orientation="vertical">
- <include
- android:id="@+id/home_toolbar"
- layout="@layout/activity_dossiers_toolbar"/>
+ <include layout="@layout/activity_toolbar" />
<android.support.v4.widget.DrawerLayout
android:id="@+id/activity_dossiers_right_drawer_layout"
android:divider="@android:drawable/divider_horizontal_bright"
android:orientation="vertical">
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:baselineAligned="false"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:baselineAligned="false"
- android:orientation="horizontal">
-
- <FrameLayout
- android:id="@+id/left_fragment"
- android:layout_width="240dp"
- android:layout_height="match_parent"
- android:background="@android:color/background_light"/>
-
- <View
- android:layout_width="1dp"
- android:layout_height="match_parent"
- android:background="#8A8A8A"/>
-
- <fragment
- android:id="@+id/dossier_detail"
- android:name="org.adullact.iparapheur.controller.dossier.DossierDetailFragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:tag="dossier_details_fragment"
- tools:layout="@layout/fragment_dossier_detail"/>
- </LinearLayout>
-
- <ProgressBar
- android:id="@+id/progressBar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:max="100"
- android:visibility="invisible"/>
-
- </FrameLayout>
+ <include layout="@layout/main_activity_main_content" />
<!-- The right drawer -->
<!-- For some reason, you can't put it directly in the dossier_detail_fragment... -->
android:id="@+id/activity_dossiers_right_drawer"
android:layout_width="320dp"
android:layout_height="match_parent"
- android:layout_gravity="end"
- android:orientation="horizontal">
+ android:layout_gravity="end">
- <include
- layout="@layout/dossiers_info"/>
+ <include layout="@layout/dossiers_info" />
</FrameLayout>
android:orientation="vertical"
tools:ignore="UselessParent">
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="178dp"
- android:background="@drawable/navigation_drawer_header_gradient"/>
-
- <TextView
- 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"/>
-
- <View
- android:id="@+id/navigation_drawer_fake_status_bar"
- android:layout_width="match_parent"
- android:layout_height="24dp"
- android:background="@color/secondary_700"/>
-
- </FrameLayout>
+ <include layout="@layout/activity_toolbar_header" />
- <FrameLayout
- android:id="@+id/drawer_panel"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <fragment
- android:id="@+id/activity_dossiers_bureaux_fragment"
- android:name="org.adullact.iparapheur.controller.account.AccountListFragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:tag="AccountListFragment"
- tools:layout="@layout/account_list_fragment"/>
-
- </FrameLayout>
+ <include layout="@layout/main_activity_drawer_content" />
</LinearLayout>
</FrameLayout>