Refactor layout & menu files, dialogs

app/src/main/res/layout/main__activity.xml

@@ -9,7 +9,7 @@
     tools:openDrawer="start">
 
     <include
-        layout="@layout/app_bar_main"
+        layout="@layout/main__app_bar"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
@@ -19,7 +19,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
-        app:headerLayout="@layout/main_nav_header"
-        app:menu="@menu/navdrawer_main" />
+        app:headerLayout="@layout/main__nav_header"
+        app:menu="@menu/main__navdrawer" />
 
 </android.support.v4.widget.DrawerLayout>

app/src/main/res/layout/main__app_bar.xml

@@ -22,7 +22,7 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/content_main" />
+    <include layout="@layout/main__content" />
 
     <com.getbase.floatingactionbutton.FloatingActionsMenu
         android:id="@+id/fab_menubutton"

app/src/main/res/layout/main__content.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context=".activity.MainActivity"
-    tools:showIn="@layout/app_bar_main">
+    tools:showIn="@layout/main__app_bar">
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/swipe"

app/src/main/res/layout/main__nav_header.xml

@@ -15,28 +15,28 @@
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:orientation="horizontal"
-        android:layout_alignParentTop="true"
+        android:layout_height="match_parent"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_marginTop="32dp"
         android:layout_alignParentStart="true"
-        android:layout_height="match_parent">
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="32dp"
+        android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/navheader_user_image"
-            android:layout_gravity="center"
-            android:scaleType="fitCenter"
             android:layout_width="@android:dimen/notification_large_icon_width"
             android:layout_height="@android:dimen/notification_large_icon_height"
+            android:layout_gravity="center"
             android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
+            android:scaleType="fitCenter"
             android:src="@drawable/ic_launcher" />
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:orientation="vertical"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/navheader_title"

app/src/main/res/layout/podselection__activity.xml

@@ -30,7 +30,7 @@
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:paddingTop="@dimen/activity_vertical_margin"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:showIn="@layout/podselection_activity">
+        tools:showIn="@layout/podselection__activity">
 
         <ListView
             android:id="@+id/podselection__listpods"