Merge pull request #1014 from NYPL-Simplified/release/7.2.10-eol

End of life notice

Author: russellcullen

build.gradle

@@ -185,6 +185,7 @@ subprojects { project ->
       allowInsecureProtocol true
     }
     maven { url "https://jitpack.io" }
+    maven { url "https://oss.sonatype.org/content/repositories/releases/" }
     jcenter()
   }
 
@@ -212,6 +213,11 @@ subprojects { project ->
       }
     }
   }
+  project.configurations.all {
+    resolutionStrategy.force "com.google.android.exoplayer:exoplayer:2.13.3"
+    resolutionStrategy.force "com.google.android.exoplayer:exoplayer-core:2.13.3"
+    resolutionStrategy.force "com.github.kittinunf.fuel:fuel-android:2.2.3"
+  }
 }
 
 /**

settings.gradle

@@ -99,7 +99,6 @@ include ':simplified-ui-thread-api'
 include ':simplified-viewer-api'
 include ':simplified-viewer-audiobook'
 include ':simplified-viewer-epub-readium2'
-include ':simplified-viewer-pdf'
 include ':simplified-viewer-spi'
 include ':simplified-webview'
 include ':simplified-metrics'

simplified-app-simplye/gradle.properties

@@ -2,7 +2,7 @@ POM_ARTIFACT_ID=org.librarysimplified.simplye.app
 POM_DESCRIPTION=SimplyE (Application)
 POM_NAME=org.librarysimplified.simplye.app
 POM_PACKAGING=apk
-VERSION_NAME=7.2.9
+VERSION_NAME=7.2.10
 
 # Skip this project unless the property `org.librarysimplified.drm.enabled=true`
 # is also defined.

simplified-main/build.gradle

@@ -68,7 +68,6 @@ dependencies {
   api project(":simplified-viewer-api")
   api project(":simplified-viewer-audiobook")
   api project(":simplified-viewer-epub-readium2")
-  api project(":simplified-viewer-pdf")
   api project(":simplified-viewer-spi")
 
   api libs.androidx.app.compat

simplified-main/src/main/java/org/nypl/simplified/main/MainActivity.kt

@@ -4,8 +4,15 @@ import android.app.ActionBar
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.view.ViewGroup
+import android.view.WindowInsets
+import android.widget.FrameLayout
+import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.commit
 import androidx.lifecycle.ViewModelProvider
@@ -69,6 +76,18 @@ class MainActivity : AppCompatActivity(R.layout.main_host) {
         this.supportActionBar?.hide()
       }
     }
+
+    val parent = findViewById<LinearLayout>(R.id.mainRoot)
+    ViewCompat.setOnApplyWindowInsetsListener(parent) { v, windowInsets ->
+      v.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+        leftMargin = insets.left
+        bottomMargin = insets.bottom
+        rightMargin = insets.right
+        topMargin = insets.top
+      }
+      WindowInsetsCompat.CONSUMED
+    }
   }
 
   override fun getDefaultViewModelProviderFactory(): ViewModelProvider.Factory {

simplified-main/src/main/res/layout/main_host.xml

@@ -3,6 +3,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:id="@+id/mainRoot"
   android:orientation="vertical">
 
   <androidx.appcompat.widget.Toolbar

simplified-tests-sandbox/build.gradle

@@ -33,7 +33,6 @@ dependencies {
   implementation project(":simplified-ui-thread-api")
   implementation project(":simplified-viewer-api")
   implementation project(":simplified-viewer-audiobook")
-  implementation project(":simplified-viewer-pdf")
   implementation project(':simplified-ui-navigation-tabs')
 
   implementation libs.androidx.app.compat

simplified-ui-announcements/src/main/java/org/nypl/simplified/ui/announcements/AnnouncementsDialog.kt

@@ -56,17 +56,9 @@ class AnnouncementsDialog : DialogFragment(R.layout.announcements_dialog) {
   }
 
   private fun reconfigureUI(announcementIndex: Int) {
-    val title =
-      requireContext().getString(
-        R.string.announcementTitle,
-        this.viewModel.account.provider.displayName,
-        announcementIndex + 1,
-        this.viewModel.announcements.size
-      )
     val announcement =
       this.viewModel.announcements[announcementIndex].content
 
-    this.title.text = title
     this.content.text = announcement
   }
 }

simplified-ui-announcements/src/main/res/layout/announcements_dialog.xml

@@ -13,6 +13,7 @@
         android:layout_margin="16dp"
         android:textSize="20sp"
         android:textStyle="bold"
+        android:text="Important Update"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

simplified-ui-catalog/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedFragment.kt

@@ -2,22 +2,14 @@ package org.nypl.simplified.ui.catalog
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
+import android.view.*
 import android.view.View.TEXT_ALIGNMENT_TEXT_END
-import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import android.widget.Button
-import android.widget.LinearLayout
-import android.widget.RadioButton
-import android.widget.RadioGroup
-import android.widget.Space
+import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.AppCompatButton
 import androidx.appcompat.widget.AppCompatTextView
@@ -59,6 +51,7 @@ import org.nypl.simplified.ui.catalog.withoutGroups.CatalogPagedAdapter
 import org.nypl.simplified.ui.screen.ScreenSizeInformationType
 import org.slf4j.LoggerFactory
 
+
 /**
  * A fragment displaying an OPDS feed.
  */
@@ -144,6 +137,12 @@ class CatalogFeedFragment : Fragment(), AgeGateDialog.BirthYearSelectedListener
     binding = FeedBinding.inflate(inflater, container, false)
     binding.viewModel = viewModel
     binding.lifecycleOwner = viewLifecycleOwner
+
+    binding.eolNotice.setOnClickListener {
+      val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://nypl.org/ebookhelp"))
+      startActivity(browserIntent)
+    }
+
     return binding.root
   }