Merge remote-tracking branch 'origin/public' into public

Handle public access in the article fragment
Remove the button to read/unread articles
2023-01-26 18:01:03 +01:00 · 2023-01-26 17:57:25 +01:00 · 2023-01-26 17:57:25 +01:00 · 2023-01-26 17:53:20 +01:00 · 2023-01-26 17:53:20 +01:00 · 2023-01-26 17:53:20 +01:00
3 changed files with 19 additions and 27 deletions
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
@ -84,7 +84,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
    }

    private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled()) {
+        if (appSettingsService.isMarkOnScrollEnabled() and !appSettingsService.getPublicAccess()) {
            CoroutineScope(Dispatchers.IO).launch {
                repository.markAsRead(item)
            }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
@ -56,6 +56,10 @@ class ItemCardAdapter(
            val itm = items[position]

            binding.favButton.isSelected = itm.starred
+            if (appSettingsService.getPublicAccess()) {
+                binding.favButton.visibility = View.GONE
+            }
+
            binding.title.text = itm.title.getHtmlDecoded()

            binding.title.setOnTouchListener(LinkOnTouchListener())
--- a/androidApp/src/main/res/layout/card_item.xml
+++ b/androidApp/src/main/res/layout/card_item.xml
@ -47,7 +47,6 @@
                android:id="@+id/sourceImage"
                android:layout_width="40dp"
                android:layout_height="40dp"
-                android:layout_marginLeft="8dp"
                android:layout_marginStart="8dp"
                android:layout_marginTop="8dp"
                app:layout_constraintLeft_toLeftOf="parent"
@ -85,41 +84,32 @@
                app:layout_constraintTop_toBottomOf="@+id/title"
                tools:text="Google Actualité Il y a 5h" />

-            <RelativeLayout
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="16dp"
+                android:layout_marginEnd="8dp"
                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toRightOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">

                <ImageButton
-                    android:id="@+id/favButton"
+                    android:id="@+id/browserBtn"
                    android:layout_width="35dp"
                    android:layout_height="35dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                    android:adjustViewBounds="true"
                    android:background="@android:color/transparent"
                    android:elevation="5dp"
                    android:padding="4dp"
                    android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_menu_heart_60dp"
-                    app:tint="@color/ic_menu_heart_color" />
+                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                    app:tint="?android:attr/textColorPrimary" />

                <ImageButton
                    android:id="@+id/shareBtn"
                    android:layout_width="35dp"
                    android:layout_height="35dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_toLeftOf="@+id/favButton"
-                    android:layout_toStartOf="@+id/favButton"
+                    android:layout_marginStart="16dp"
                    android:adjustViewBounds="true"
                    android:background="@android:color/transparent"
                    android:elevation="5dp"
@ -129,23 +119,21 @@
                    app:tint="?android:attr/textColorPrimary" />

                <ImageButton
-                    android:id="@+id/browserBtn"
+                    android:id="@+id/favButton"
                    android:layout_width="35dp"
                    android:layout_height="35dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_toLeftOf="@+id/shareBtn"
-                    android:layout_toStartOf="@+id/shareBtn"
+                    android:layout_marginStart="16dp"
                    android:adjustViewBounds="true"
                    android:background="@android:color/transparent"
                    android:elevation="5dp"
                    android:padding="4dp"
                    android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
-                    app:tint="?android:attr/textColorPrimary" />
+                    app:srcCompat="@drawable/ic_menu_heart_60dp"
+                    app:tint="@color/ic_menu_heart_color" />

-            </RelativeLayout>
+
+
+            </LinearLayout>

        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.constraintlayout.widget.ConstraintLayout>
Author	SHA1	Message	Date
davidoskky	84f190ac2e	Merge remote-tracking branch 'origin/public' into public	2023-01-26 18:01:03 +01:00
davidoskky	e7ecc6f4d3	Handle public access in the article fragment Remove the button to read/unread articles	2023-01-26 17:57:25 +01:00
davidoskky	95ce7c3739	Handle public access in the article reader screen Remove the favourite button from the article reader if accessing a public instance and don't mark articles as read when scrolling.	2023-01-26 17:57:25 +01:00
davidoskky	4cd2812130	Hide the favourite button in card items when accessing a public instance	2023-01-26 17:53:20 +01:00
davidoskky	2cd48e3a65	Handle public access in the home screen In public access mode we can only read articles. Disable swiping articles in the listing to read them and remove the menu items to read all articles and to access sources settings.	2023-01-26 17:53:20 +01:00
davidoskky	a2b22bbba8	Add tests for the public access determination logic	2023-01-26 17:53:20 +01:00
davidoskky	d8cb9ae368	Fix broken tests	2023-01-26 17:53:20 +01:00