Fix issues with sources

Fix sources colors
Fix login activity layout (#381 )
2021-11-23 19:35:34 +01:00 · 2021-11-23 19:34:42 +01:00 · 2021-11-22 20:59:36 +01:00 · 2021-11-22 20:32:02 +01:00 · 2021-11-22 07:09:12 +01:00 · 2021-11-22 07:07:20 +01:00
24 changed files with 106 additions and 44 deletions
--- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/DateUtilsTest.kt
+++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/DateUtilsTest.kt
@@ -0,0 +1,31 @@
+package apps.amine.bou.readerforselfoss
+
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.parseDate
+import org.junit.Test
+
+class DateUtilsTest {
+
+    @Test
+    fun parseDateV4() {
+
+        Config.apiVersion = 4
+        val dateString = "2013-04-07T13:43:00+01:00"
+
+        val milliseconds = parseDate(dateString).toEpochMilli()
+        val correctMilliseconds : Long = 1365338580000
+
+        assert(milliseconds == correctMilliseconds)
+    }
+
+    @Test
+    fun parseDateV1() {
+        Config.apiVersion = 0
+        val dateString = "2013-04-07 13:43:00"
+
+        val milliseconds = parseDate(dateString).toEpochMilli()
+        val correctMilliseconds = 1365342180000
+
+        assert(milliseconds == correctMilliseconds)
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@@ -29,6 +29,12 @@ class SourcesActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        appColors = AppColors(this@SourcesActivity)

+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
+        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        }
+
        super.onCreate(savedInstanceState)
        binding = ActivitySourcesBinding.inflate(layoutInflater)
        val view = binding.root
@@ -71,7 +77,7 @@ class SourcesActivity : AppCompatActivity() {
        binding.recyclerView.setHasFixedSize(true)
        binding.recyclerView.layoutManager = mLayoutManager

-        if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.recyclerView))) {
+        if (this@SourcesActivity.isNetworkAccessible(binding.recyclerView)) {
            api.sources.enqueue(object : Callback<List<Source>> {
                override fun onResponse(
                    call: Call<List<Source>>,
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
@@ -51,6 +51,7 @@ class Config(c: Context) {
            editor.remove("url")
            editor.remove("login")
            editor.remove("password")
+            editor.remove("apiVersionMajor")
            editor.apply()
            val intent = Intent(c, LoginActivity::class.java)
            if (baseUrlFail) {
--- a/app/src/main/res/layout/activity_add_source.xml
+++ b/app/src/main/res/layout/activity_add_source.xml
@@ -7,7 +7,7 @@
    tools:context="apps.amine.bou.readerforselfoss.AddSourceActivity">
    <LinearLayout
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
        android:orientation="vertical">

        <com.google.android.material.appbar.AppBarLayout
@@ -55,7 +55,8 @@
                android:layout_marginRight="16dp"
                android:layout_marginStart="16dp"
                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"/>
+                android:layout_marginLeft="16dp"
+                android:gravity="center_horizontal" />

            <EditText
                android:layout_width="match_parent"
@@ -67,7 +68,9 @@
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toRightOf="parent"
                android:inputType="text"
-                android:hint="@string/add_source_hint_name"/>
+                android:hint="@string/add_source_hint_name"
+                android:textColorHint="?android:textColorPrimary"
+                android:autofillHints="false" />

            <EditText
                android:layout_width="match_parent"
@@ -76,10 +79,12 @@
                android:ems="10"
                android:id="@+id/sourceUri"
                android:hint="@string/add_source_hint_url"
+                android:textColorHint="?android:textColorPrimary"
                android:layout_marginTop="16dp"
                app:layout_constraintTop_toBottomOf="@+id/nameInput"
                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"/>
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:autofillHints="false" />

            <EditText
                android:layout_width="match_parent"
@@ -91,7 +96,9 @@
                android:layout_marginTop="16dp"
                app:layout_constraintTop_toBottomOf="@+id/sourceUri"
                android:hint="@string/add_source_hint_tags"
-                android:inputType="text"/>
+                android:textColorHint="?android:textColorPrimary"
+                android:inputType="text"
+                android:autofillHints="false" />

            <Spinner
                android:layout_width="match_parent"
@@ -100,7 +107,8 @@
                app:layout_constraintTop_toBottomOf="@+id/tags"
                app:layout_constraintRight_toRightOf="parent"
                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_height="40dp"/>
+                android:layout_height="40dp"
+                android:theme="@style/App.Spinner"/>

            <Button
                android:text="@string/add_source_save"
--- a/app/src/main/res/layout/activity_sources.xml
+++ b/app/src/main/res/layout/activity_sources.xml
@@ -31,14 +31,13 @@
        android:id="@+id/fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom|right"
-        android:src="@drawable/ic_add_white_24dp"
+        android:layout_gravity="end|bottom|end"
+        app:srcCompat="@drawable/ic_add_white_24dp"
        android:paddingBottom="@dimen/activity_vertical_margin"
        android:paddingTop="@dimen/activity_vertical_margin"
        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
        android:layout_alignParentEnd="true"
        android:layout_marginBottom="16dp"
        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"/>
+        android:contentDescription="@string/add_source" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/source_list_item.xml
+++ b/app/src/main/res/layout/source_list_item.xml
@@ -1,55 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
    android:layout_width="match_parent"
-    android:layout_height="48dp">
+    android:layout_height="48dp"
+    android:orientation="vertical">


    <ImageView
        android:id="@+id/itemImage"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginStart="16dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginLeft="16dp"
        android:layout_width="36dp"
-        android:layout_height="36dp"/>
+        android:layout_height="36dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />

    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="17dp"
        android:id="@+id/sourceTitle"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/itemImage"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
+        android:layout_width="0dp"
+        android:layout_height="17dp"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:gravity="start"
+        android:maxLines="1"
+        android:textAlignment="textStart"
        android:textSize="13sp"
-        android:textAlignment="viewStart"
-        tools:text="source title "
-        android:gravity="start" />
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="source title" />

    <Button
        android:id="@+id/deleteBtn"
-        android:background="@drawable/ic_remove_circle_outline_black_24dp"
        style="@style/Widget.AppCompat.Button.Borderless"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/ic_remove_circle_outline_black_24dp"
        android:backgroundTint="?android:textColorSecondary"
        android:elevation="4dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/remove_source"
        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginRight="16dp"
-        android:layout_marginStart="8dp"
-        app:layout_constraintLeft_toRightOf="@+id/sourceTitle"
-        android:layout_marginLeft="8dp"
-        app:layout_constraintHorizontal_bias="1.0"
-        android:layout_width="34dp"
-        android:layout_height="34dp"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Barre statique pour le visionneur d\'articles</string>
    <string name="reader_static_bar_on">La barre sera affichée</string>
    <string name="reader_static_bar_off">La barre sera affichée grâce au bouton</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Barra inferior estática na vista de artigos</string>
    <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string>
    <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string>
+    <string name="remove_source">Eliminar fonte</string>
 </resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-si-rLK/strings.xml
+++ b/app/src/main/res/values-si-rLK/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">文章查看器中的静态底部栏</string>
    <string name="reader_static_bar_on">底部栏将始终显示</string>
    <string name="reader_static_bar_off">底部栏可以通过浮动按钮显示</string>
+    <string name="remove_source">删除源</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,4 +168,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -58,4 +58,9 @@
        <item name="android:tint">?android:textColorPrimary</item>
    </style>

+    <!-- Spinner Theme -->
+    <style name="App.Spinner" parent="Widget.AppCompat.Light.DropDownItem.Spinner">
+        <item name="android:textColor">?android:textColorPrimary</item>
+    </style>
+
 </resources>
Author	SHA1	Message	Date
davidoskky	29d99fca17	Fix issues with sources	2021-11-23 19:35:34 +01:00
davidoskky	d7d4eb3974	Fix sources colors	2021-11-23 19:34:42 +01:00
davidoskky	cedb207eca	Fix login activity layout (#381 )	2021-11-22 20:59:36 +01:00
Amine Bou	b9e91f30ef	New Crowdin updates (#384 ) * New translations strings.xml (Sinhala) * New translations strings.xml (Sinhala) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Catalan) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Galician) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Indonesian) * New translations strings.xml (Persian) * New translations strings.xml (Sinhala) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Catalan) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Galician) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Indonesian) * New translations strings.xml (Persian) * New translations strings.xml (Sinhala) * New translations strings.xml (French) * New translations strings.xml (Galician) * New translations strings.xml (Galician) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Catalan) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Galician) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Indonesian) * New translations strings.xml (Persian) * New translations strings.xml (Sinhala) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Galician) Co-authored-by: Amine Bou <aminecmi@gmail.com>	2021-11-22 20:32:02 +01:00
davidoskky	6a8c2d7fcd	Trim sources title when too long (#383 )	2021-11-22 07:09:12 +01:00
davidoskky	60a908a44a	Clear api version when disconnecting. (#382 ) Closes #354	2021-11-22 07:07:20 +01:00
davidoskky	6b887ff74b	Date utils test (#380 ) * Add test for date parsing * Add test for the older api * Correct milliseconds format	2021-11-16 20:04:24 +01:00