Updated widget layout

Author: Jizzu

app/src/main/java/apps/jizzu/simpletodo/service/widget/ViewFactory.kt

@@ -34,6 +34,11 @@ class ViewFactory internal constructor(private val mContext: Context) : RemoteVi
         val remoteViews = RemoteViews(mContext.packageName, R.layout.widget_task_item)
         remoteViews.setTextViewText(R.id.item_title, mWidgetData[position].title)
 
+        if (!mWidgetData[position].note.isEmpty()) {
+            remoteViews.setViewVisibility(R.id.item_note_icon, View.VISIBLE)
+        } else remoteViews.setViewVisibility(R.id.item_note_icon, View.GONE)
+
+
         if (mWidgetData[position].date != 0L) {
             remoteViews.apply {
                 setViewPadding(R.id.item_title, 0, 0, 0, 0)
@@ -101,6 +106,7 @@ class ViewFactory internal constructor(private val mContext: Context) : RemoteVi
         val fillInIntent = Intent()
             .putExtra(WidgetProvider.ITEM_ID, mWidgetData[position].id)
             .putExtra(WidgetProvider.ITEM_TITLE, mWidgetData[position].title)
+            .putExtra(WidgetProvider.ITEM_NOTE, mWidgetData[position].note)
             .putExtra(WidgetProvider.ITEM_POSITION, position)
             .putExtra(WidgetProvider.ITEM_TIME_STAMP, mWidgetData[position].timeStamp)
 

app/src/main/java/apps/jizzu/simpletodo/service/widget/WidgetProvider.kt

@@ -41,6 +41,7 @@ class WidgetProvider : AppWidgetProvider() {
 
         val itemID = intent.getLongExtra(ITEM_ID, 0)
         val itemTitle = intent.getStringExtra(ITEM_TITLE)
+        val itemNote = intent.getStringExtra(ITEM_NOTE)
         val itemPosition = intent.getIntExtra(ITEM_POSITION, -1)
         val itemTimeStamp = intent.getLongExtra(ITEM_TIME_STAMP, 0)
         val itemDate = intent.getLongExtra(ITEM_DATE, 0)
@@ -53,6 +54,7 @@ class WidgetProvider : AppWidgetProvider() {
             val editTaskActivity = Intent(context, EditTaskActivity::class.java)
                     .putExtra(ITEM_ID, itemID)
                     .putExtra(ITEM_TITLE, itemTitle)
+                    .putExtra(ITEM_NOTE, itemNote)
                     .putExtra(ITEM_POSITION, itemPosition)
                     .putExtra(ITEM_TIME_STAMP, itemTimeStamp)
                     .putExtra(ITEM_DATE, itemDate)
@@ -64,6 +66,7 @@ class WidgetProvider : AppWidgetProvider() {
     companion object {
         internal const val ITEM_ID = "id"
         internal const val ITEM_TITLE = "title"
+        internal const val ITEM_NOTE = "note"
         internal const val ITEM_POSITION = "position"
         internal const val ITEM_TIME_STAMP = "time_stamp"
         internal const val ITEM_DATE = "date"

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

@@ -16,7 +16,6 @@
     card_view:contentPadding="5dp">
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/lel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

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

@@ -5,15 +5,16 @@
     android:layout_height="wrap_content"
     android:background="@drawable/widget_item_rounded_corner"
     android:foreground="?android:attr/selectableItemBackground"
-    android:padding="5dp"
-    android:paddingStart="5dp"
-    android:paddingEnd="5dp">
+    android:padding="5dp">
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/item_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="start"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_toStartOf="@id/item_note_icon"
         android:textColor="@color/black"
         android:textSize="20sp" />
 
@@ -23,6 +24,18 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/item_title"
         android:layout_alignParentBottom="true"
+        android:layout_marginStart="5dp"
         android:layout_marginBottom="3dp"
         android:textSize="12sp" />
+
+    <ImageView
+        android:id="@+id/item_note_icon"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/round_notes_black_24"
+        android:tint="@color/dullGrey"
+        android:visibility="gone" />
 </RelativeLayout>