Merge branch 'master' into fdroid

# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/com/commit451/gitlab/LabCoatApp.java

app/src/main/res/values/colors.xml

@@ -14,13 +14,17 @@
         <item>@color/yellow</item>
     </integer-array>
-    <color name="grey">#373D47</color>
-    <color name="grey_60">#99373D47</color>
-    <color name="grey_dark">#1E242E</color>
-    <color name="window_background_color">#303030</color>
-    <color name="purple">#554488</color>
-    <color name="purple_dark">#3C2B6F</color>
+    <color name="main_blue">#1A232E</color>
+    <color name="main_blue_darker">#010A15</color>
+    <color name="main_blue_60">#991A232E</color>
+    <color name="blue_background">#414d5b</color>
+    <color name="other_blue">#5b6b7e</color>
+    <color name="card_background">@color/other_blue</color>
+    <color name="background_color">@color/blue_background</color>
+
+    <color name="divider_color">#323C47</color>
     <color name="scrim">#99323232</color>
+
 </resources>
\ No newline at end of file

app/src/main/res/values/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">GitLab</string>
+    <string name="app_name">LabCoat</string>
     <!-- Drawer -->
     <string name="nav_projects">Projects</string>
@@ -73,6 +73,7 @@
     <string name="not_a_valid_url">Not a valid URL</string>
     <string name="not_a_valid_private_token">Not a valid private token</string>
     <string name="realm_message">A username and password are being requested by the server.\nThe server says: \"%1$s\"</string>
+    <string name="already_logged_in">This account is already logged in</string>
     <!-- Error messages -->
     <string name="connection_error">Connection failed</string>
@@ -127,6 +128,7 @@
     <!-- Overview -->
     <string name="no_readme_found">No README found for project</string>
+    <string name="created_by">Created by %1$s</string>
     <!-- Commits -->
     <string name="no_commits_found">No commits found.</string>
@@ -137,6 +139,7 @@
     <string name="file_saved">File saved successfully to Download folder</string>
     <string name="no_files_found">No files found.</string>
     <string name="copied_to_clipboard">Copied to clipboard</string>
+    <string name="root">ROOT</string>
     <!-- Issues -->
     <string name="new_note_hint">Add comment</string>
@@ -165,7 +168,7 @@
         <item>closed</item>
         <item>all</item>
     </string-array>
-    <string name="created_time">Created %1$s by %2$s</string>
+    <string name="opened_time">%1$s · opened %2$s by %3$s</string>
     <string name="no_assignee">No Assignee</string>
     <string name="assignee">Assignee</string>
     <string name="milestone">Milestone</string>

app/src/main/res/values/styles.xml

@@ -2,12 +2,13 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="colorPrimary">@color/purple</item>
-        <item name="colorPrimaryDark">@color/purple_dark</item>
-        <item name="android:navigationBarColor" tools:ignore="NewApi">?attr/colorPrimaryDark</item>
+        <item name="colorPrimary">@color/main_blue</item>
+        <item name="colorPrimaryDark">@color/main_blue_darker</item>
+        <item name="android:navigationBarColor" tools:ignore="NewApi">?attr/colorPrimary</item>
         <item name="colorAccent">@color/yellow</item>
         <item name="android:windowContentTransitions" tools:ignore="NewApi">true</item>
         <item name="dialogTheme">@style/AppDialogTheme</item>
+        <item name="android:windowBackground">@color/background_color</item>
     </style>
     <style name="Activity" parent="AppTheme"/>
@@ -47,7 +48,7 @@
         <item name="cardUseCompatPadding">true</item>
         <item name="cardElevation">2dp</item>
         <item name="cardCornerRadius">1dp</item>
-        <item name="cardBackgroundColor">@color/grey</item>
+        <item name="cardBackgroundColor">@color/card_background</item>
         <item name="android:foreground">?attr/selectableItemBackground</item>
     </style>

app/src/test/java/com/commit451/gitlab/TestGitLabApp.java → app/src/test/java/com/commit451/gitlab/TestLabCoatApp.java

@@ -7,7 +7,7 @@ import java.lang.reflect.Method;
 /**
  * Test version of our Application class, used by Robolectric
  */
-public class TestGitLabApp extends GitLabApp implements TestLifecycleApplication {
+public class TestLabCoatApp extends LabCoatApp implements TestLifecycleApplication {
     @Override
     public void beforeTest(Method method) {

build.gradle

@@ -4,6 +4,7 @@ buildscript {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url "https://dl.bintray.com/commit451/maven"}
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.5.0'
@@ -17,5 +18,6 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url "https://dl.bintray.com/commit451/maven"}
     }
 }