Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 285e9b97 authored by alperozturk's avatar alperozturk
Browse files

fix category 



Signed-off-by: default avataralperozturk <alper_ozturk@proton.me>
parent 93ee1b54

app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt

+9 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ import android.content.Context 
import android.content.Intent

import android.content.Intent

import android.os.Bundle

import android.os.Bundle

import android.util.Log

import android.util.Log

import android.view.View

import android.widget.RemoteViews

import android.widget.RemoteViews

import android.widget.RemoteViewsService.RemoteViewsFactory

import android.widget.RemoteViewsService.RemoteViewsFactory

import androidx.core.net.toUri

import androidx.core.net.toUri
@@ -140,7 +141,14 @@ class NoteListWidgetFactory internal constructor(private val context: Context, i 
                setOnClickFillInIntent(R.id.widget_entry_fav_icon, createNoteIntent)

                setOnClickFillInIntent(R.id.widget_entry_fav_icon, createNoteIntent)

            }

            }





            setTextViewText(R.id.widget_entry_content_tv, (note.title + data?.category))

            setTextViewText(R.id.widget_entry_title, note.title)



            if (note.category.isEmpty()) {

                setViewVisibility(R.id.widget_entry_category, View.GONE)

            } else {

                setViewVisibility(R.id.widget_entry_category, View.VISIBLE)

                setTextViewText(R.id.widget_entry_category, note.category)

            }





            val starIconId = if (note.favorite) {

            val starIconId = if (note.favorite) {

                R.drawable.ic_star_yellow_24dp

                R.drawable.ic_star_yellow_24dp

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

+21 −11
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--

<!--

 ~ Nextcloud Notes - Android Client

 ~ Nextcloud Notes - Android Client

 ~

 ~

 ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors

 ~ SPDX-FileCopyrightText: 2017-2025 Nextcloud GmbH and Nextcloud contributors

 ~ SPDX-License-Identifier: GPL-3.0-or-later

 ~ SPDX-License-Identifier: GPL-3.0-or-later

-->

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -12,6 +12,7 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:orientation="horizontal"

    android:gravity="center"

    android:paddingVertical="@dimen/spacer_1x"

    android:paddingVertical="@dimen/spacer_1x"

    android:paddingStart="@null"

    android:paddingStart="@null"

    android:paddingEnd="@dimen/spacer_1hx">

    android:paddingEnd="@dimen/spacer_1hx">
@@ -22,24 +23,33 @@ 
        android:layout_height="@dimen/widget_note_list_fav_icon_height"

        android:layout_height="@dimen/widget_note_list_fav_icon_height"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center_vertical"

        android:contentDescription="@string/widget_entry_fav_contentDescription"

        android:contentDescription="@string/widget_entry_fav_contentDescription"

        android:foregroundGravity="center_vertical"

        android:paddingStart="@dimen/widget_note_list_inner_padding"

        android:paddingStart="@dimen/widget_note_list_inner_padding"

        android:paddingEnd="@dimen/widget_note_list_outer_padding"

        android:paddingEnd="@dimen/widget_note_list_outer_padding"

        app:srcCompat="@drawable/ic_star_yellow_24dp" />

        app:srcCompat="@drawable/ic_star_yellow_24dp" />





    <TextView

    <TextView

        android:id="@+id/widget_entry_content_tv"

        android:id="@+id/widget_entry_title"

        android:layout_width="0dp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:layout_weight="1"

        android:ellipsize="end"

        android:layout_gravity="center_vertical"

        android:gravity="center_vertical"

        android:textStyle="bold"

        android:lines="1"

        android:paddingStart="@dimen/widget_note_list_inner_padding"

        android:paddingEnd="@dimen/widget_note_list_outer_padding"

        android:textColor="@color/widget_foreground"

        android:textColor="@color/widget_foreground"

        android:textSize="14sp"

        android:textSize="14sp"

        tools:text="@tools:sample/lorem/random" />

        tools:text="First note" />





    <TextView

        android:id="@+id/widget_entry_category"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:paddingHorizontal="8dp"

        android:paddingVertical="4dp"

        android:background="@drawable/border"

        android:textSize="12sp"

        android:textColor="@color/category_border"

        android:gravity="center"

        android:visibility="gone"

        tools:visibility="visible"

        tools:text="Important"/>

</LinearLayout>
 
</LinearLayout>