--- a/app/src/google/java/com/geekorum/ttrss/in_app_update/PlayStoreInAppUpdateManager.kt Wed Mar 03 21:27:45 2021 -0400
+++ b/app/src/google/java/com/geekorum/ttrss/in_app_update/PlayStoreInAppUpdateManager.kt Wed Mar 03 21:52:26 2021 -0400
@@ -113,7 +113,6 @@
@Module
object PlayStoreInAppUpdateModule {
- @JvmStatic
@Provides
fun providesInAppUpdateManager(application: Application): InAppUpdateManager {
val appUpdateManager = AppUpdateManagerFactory.create(application)
--- a/app/src/main/AndroidManifest.xml Wed Mar 03 21:27:45 2021 -0400
+++ b/app/src/main/AndroidManifest.xml Wed Mar 03 21:52:26 2021 -0400
@@ -121,10 +121,10 @@
android:name="com.geekorum.ttrss.providers.ArticlesProvider"
android:exported="false"/>
- <!-- Disable WorkManagerInitializer and initialize manually in Application -->
+ <!-- Remove WorkManagerInitializer and initialize manually in Application -->
<provider android:name="androidx.work.impl.WorkManagerInitializer"
android:authorities="${applicationId}.workmanager-init"
- android:enabled="false"/>
+ tools:node="remove"/>
<!-- Preloaded downloaded fonts -->
<meta-data
--- a/app/src/main/res/layout/activity_add_feed_installer.xml Wed Mar 03 21:27:45 2021 -0400
+++ b/app/src/main/res/layout/activity_add_feed_installer.xml Wed Mar 03 21:52:26 2021 -0400
@@ -22,6 +22,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -32,6 +33,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:navGraph="@navigation/add_feed_installer"
- app:defaultNavHost="true" />
+ app:defaultNavHost="true"
+ tools:ignore="Instantiatable" /> <!-- we set up a FragmentFactory-->
</FrameLayout>
--- a/app/src/main/res/layout/activity_install_feature.xml Wed Mar 03 21:27:45 2021 -0400
+++ b/app/src/main/res/layout/activity_install_feature.xml Wed Mar 03 21:52:26 2021 -0400
@@ -36,7 +36,7 @@
<ImageView
android:id="@+id/module_logo"
android:layout_width="200dp" android:layout_height="200dp"
- android:tint="?colorPrimary"
+ app:tint="?colorPrimary"
app:layout_constraintBottom_toTopOf="@+id/install_status"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/drawer_header.xml Wed Mar 03 21:27:45 2021 -0400
+++ b/app/src/main/res/layout/drawer_header.xml Wed Mar 03 21:52:26 2021 -0400
@@ -21,7 +21,9 @@
along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
-->
-<FrameLayout 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:layout_width="match_parent"
android:layout_height="128dp"
@@ -29,59 +31,45 @@
android:weightSum="1"
android:clickable="false">
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintGuide_end="56dp"
+ />
+
<ImageView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:id="@+id/imageView"
android:scaleType="fitXY"
android:src="@drawable/drawer_header_dark"
tools:ignore="ContentDescription" />
- <FrameLayout
- android:layout_width="match_parent"
- android:background="@android:color/transparent"
- android:layout_height="match_parent">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="56dp"
- android:orientation="vertical"
- android:id="@+id/linearLayout"
- android:layout_gravity="center_horizontal|bottom">
-
- <TextView
- android:id="@+id/drawer_header_login"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:textColor="@android:color/primary_text_dark"
- tools:text="test"
- android:textSize="14sp"
- android:textStyle="bold"
-
- />
-
- <TextView
- android:id="@+id/drawer_header_server"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@android:color/primary_text_dark"
- android:layout_marginStart="16dp"
- android:layout_marginTop="5dp"
- tools:text="example.org"
- android:textSize="14sp"
- android:textStyle="normal"
-
- />
- </LinearLayout>
- </FrameLayout>
-
- <ProgressBar
- style="?android:attr/progressBarStyleHorizontal"
- android:visibility="invisible"
- android:indeterminate="true"
+ <TextView
+ android:id="@+id/drawer_header_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/feeds_loading_bar"
- android:layout_gravity="bottom" />
-</FrameLayout>
+ app:layout_constraintTop_toTopOf="@id/guideline"
+ android:paddingHorizontal="16dp"
+ android:textColor="@android:color/primary_text_dark"
+ tools:text="test"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ />
+
+ <TextView
+ android:id="@+id/drawer_header_server"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/drawer_header_login"
+ android:paddingHorizontal="16dp"
+ android:textColor="@android:color/primary_text_dark"
+ android:layout_marginTop="5dp"
+ tools:text="example.org"
+ android:textSize="14sp"
+ android:textStyle="normal"
+ />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/view_change_read_decoration.xml Wed Mar 03 21:27:45 2021 -0400
+++ b/app/src/main/res/layout/view_change_read_decoration.xml Wed Mar 03 21:52:26 2021 -0400
@@ -21,7 +21,9 @@
along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
-->
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.Gravity" />
<variable name="isSwipeToRight" type="boolean" />
@@ -32,10 +34,11 @@
android:text="@{ article.transientUnread ? @string/mark_as_read : @string/mark_as_unread }"
android:drawableStart="@{ isSwipeToRight ? @drawable/ic_archive : null }"
android:drawableEnd="@{ !isSwipeToRight ? @drawable/ic_archive : null }"
- android:drawableTint="?colorAccent"
+ app:drawableTint="?colorAccent"
android:drawablePadding="8dp"
android:padding="@dimen/activity_horizontal_margin"
android:gravity="@{ Gravity.CENTER_VERTICAL | (isSwipeToRight ? Gravity.START : Gravity.END) }"
- android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
+ android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+ tools:ignore="UseCompatTextViewDrawableXml" /> <!-- we use databinding -->
-</layout>
\ No newline at end of file
+</layout>
--- a/app/src/main/res/values-night/colors.xml Wed Mar 03 21:27:45 2021 -0400
+++ b/app/src/main/res/values-night/colors.xml Wed Mar 03 21:52:26 2021 -0400
@@ -22,7 +22,4 @@
-->
<resources>
<color name="image_scrim">#88000000</color>
-
- <!-- Article list activity -->
- <color name="article_list_header">@color/dark_color_primary_surface</color>
</resources>
--- a/app/src/main/res/xml/network_security_config.xml Wed Mar 03 21:27:45 2021 -0400
+++ b/app/src/main/res/xml/network_security_config.xml Wed Mar 03 21:52:26 2021 -0400
@@ -21,12 +21,13 @@
along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
-->
-<network-security-config>
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
<base-config>
<trust-anchors>
<certificates src="system"/>
<!-- also trust user added CA -->
- <certificates src="user"/>
+ <certificates src="user"
+ tools:ignore="AcceptsUserCertificates" />
</trust-anchors>
</base-config>
</network-security-config>
--- a/manage_feeds/src/main/java/com/geekorum/ttrss/manage_feeds/add_feed/EnterFeedUrlFragment.kt Wed Mar 03 21:27:45 2021 -0400
+++ b/manage_feeds/src/main/java/com/geekorum/ttrss/manage_feeds/add_feed/EnterFeedUrlFragment.kt Wed Mar 03 21:52:26 2021 -0400
@@ -49,7 +49,7 @@
binding.viewModel = viewModel
binding.lifecycleOwner = viewLifecycleOwner
- viewModel.invalidUrlEvent.observe(this, EventObserver {
+ viewModel.invalidUrlEvent.observe(viewLifecycleOwner, EventObserver {
binding.feedUrl.error = "Invalid url"
})
@@ -77,7 +77,7 @@
}
}
- viewModel.ioErrorEvent.observe(this, EventObserver {
+ viewModel.ioErrorEvent.observe(viewLifecycleOwner, EventObserver {
val action = EnterFeedUrlFragmentDirections.actionDisplayError(
R.string.fragment_display_error_io_error)
navController.navigate(action)