Merge branch 'master' into fdroid

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/commit451/gitlab/App.java

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

@@ -7,11 +7,10 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
-    <LinearLayout
+    <android.support.design.widget.CoordinatorLayout
         android:id="@+id/main_content_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
         <android.support.design.widget.AppBarLayout
             android:id="@+id/appbar"
@@ -21,13 +20,15 @@
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize" />
+                android:layout_height="?attr/actionBarSize"
+                app:layout_scrollFlags="scroll|enterAlways|snap" />
         </android.support.design.widget.AppBarLayout>
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
             <com.commit451.gitlab.view.LabCoatSwipeRefreshLayout
                 android:id="@+id/swipe_layout"
@@ -54,7 +55,7 @@
         </FrameLayout>
-    </LinearLayout>
+    </android.support.design.widget.CoordinatorLayout>
     <com.commit451.gitlab.view.LabCoatNavigationView
         android:id="@+id/navigation_view"

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

@@ -58,7 +58,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        android:src="@drawable/ic_edit_24dp"
+        app:srcCompat="@drawable/ic_edit_24dp"
         app:fabSize="mini"
         app:layout_anchor="@id/appbar"
         app:layout_anchorGravity="bottom|right|end"/>

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:id="@+id/root"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:elevation="0dp"/>
     <ImageView
         android:layout_width="wrap_content"
@@ -11,17 +17,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="32dp"
         android:contentDescription="@string/app_name"
-        android:src="@drawable/ic_logo" />
-
-    <ImageView
-        android:id="@+id/close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_close_24dp"
-        android:padding="8dp"
-        android:layout_margin="8dp"
-        android:contentDescription="@null"
-        android:background="?attr/selectableItemBackgroundBorderless"/>
+        app:srcCompat="@drawable/ic_logo"/>
     <LinearLayout
         android:layout_width="match_parent"
@@ -68,8 +64,8 @@
                     android:layout_alignParentTop="true"
                     android:ems="10"
                     android:hint="@string/user_hint"
-                    android:inputType="textEmailAddress"
-                    android:imeOptions="actionNext"/>
+                    android:imeOptions="actionNext"
+                    android:inputType="textEmailAddress"/>
             </android.support.design.widget.TextInputLayout>
@@ -85,7 +81,7 @@
                     android:layout_below="@+id/user_input"
                     android:layout_centerHorizontal="true"
                     android:hint="@string/password_hint"
-                    android:inputType="textPassword" />
+                    android:inputType="textPassword"/>
             </android.support.design.widget.TextInputLayout>
         </LinearLayout>
@@ -113,30 +109,16 @@
             </android.support.design.widget.TextInputLayout>
         </LinearLayout>
-        <TextView
-            android:id="@+id/show_normal_link"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_horizontal"
-            android:padding="20dp"
-            android:text="@string/token_link"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
     </LinearLayout>
-    <com.devspark.robototextview.widget.RobotoTextView
+    <Button
         android:id="@+id/login_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="?attr/selectableItemBackground"
-        android:gravity="center_horizontal"
-        android:padding="@dimen/padding_normal"
-        android:text="@string/login_button"
-        android:textAllCaps="true"
-        app:typeface="roboto_medium" />
-
-    <include layout="@layout/progress_fullscreen" />
+        android:layout_margin="16dp"
+        android:text="@string/login_button"/>
+
+    <include layout="@layout/progress_fullscreen"/>
 </FrameLayout>
\ No newline at end of file

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

@@ -51,7 +51,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        android:src="@drawable/ic_edit_24dp"
+        app:srcCompat="@drawable/ic_edit_24dp"
         app:fabSize="mini"
         app:layout_anchor="@id/appbar"
         app:layout_anchorGravity="bottom|right|end"/>
@@ -62,7 +62,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/padding_normal"
-        android:src="@drawable/ic_add_24dp" />
+        app:srcCompat="@drawable/ic_add_24dp" />
     <include layout="@layout/progress_fullscreen"/>

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

@@ -7,11 +7,10 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
-    <LinearLayout
+    <android.support.design.widget.CoordinatorLayout
         android:id="@+id/main_content_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
         <android.support.design.widget.AppBarLayout
             android:id="@+id/appbar"
@@ -21,7 +20,8 @@
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize" />
+                android:layout_height="?attr/actionBarSize"
+                app:layout_scrollFlags="scroll|enterAlways|snap"/>
             <android.support.design.widget.TabLayout
                 android:id="@+id/tabs"
@@ -32,7 +32,8 @@
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
             <android.support.v4.view.ViewPager
                 android:id="@+id/pager"
                 android:layout_width="match_parent"
@@ -41,7 +42,7 @@
             <include layout="@layout/progress_fullscreen"/>
         </FrameLayout>
-    </LinearLayout>
+    </android.support.design.widget.CoordinatorLayout>
     <com.commit451.gitlab.view.LabCoatNavigationView
         android:id="@+id/navigation_view"

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

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.design.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
     <android.support.design.widget.AppBarLayout
         android:id="@+id/appbar"
@@ -14,7 +14,8 @@
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize">
+            android:layout_height="?attr/actionBarSize"
+            app:layout_scrollFlags="scroll|enterAlways|snap">
             <LinearLayout
                 android:layout_width="match_parent"
@@ -37,7 +38,7 @@
                 android:id="@+id/clear"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_close_24dp"
+                app:srcCompat="@drawable/ic_close_24dp"
                 android:contentDescription="@null"
                 android:visibility="gone"/>
             </LinearLayout>
@@ -53,7 +54,8 @@
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
         <android.support.v4.view.ViewPager
             android:id="@+id/pager"
@@ -63,4 +65,4 @@
         <include layout="@layout/progress_fullscreen"/>
     </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file

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

@@ -15,7 +15,6 @@
             android:orientation="vertical"
             android:layout_marginTop="?attr/actionBarSize">
-
             <FrameLayout
                 android:id="@+id/root_launch_activity"
                 android:layout_width="match_parent"

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -13,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_marginRight="16dp"
-        android:src="@drawable/ic_add_24dp"
+        app:srcCompat="@drawable/ic_add_24dp"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null"/>

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -32,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_gravity="bottom|right"
-        android:src="@drawable/ic_add_24dp"
+        app:srcCompat="@drawable/ic_add_24dp"
         android:layout_margin="@dimen/padding_normal"/>
 </FrameLayout >
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -44,7 +45,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/padding_normal"
-        android:src="@drawable/ic_add_24dp" />
+        app:srcCompat="@drawable/ic_add_24dp" />
     <TextView
         android:id="@+id/message_text"

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -32,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_gravity="bottom|right"
-        android:src="@drawable/ic_add_24dp"
+        app:srcCompat="@drawable/ic_add_24dp"
         android:layout_margin="@dimen/padding_normal"/>
 </FrameLayout >
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -47,7 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/padding_normal"
-        android:src="@drawable/ic_add_24dp" />
+        app:srcCompat="@drawable/ic_add_24dp" />
 </FrameLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
 <com.commit451.gitlab.view.LabCoatSwipeRefreshLayout
     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/swipe_layout"
     android:layout_width="match_parent"
@@ -46,7 +47,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:contentDescription="@null"
-                        android:src="@drawable/ic_star_24dp"/>
+                        app:srcCompat="@drawable/ic_star_24dp"/>
                     <TextView
                         android:id="@+id/star_count"
@@ -73,7 +74,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:contentDescription="@null"
-                        android:src="@drawable/ic_fork"/>
+                        app:srcCompat="@drawable/ic_fork"/>
                     <TextView
                         android:id="@+id/forks_count"

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -48,7 +49,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/padding_normal"
-        android:src="@drawable/ic_add_24dp" />
+        app:srcCompat="@drawable/ic_add_24dp" />
 </FrameLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     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:orientation="vertical"
     android:layout_width="match_parent"
@@ -51,7 +52,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_milestone_24dp"
+            app:srcCompat="@drawable/ic_milestone_24dp"
             android:contentDescription="@null"/>
         <TextView

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

@@ -3,4 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/adapter_layout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+    android:layout_marginRight="@dimen/activity_horizontal_margin"/>
\ No newline at end of file

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

@@ -13,7 +13,7 @@
         android:contentDescription="@null"
         android:fitsSystemWindows="false"
         android:scaleType="centerCrop"
-        android:src="@drawable/header"/>
+        app:srcCompat="@drawable/header"/>
     <com.commit451.foregroundviews.ForegroundImageView
         android:id="@+id/profile_image"
@@ -72,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="right|center_vertical"
             android:contentDescription="@null"
-            android:src="@drawable/ic_arrow_down_24dp" />
+            app:srcCompat="@drawable/ic_arrow_down_24dp" />
     </FrameLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     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/list_item"
     android:layout_width="match_parent"
@@ -53,7 +54,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:src="@drawable/ic_overflow_24dp"
+        app:srcCompat="@drawable/ic_overflow_24dp"
         android:padding="8dp"
         android:layout_gravity="center_vertical|right"
         android:contentDescription="@null"/>

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -21,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null"
-        android:src="@drawable/ic_chevron_right_24dp"/>
+        app:srcCompat="@drawable/ic_chevron_right_24dp"/>
 </LinearLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    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:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -40,6 +42,6 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@null"
         android:padding="2dp"
-        android:src="@drawable/ic_overflow_24dp"/>
+        app:srcCompat="@drawable/ic_overflow_24dp"/>
 </LinearLayout>
\ No newline at end of file