Merge branch 'master' into fdroid

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

app/src/main/java/com/commit451/gitlab/viewHolder/GroupViewHolder.java

@@ -8,8 +8,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Group;
 import butterknife.BindView;
@@ -38,7 +38,7 @@ public class GroupViewHolder extends RecyclerView.ViewHolder{
         mNameView.setText(group.getName());
         if (group.getAvatarUrl() != null && !group.getAvatarUrl().equals(Uri.EMPTY)) {
-            GitLabClient.getPicasso()
+            App.instance().getPicasso()
                     .load(group.getAvatarUrl())
                     .into(mImageView);
         }

app/src/main/java/com/commit451/gitlab/viewHolder/IssueHeaderViewHolder.java

@@ -9,11 +9,11 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Issue;
 import com.commit451.gitlab.transformation.CircleTransformation;
-import com.commit451.gitlab.util.DateUtils;
+import com.commit451.gitlab.util.DateUtil;
 import com.commit451.gitlab.util.ImageUtil;
 import butterknife.BindView;
@@ -54,7 +54,7 @@ public class IssueHeaderViewHolder extends RecyclerView.ViewHolder {
             mDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
         }
-        GitLabClient.getPicasso()
+        App.instance().getPicasso()
                 .load(ImageUtil.getAvatarUrl(issue.getAuthor(), itemView.getResources().getDimensionPixelSize(R.dimen.image_size)))
                 .transform(new CircleTransformation())
                 .into(mAuthorImageView);
@@ -65,7 +65,7 @@ public class IssueHeaderViewHolder extends RecyclerView.ViewHolder {
         }
         author += itemView.getResources().getString(R.string.created_issue);
         if (issue.getCreatedAt() != null) {
-            author = author + " " + DateUtils.getRelativeTimeSpanString(itemView.getContext(), issue.getCreatedAt());
+            author = author + " " + DateUtil.getRelativeTimeSpanString(itemView.getContext(), issue.getCreatedAt());
         }
         mAuthorView.setText(author);
         if (issue.getMilestone() != null) {

app/src/main/java/com/commit451/gitlab/viewHolder/IssueLabelsViewHolder.java

@@ -32,7 +32,7 @@ public class IssueLabelsViewHolder extends RecyclerView.ViewHolder {
     private final IssueLabelsAdapter.Listener mListener = new IssueLabelsAdapter.Listener() {
         @Override
         public void onLabelClicked(String label, IssueLabelViewHolder viewHolder) {
-
+            //TODO anything?
         }
     };

app/src/main/java/com/commit451/gitlab/viewHolder/IssueViewHolder.java

@@ -7,11 +7,11 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Issue;
 import com.commit451.gitlab.transformation.CircleTransformation;
-import com.commit451.gitlab.util.DateUtils;
+import com.commit451.gitlab.util.DateUtil;
 import com.commit451.gitlab.util.ImageUtil;
 import butterknife.BindView;
@@ -40,7 +40,7 @@ public class IssueViewHolder extends RecyclerView.ViewHolder {
     public void bind(Issue issue) {
         if (issue.getAssignee() != null) {
-            GitLabClient.getPicasso()
+            App.instance().getPicasso()
                     .load(ImageUtil.getAvatarUrl(issue.getAssignee(), itemView.getResources().getDimensionPixelSize(R.dimen.image_size)))
                     .transform(new CircleTransformation())
                     .into(mImageView);
@@ -52,7 +52,7 @@ public class IssueViewHolder extends RecyclerView.ViewHolder {
         String time = "";
         if (issue.getCreatedAt() != null) {
-            time += DateUtils.getRelativeTimeSpanString(itemView.getContext(), issue.getCreatedAt());
+            time += DateUtil.getRelativeTimeSpanString(itemView.getContext(), issue.getCreatedAt());
         }
         String author = "";
         if (issue.getAuthor() != null) {

app/src/main/java/com/commit451/gitlab/viewHolder/MergeRequestHeaderViewHolder.java

@@ -10,11 +10,11 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.commit451.bypasspicassoimagegetter.BypassPicassoImageGetter;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.transformation.CircleTransformation;
-import com.commit451.gitlab.util.DateUtils;
+import com.commit451.gitlab.util.DateUtil;
 import com.commit451.gitlab.util.ImageUtil;
 import butterknife.BindView;
@@ -46,11 +46,11 @@ public class MergeRequestHeaderViewHolder extends RecyclerView.ViewHolder {
             mDescriptionView.setVisibility(View.GONE);
         } else {
             mDescriptionView.setVisibility(View.VISIBLE);
-            mDescriptionView.setText(bypass.markdownToSpannable(mergeRequest.getDescription(), new BypassPicassoImageGetter(mDescriptionView, GitLabClient.getPicasso())));
+            mDescriptionView.setText(bypass.markdownToSpannable(mergeRequest.getDescription(), new BypassPicassoImageGetter(mDescriptionView, App.instance().getPicasso())));
             mDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
         }
-        GitLabClient.getPicasso()
+        App.instance().getPicasso()
                 .load(ImageUtil.getAvatarUrl(mergeRequest.getAuthor(), itemView.getResources().getDimensionPixelSize(R.dimen.image_size)))
                 .transform(new CircleTransformation())
                 .into(mAuthorImageView);
@@ -61,7 +61,7 @@ public class MergeRequestHeaderViewHolder extends RecyclerView.ViewHolder {
         }
         author += itemView.getResources().getString(R.string.created_merge_request);
         if (mergeRequest.getCreatedAt() != null) {
-            author += " " + DateUtils.getRelativeTimeSpanString(itemView.getContext(), mergeRequest.getCreatedAt());
+            author += " " + DateUtil.getRelativeTimeSpanString(itemView.getContext(), mergeRequest.getCreatedAt());
         }
         mAuthorView.setText(author);
     }

app/src/main/java/com/commit451/gitlab/viewHolder/MergeRequestViewHolder.java

@@ -7,8 +7,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.transformation.CircleTransformation;
 import com.commit451.gitlab.util.ImageUtil;
@@ -37,7 +37,7 @@ public class MergeRequestViewHolder extends RecyclerView.ViewHolder {
     }
     public void bind(MergeRequest item) {
-        GitLabClient.getPicasso()
+        App.instance().getPicasso()
                 .load(ImageUtil.getAvatarUrl(item.getAuthor(), itemView.getResources().getDimensionPixelSize(R.dimen.image_size)))
                 .transform(new CircleTransformation())
                 .into(mImageView);

app/src/main/java/com/commit451/gitlab/viewHolder/MilestoneHeaderViewHolder.java

@@ -8,7 +8,7 @@ import android.widget.TextView;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.api.Milestone;
-import com.commit451.gitlab.util.DateUtils;
+import com.commit451.gitlab.util.DateUtil;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -39,7 +39,7 @@ public class MilestoneHeaderViewHolder extends RecyclerView.ViewHolder {
             mDescriptionView.setText(milestone.getDescription());
         }
         if (milestone.getDueDate() != null) {
-            CharSequence due = DateUtils.getRelativeTimeSpanString(itemView.getContext(), milestone.getDueDate());
+            CharSequence due = DateUtil.getRelativeTimeSpanString(itemView.getContext(), milestone.getDueDate());
             mDueDateView.setText(String.format(itemView.getResources().getString(R.string.due_date_formatted), due));
         }
     }

app/src/main/java/com/commit451/gitlab/viewHolder/MilestoneViewHolder.java

@@ -8,7 +8,7 @@ import android.widget.TextView;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.api.Milestone;
-import com.commit451.gitlab.util.DateUtils;
+import com.commit451.gitlab.util.DateUtil;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -36,7 +36,7 @@ public class MilestoneViewHolder extends RecyclerView.ViewHolder {
         mTitleView.setText(milestone.getTitle());
         if (milestone.getDueDate() != null) {
             mDueDateView.setVisibility(View.VISIBLE);
-            CharSequence due = DateUtils.getRelativeTimeSpanString(itemView.getContext(), milestone.getDueDate());
+            CharSequence due = DateUtil.getRelativeTimeSpanString(itemView.getContext(), milestone.getDueDate());
             mDueDateView.setText(String.format(itemView.getResources().getString(R.string.due_date_formatted), due));
         } else {
             mDueDateView.setVisibility(View.GONE);

app/src/main/java/com/commit451/gitlab/viewHolder/NoteViewHolder.java

@@ -9,11 +9,11 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.commit451.bypasspicassoimagegetter.BypassPicassoImageGetter;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Note;
 import com.commit451.gitlab.transformation.CircleTransformation;
-import com.commit451.gitlab.util.DateUtils;
+import com.commit451.gitlab.util.DateUtil;
 import com.commit451.gitlab.util.ImageUtil;
 import butterknife.BindView;
@@ -43,7 +43,7 @@ public class NoteViewHolder extends RecyclerView.ViewHolder {
     public void bind(Note note, Bypass bypass) {
         if (note.getCreatedAt() != null) {
-            mCreationDateView.setText(DateUtils.getRelativeTimeSpanString(itemView.getContext(), note.getCreatedAt()));
+            mCreationDateView.setText(DateUtil.getRelativeTimeSpanString(itemView.getContext(), note.getCreatedAt()));
         }
         if (note.getAuthor() != null) {
@@ -55,10 +55,10 @@ public class NoteViewHolder extends RecyclerView.ViewHolder {
             summary = note.getBody();
         }
-        mSummaryView.setText(bypass.markdownToSpannable(summary, new BypassPicassoImageGetter(mSummaryView, GitLabClient.getPicasso())));
+        mSummaryView.setText(bypass.markdownToSpannable(summary, new BypassPicassoImageGetter(mSummaryView, App.instance().getPicasso())));
         mSummaryView.setMovementMethod(LinkMovementMethod.getInstance());
-        GitLabClient.getPicasso()
+        App.instance().getPicasso()
                 .load(ImageUtil.getAvatarUrl(note.getAuthor(), itemView.getResources().getDimensionPixelSize(R.dimen.image_size)))
                 .transform(new CircleTransformation())
                 .into(mIconView);

app/src/main/java/com/commit451/gitlab/viewHolder/ProjectMemberViewHolder.java

@@ -8,8 +8,8 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Member;
 import com.commit451.gitlab.util.ImageUtil;
@@ -53,7 +53,7 @@ public class ProjectMemberViewHolder extends RecyclerView.ViewHolder{
         mUsernameView.setText(member.getUsername());
         mAccessView.setText(Member.getAccessLevel(member.getAccessLevel()));
-        GitLabClient.getPicasso()
+        App.instance().getPicasso()
                 .load(ImageUtil.getAvatarUrl(member, itemView.getResources().getDimensionPixelSize(R.dimen.user_header_image_size)))
                 .into(mImageView);
     }

app/src/main/java/com/commit451/gitlab/viewHolder/ProjectViewHolder.java

@@ -10,8 +10,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.transformation.CircleTransformation;
 import com.github.ivbaranov.mli.MaterialLetterIcon;
@@ -46,7 +46,7 @@ public class ProjectViewHolder extends RecyclerView.ViewHolder {
             mLetterView.setVisibility(View.GONE);
             mImageView.setVisibility(View.VISIBLE);
-            GitLabClient.getPicasso()
+            App.instance().getPicasso()
                     .load(project.getAvatarUrl())
                     .transform(new CircleTransformation())
                     .into(mImageView);

app/src/main/java/com/commit451/gitlab/viewHolder/UserViewHolder.java

@@ -7,8 +7,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.UserBasic;
 import com.commit451.gitlab.util.ImageUtil;
@@ -36,7 +36,7 @@ public class UserViewHolder extends RecyclerView.ViewHolder {
     public void bind(UserBasic user) {
         mUsernameView.setText(user.getUsername());
-        GitLabClient.getPicasso()
+        App.instance().getPicasso()
                 .load(ImageUtil.getAvatarUrl(user, itemView.getResources().getDimensionPixelSize(R.dimen.user_list_image_size)))
                 .into(mImageView);
     }

app/src/main/java/com/commit451/gitlab/widget/AccountViewHolder.java

@@ -8,10 +8,10 @@ import android.widget.TextView;
 import com.alexgwyn.recyclerviewsquire.TypedViewHolder;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.Account;
 import com.commit451.gitlab.transformation.CircleTransformation;
 import com.commit451.gitlab.util.ImageUtil;
+import com.squareup.picasso.Picasso;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -41,7 +41,7 @@ public class AccountViewHolder extends TypedViewHolder<Account> {
         mServerView.setText(item.getServerUrl().toString());
         mUsernameView.setText(item.getUser().getUsername());
-        GitLabClient.getPicasso()
+        Picasso.with(getContext())
                 .load(ImageUtil.getAvatarUrl(item.getUser(), itemView.getResources().getDimensionPixelSize(R.dimen.user_list_image_size)))
                 .transform(new CircleTransformation())
                 .into(mImageView);

app/src/main/java/com/commit451/gitlab/widget/FeedRemoteViewsFactory.java

@@ -7,9 +7,12 @@ import android.graphics.Bitmap;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
+import com.commit451.gitlab.BuildConfig;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.api.GitLabRss;
+import com.commit451.gitlab.api.GitLabRssFactory;
+import com.commit451.gitlab.api.OkHttpClientFactory;
+import com.commit451.gitlab.api.PicassoFactory;
 import com.commit451.gitlab.model.Account;
 import com.commit451.gitlab.model.rss.Entry;
 import com.commit451.gitlab.model.rss.Feed;
@@ -19,6 +22,8 @@ import com.squareup.picasso.Picasso;
 import java.io.IOException;
 import java.util.ArrayList;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Response;
 /**
@@ -30,6 +35,7 @@ public class FeedRemoteViewsFactory implements RemoteViewsService.RemoteViewsFac
     private Context mContext;
     private int mAppWidgetId;
     private ArrayList<Entry> mEntries;
+    private Picasso mPicasso;
     public FeedRemoteViewsFactory(Context context, Intent intent) {
         mContext = context;
@@ -74,7 +80,7 @@ public class FeedRemoteViewsFactory implements RemoteViewsService.RemoteViewsFac
         rv.setOnClickFillInIntent(R.id.root, fillInIntent);
         try {
-            Bitmap image = Picasso.with(mContext)
+            Bitmap image = mPicasso
                     .load(entry.getThumbnail().getUrl())
                     .transform(new CircleTransformation())
                     .get();
@@ -121,7 +127,13 @@ public class FeedRemoteViewsFactory implements RemoteViewsService.RemoteViewsFac
             //TODO show error state?
             return;
         }
-        GitLabRss rssClient = GitLabClient.rssInstance(account);
+        OkHttpClient.Builder gitlabRssClientBuilder = OkHttpClientFactory.create(account);
+        if (BuildConfig.DEBUG) {
+            gitlabRssClientBuilder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY));
+        }
+        GitLabRss rssClient = GitLabRssFactory.create(account, gitlabRssClientBuilder.build());
+        OkHttpClient.Builder picassoClientBuilder = OkHttpClientFactory.create(account);
+        mPicasso = PicassoFactory.createPicasso(picassoClientBuilder.build());
         try {
             Response<Feed> feedResponse = rssClient.getFeed(account.getUser().getFeedUrl().toString()).execute();
             if (feedResponse.isSuccessful()) {

app/src/main/res/drawable/ic_add_96dp.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="96dp"
+        android:height="96dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>

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

@@ -52,9 +52,9 @@
         android:layout_gravity="center_horizontal">
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@mipmap/ic_launcher"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/ic_logo"
             android:contentDescription="@null"
             android:layout_gravity="center_vertical"/>
         <TextView
@@ -62,6 +62,7 @@
             android:layout_height="wrap_content"
             android:padding="@dimen/activity_horizontal_margin"
             android:gravity="center"
+            android:layout_gravity="center_vertical"
             android:text="@string/sauce"
             android:textSize="22sp" />

app/src/main/res/layout/activity_activity.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,16 +20,18 @@
             <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:id="@+id/root_fragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-    </LinearLayout>
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+    </android.support.design.widget.CoordinatorLayout>
     <com.commit451.gitlab.view.LabCoatNavigationView
         android:id="@+id/navigation_view"

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
-    android:id="@+id/root"
     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:transitionName="@string/transition_morph">
@@ -120,8 +120,7 @@
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:visibility="gone">
+                android:layout_marginBottom="8dp">
                 <com.commit451.gitlab.view.LabCoatProgressView
                     android:id="@+id/labels_progress"
@@ -131,20 +130,29 @@
                     app:matProg_barColor="?attr/colorAccent"
                     app:matProg_progressIndeterminate="true"/>
-                <com.commit451.gitlab.view.AdapterFlowLayout
-                    android:id="@+id/list_labels"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/text_add_labels"
+                <LinearLayout
+                    android:id="@+id/root_add_labels"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/add_labels"
+                    android:orientation="vertical"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
                     android:visibility="gone"
-                    android:padding="16dp"
-                    android:background="?attr/selectableItemBackground"/>
+                    android:background="?attr/selectableItemBackground">
+
+                    <com.commit451.gitlab.view.AdapterFlowLayout
+                        android:id="@+id/list_labels"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp"/>
+
+                    <TextView
+                        android:id="@+id/text_add_labels"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/add_labels"/>
+
+                </LinearLayout>
             </FrameLayout>
         </LinearLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"/>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/activity_vertical_margin"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/activity_vertical_margin">
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/title_text_input_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/add_new_label_title"
+                android:imeOptions="actionNone"
+                android:inputType="textCapSentences|textAutoCorrect|textMultiLine"/>
+
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/add_new_label_description"
+                android:imeOptions="actionNone"
+                android:inputType="textCapSentences|textAutoCorrect|textMultiLine"/>
+
+        </android.support.design.widget.TextInputLayout>
+
+        <LinearLayout
+            android:id="@+id/root_color"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/label_color"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/add_new_label_color"/>
+
+            <ImageView
+                android:id="@+id/image_color"
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:contentDescription="@null"
+                android:src="@drawable/ic_add_96dp"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <include layout="@layout/progress_fullscreen"/>
+
+</FrameLayout>
\ No newline at end of file

app/src/main/res/layout/activity_add_user.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:id="@+id/root"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -38,7 +39,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>