update design of widget

Signed-off-by: David Luhmer <david-dev@live.de>

2 files changed, 30 insertions, 16 deletions

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetNewsViewsFactory.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetNewsViewsFactory.java
index dc60ebf8..0c7ef79d 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetNewsViewsFactory.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetNewsViewsFactory.java
@@ -25,7 +25,10 @@ import android.annotation.SuppressLint;
 import android.appwidget.AppWidgetManager;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Typeface;
 import android.text.Html;
+import android.text.SpannableStringBuilder;
+import android.text.style.StyleSpan;
 import android.util.Log;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
@@ -38,6 +41,7 @@ import de.luhmer.owncloudnewsreader.Constants;
 import de.luhmer.owncloudnewsreader.R;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
 import de.luhmer.owncloudnewsreader.database.model.RssItem;
+import de.luhmer.owncloudnewsreader.helper.ThemeChooser;
 
 public class WidgetNewsViewsFactory implements RemoteViewsService.RemoteViewsFactory {
 	private static final String TAG = WidgetNewsViewsFactory.class.getCanonicalName();
@@ -88,34 +92,46 @@ public class WidgetNewsViewsFactory implements RemoteViewsService.RemoteViewsFac
         try {
             RssItem rssItem = rssItems.get(position);
             String header = rssItem.getFeed().getFeedTitle();
-            String colorString = rssItem.getFeed().getAvgColour();
+            // String colorString = rssItem.getFeed().getAvgColour();
 
             String authorOfArticle = rssItem.getAuthor();
-            header += authorOfArticle == null ? "" : " - " + authorOfArticle.trim();
+            header += authorOfArticle == null || authorOfArticle.isEmpty() ? "" : " - " + authorOfArticle.trim();
             String title = Html.fromHtml(rssItem.getTitle()).toString();
             long id = rssItem.getId();
 
             Date date = rssItem.getPubDate();
             String dateString = "";
-            if(date != null)
-            {
+            if (date != null) {
                 SimpleDateFormat formater = new SimpleDateFormat();
                 dateString = formater.format(date);
             }
 
             rv.setTextViewText(R.id.feed_datetime, dateString);
             rv.setTextViewText(R.id.feed_author_source, header);
-            rv.setTextViewText(R.id.feed_title, title);
 
+            SpannableStringBuilder titleSpan = new SpannableStringBuilder(title);
+            if (!rssItem.getRead_temp()) {
+                titleSpan.setSpan(new StyleSpan(Typeface.BOLD), 0, titleSpan.length(), 0);
+            }
+            rv.setTextViewText(R.id.feed_title, titleSpan);
+
+
+            int resId;
+            if (ThemeChooser.getSelectedTheme() == ThemeChooser.THEME.LIGHT) {
+                resId = rssItem.getRead_temp() ? R.drawable.ic_checkbox_black : R.drawable.ic_checkbox_outline_black;
+            } else {
+                resId = rssItem.getRead_temp() ? R.drawable.ic_checkbox_white : R.drawable.ic_checkbox_outline_white;
+            }
 
-            int resId = rssItem.getRead_temp() ? R.drawable.ic_check_box_white : R.drawable.ic_check_box_outline_blank_white;
             int contentDescriptionId = rssItem.getRead_temp() ? R.string.content_desc_mark_as_unread : R.string.content_desc_mark_as_read;
             rv.setInt(R.id.cb_lv_item_read, "setBackgroundResource", resId);
             rv.setContentDescription(R.id.cb_lv_item_read, context.getString(contentDescriptionId));
 
+            /*
             if(colorString != null) {
                 rv.setInt(R.id.color_line_feed, "setBackgroundColor", Integer.parseInt(colorString));
             }
+            */
 
 
             //Get a fresh new intent
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetProvider.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetProvider.java
index ac47e42f..40f1b892 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetProvider.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetProvider.java
@@ -29,7 +29,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.RemoteViews;
 
@@ -40,7 +39,6 @@ import javax.inject.Inject;
 import de.luhmer.owncloudnewsreader.Constants;
 import de.luhmer.owncloudnewsreader.NewsDetailActivity;
 import de.luhmer.owncloudnewsreader.NewsReaderApplication;
-import de.luhmer.owncloudnewsreader.NewsReaderListActivity;
 import de.luhmer.owncloudnewsreader.R;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
 import de.luhmer.owncloudnewsreader.database.model.RssItem;
@@ -221,15 +219,15 @@ public class WidgetProvider extends AppWidgetProvider {
         */
 
 
-        Intent intentToDoListAct = new Intent(context, NewsReaderListActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intentToDoListAct, 0);
-        rv.setOnClickPendingIntent(R.id.tV_widget_header, pendingIntent);
-        
-       
+        // Intent intentToDoListAct = new Intent(context, NewsReaderListActivity.class);
+        // PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intentToDoListAct, 0);
+        // rv.setOnClickPendingIntent(R.id.tV_widget_header, pendingIntent);
+
+
         appWidgetManager.updateAppWidget(appWidgetId, rv);
-                
-        if(Constants.debugModeWidget)
-        	Log.d(TAG, "updateAppWidget - WidgetID: " + appWidgetId);
+
+        if (Constants.debugModeWidget)
+            Log.d(TAG, "updateAppWidget - WidgetID: " + appWidgetId);
     }
 
     private void inject(Context context) {