Merge pull request #1424 from nextcloud/fixHSL

Activities list activity: fix hsl computation, fix header color

src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java

@@ -26,11 +26,12 @@ import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.graphics.PorterDuff;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.design.widget.BottomNavigationView;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.MenuItem;
@@ -134,7 +135,10 @@ public class ActivitiesListActivity extends FileActivity implements ActivityList
 
         // setup drawer
         setupDrawer(R.id.nav_activity);
-        getSupportActionBar().setTitle(getString(R.string.drawer_item_activities));
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null) {
+            ThemeUtils.setColoredTitle(actionBar, getString(R.string.drawer_item_activities));
+        }
 
         swipeListRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override

src/main/java/com/owncloud/android/utils/ThemeUtils.java

@@ -127,7 +127,7 @@ public class ThemeUtils {
         int primaryColor = primaryColor();
         float[] hsl = colorToHSL(primaryColor);
 
-        return (hsl[2] / 100) <= 0.5;
+        return hsl[2] <= 0.5;
     }
 
     /**
@@ -137,8 +137,10 @@ public class ThemeUtils {
      * @param title     title to be shown
      */
     public static void setColoredTitle(ActionBar actionBar, String title) {
-        String colorHex = colorToHexString(fontColor());
+        if (actionBar != null) {
-        actionBar.setTitle(Html.fromHtml("<font color='" + colorHex + "'>" + title + "</font>"));
+            String colorHex = colorToHexString(fontColor());
+            actionBar.setTitle(Html.fromHtml("<font color='" + colorHex + "'>" + title + "</font>"));
+        }
     }
 
     public static Spanned getColoredTitle(String title, int color) {