Merge branch 'master' into fdroid

# Conflicts:
#	.gitlab-ci.yml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/commit451/gitlab/App.java

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

@@ -3,9 +3,11 @@
     <!-- Dark theme (default) -->
     <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="colorPrimary">@color/primary_default</item>
-        <item name="colorAccent">@color/accent_default</item>
-        <item name="cardBackgroundColor">#424242</item>
+        <item name="colorPrimary">@color/main_blue</item>
+        <item name="colorAccent">@color/yellow</item>
+        <item name="colorPrimaryDark">@color/main_blue_darker</item>
+        <item name="cardBackgroundColor">@color/card_background</item>
+        <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/main_blue_darker</item>
         <item name="android:windowContentTransitions" tools:ignore="NewApi">true</item>
         <item name="dialogTheme">@style/AppDialogTheme</item>
     </style>
@@ -25,15 +27,11 @@
     </style>
     <style name="Activity.User">
-        <item name="colorPrimaryDark">@android:color/transparent</item>
-        <item name="android:statusBarColor" tools:ignore="NewApi">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus" tools:ignore="NewApi">true</item>
+        <!--Check v21 for the good bits-->
     </style>
     <style name="Activity.Group">
-        <item name="colorPrimaryDark">@android:color/transparent</item>
-        <item name="android:statusBarColor" tools:ignore="NewApi">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus" tools:ignore="NewApi">true</item>
+        <!--Check v21 for the good bits-->
     </style>
     <style name="Activity.Translucent">

app/src/main/res/xml/widget_feed.xml

+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="256dp"
+    android:minHeight="128dp"
+    android:updatePeriodMillis="5400000"
+    android:previewImage="@mipmap/ic_launcher"
+    android:initialLayout="@layout/widget_layout_entry"
+    android:resizeMode="horizontal|vertical"
+    android:configure="com.commit451.gitlab.widget.FeedWidgetConfigureActivity"
+    android:widgetCategory="home_screen"/>
\ No newline at end of file

app/src/test/java/com/commit451/gitlab/ApiTests.java

@@ -2,8 +2,8 @@ package com.commit451.gitlab;
 import android.net.Uri;
+import com.bluelinelabs.logansquare.LoganSquare;
 import com.commit451.gitlab.api.GitLabClient;
-import com.commit451.gitlab.model.Account;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.model.api.Issue;
 import com.commit451.gitlab.model.api.MergeRequest;
@@ -43,6 +43,8 @@ public class ApiTests {
         //for logging
         ShadowLog.stream = System.out;
+        LoganSquare.registerTypeConverter(Uri.class, new NullTypeConverter());
+
         TestUtil.login();
         Response<Project> projectResponse = GitLabClient.instance()
@@ -54,12 +56,6 @@ public class ApiTests {
         sFakeProject = projectResponse.body();
     }
-    private static Account getTestAccount() {
-        Account account = new Account();
-        account.setServerUrl(Uri.parse("https://gitlab.com"));
-        return account;
-    }
-
     @Test
     public void getProjects() throws Exception {
         Response<List<Project>> projectsResponse = GitLabClient.instance()

app/src/test/java/com/commit451/gitlab/CountingRouter.java

@@ -5,11 +5,7 @@ import android.net.Uri;
 import com.commit451.gitlab.navigation.RoutingNavigator;
 /**
- * //TODO add description
- * <br>
- * Copyright 2016 <a href="http://www.ovenbits.com">Oven Bits</a>
- *
- * @author Jawn.
+ * Checks counting
  */
 public class CountingRouter implements RoutingNavigator {
@@ -17,6 +13,8 @@ public class CountingRouter implements RoutingNavigator {
     public int commitRouteCount = 0;
     public int mergeRequestRouteCount = 0;
     public int projectRouteCount = 0;
+    public int buildRouteCount = 0;
+    public int milestoneRouteCount;
     public int unknownRountCount = 0;
     @Override
@@ -39,6 +37,16 @@ public class CountingRouter implements RoutingNavigator {
         projectRouteCount++;
     }
+    @Override
+    public void onRouteToBuild(String projectNamespace, String projectName, String buildNumber) {
+        buildRouteCount++;
+    }
+
+    @Override
+    public void onRouteToMilestone(String projectNamespace, String projectName, String milestoneNumber) {
+        milestoneRouteCount++;
+    }
+
     @Override
     public void onRouteUnknown(Uri uri) {
         unknownRountCount++;

app/src/test/java/com/commit451/gitlab/NullTypeConverter.java

+package com.commit451.gitlab;
+
+import com.bluelinelabs.logansquare.typeconverters.StringBasedTypeConverter;
+
+/**
+ * The worst type converter you will ever see. Only used in testing if Robolectric decides to break
+ * and not know what a {@link android.net.Uri} or other class is
+ */
+public class NullTypeConverter extends StringBasedTypeConverter {
+
+    @Override
+    public String convertToString(Object object) {
+        return null;
+    }
+
+    @Override
+    public Object getFromString(String string) {
+        return null;
+    }
+}

app/src/test/java/com/commit451/gitlab/RoutingTests.java

@@ -36,6 +36,9 @@ public class RoutingTests {
         issueUrl = Uri.parse("gitlab.com/Commit451/LabCoat/issues");
         router.route(issueUrl);
         Assert.assertEquals(1, countingRouter.projectRouteCount);
+        issueUrl = Uri.parse("http://example.com/wehostourgitlabserverhere/Commit451/LabCoat/issues");
+        router.route(issueUrl);
+        Assert.assertEquals(2, countingRouter.projectRouteCount);
     }
     @Test
@@ -48,5 +51,25 @@ public class RoutingTests {
         commitUrl = Uri.parse("http://gitlab.com/Commit451/LabCoat/commits");
         router.route(commitUrl);
         Assert.assertEquals(1, countingRouter.projectRouteCount);
+        //Test for subdomain
+        commitUrl = Uri.parse("http://example.com/wehostourgitlabserverhere/Commit451/LabCoat/commit/434fb013607836620819fae09f23a72d88369d3d");
+        router.route(commitUrl);
+        Assert.assertEquals(2, countingRouter.commitRouteCount);
+    }
+
+    @Test
+    public void routeMergeRequests() throws Exception {
+        Uri mergeRequestUrl = Uri.parse("https://gitlab.com/Commit451/LabCoat/merge_requests/14");
+        CountingRouter countingRouter = new CountingRouter();
+        RoutingRouter router = new RoutingRouter(countingRouter);
+        router.route(mergeRequestUrl);
+        Assert.assertEquals(1, countingRouter.mergeRequestRouteCount);
+        mergeRequestUrl = Uri.parse("http://gitlab.com/Commit451/LabCoat/commits");
+        router.route(mergeRequestUrl);
+        Assert.assertEquals(1, countingRouter.projectRouteCount);
+        //Test for subdomain
+        mergeRequestUrl = Uri.parse("http://example.com/wehostourgitlabserverhere/Commit451/LabCoat/merge_requests/13");
+        router.route(mergeRequestUrl);
+        Assert.assertEquals(2, countingRouter.mergeRequestRouteCount);
     }
 }
\ No newline at end of file

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

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

app/src/test/java/com/commit451/gitlab/TestUtil.java

@@ -21,7 +21,7 @@ public class TestUtil {
         Account account = new Account();
         account.setServerUrl(Uri.parse("https://gitlab.com/"));
-        Response<UserLogin> loginResponse = GitLabClient.instance(account)
+        Response<UserLogin> loginResponse = GitLabClient.create(account)
                 .loginWithUsername("TestAllTheThings", "testing123")
                 .execute();
         assertTrue(loginResponse.isSuccessful());

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         //check with ./gradlew dependencyUpdates
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
@@ -16,7 +16,6 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url  "http://dl.bintray.com/novoda/maven" }
     }
 }