From 4c541fb8d29eee26c8504d034b2bd88eb50f92e4 Mon Sep 17 00:00:00 2001 From: Russell Cullen Date: Thu, 5 Jun 2025 12:39:37 -0400 Subject: [PATCH 1/3] Basic notice and build fixes --- build.gradle | 6 +++++ settings.gradle | 1 - simplified-main/build.gradle | 1 - .../org/nypl/simplified/main/MainActivity.kt | 19 +++++++++++++++ .../src/main/res/layout/main_host.xml | 1 + simplified-tests-sandbox/build.gradle | 1 - .../ui/catalog/CatalogFeedFragment.kt | 23 +++++++++---------- .../src/main/res/layout/feed.xml | 23 ++++++++++++++++++- .../src/main/res/layout/feed_header.xml | 1 - 9 files changed, 59 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index a3ae4977a..bcde32c66 100644 --- a/build.gradle +++ b/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" + } } /** diff --git a/settings.gradle b/settings.gradle index aa2189cf4..06f04e555 100644 --- a/settings.gradle +++ b/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' diff --git a/simplified-main/build.gradle b/simplified-main/build.gradle index 496f8b0e1..b57edc6a0 100644 --- a/simplified-main/build.gradle +++ b/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 diff --git a/simplified-main/src/main/java/org/nypl/simplified/main/MainActivity.kt b/simplified-main/src/main/java/org/nypl/simplified/main/MainActivity.kt index 538990290..c747173cd 100644 --- a/simplified-main/src/main/java/org/nypl/simplified/main/MainActivity.kt +++ b/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(R.id.mainRoot) + ViewCompat.setOnApplyWindowInsetsListener(parent) { v, windowInsets -> + v.updateLayoutParams { + 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 { diff --git a/simplified-main/src/main/res/layout/main_host.xml b/simplified-main/src/main/res/layout/main_host.xml index a3335dc12..85532908c 100644 --- a/simplified-main/src/main/res/layout/main_host.xml +++ b/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"> + + + + @@ -50,5 +70,6 @@ /> + - \ No newline at end of file + diff --git a/simplified-ui-catalog/src/main/res/layout/feed_header.xml b/simplified-ui-catalog/src/main/res/layout/feed_header.xml index 0084c236b..083e3117c 100644 --- a/simplified-ui-catalog/src/main/res/layout/feed_header.xml +++ b/simplified-ui-catalog/src/main/res/layout/feed_header.xml @@ -11,7 +11,6 @@ - Date: Thu, 5 Jun 2025 12:52:20 -0400 Subject: [PATCH 2/3] Bump version --- simplified-app-simplye/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simplified-app-simplye/gradle.properties b/simplified-app-simplye/gradle.properties index 2e3a1789d..a71d033e2 100644 --- a/simplified-app-simplye/gradle.properties +++ b/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. From 3b49d3ba6b21ae6fa4c83166c4d552c9b0b394a1 Mon Sep 17 00:00:00 2001 From: Russell Cullen Date: Wed, 11 Jun 2025 11:11:45 -0400 Subject: [PATCH 3/3] Update copy --- .../simplified/ui/announcements/AnnouncementsDialog.kt | 8 -------- .../src/main/res/layout/announcements_dialog.xml | 1 + .../org/nypl/simplified/ui/catalog/CatalogFeedFragment.kt | 2 +- simplified-ui-catalog/src/main/res/layout/feed.xml | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/simplified-ui-announcements/src/main/java/org/nypl/simplified/ui/announcements/AnnouncementsDialog.kt b/simplified-ui-announcements/src/main/java/org/nypl/simplified/ui/announcements/AnnouncementsDialog.kt index 0f8b4820e..8e7756892 100644 --- a/simplified-ui-announcements/src/main/java/org/nypl/simplified/ui/announcements/AnnouncementsDialog.kt +++ b/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 } } diff --git a/simplified-ui-announcements/src/main/res/layout/announcements_dialog.xml b/simplified-ui-announcements/src/main/res/layout/announcements_dialog.xml index 1bb61cd61..ed1528e26 100644 --- a/simplified-ui-announcements/src/main/res/layout/announcements_dialog.xml +++ b/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" /> diff --git a/simplified-ui-catalog/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedFragment.kt b/simplified-ui-catalog/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedFragment.kt index 9ca225435..8e2db28b3 100644 --- a/simplified-ui-catalog/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedFragment.kt +++ b/simplified-ui-catalog/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedFragment.kt @@ -139,7 +139,7 @@ class CatalogFeedFragment : Fragment(), AgeGateDialog.BirthYearSelectedListener binding.lifecycleOwner = viewLifecycleOwner binding.eolNotice.setOnClickListener { - val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://nypl.org")) + val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://nypl.org/ebookhelp")) startActivity(browserIntent) } diff --git a/simplified-ui-catalog/src/main/res/layout/feed.xml b/simplified-ui-catalog/src/main/res/layout/feed.xml index ff73b06c8..d71ee43c1 100644 --- a/simplified-ui-catalog/src/main/res/layout/feed.xml +++ b/simplified-ui-catalog/src/main/res/layout/feed.xml @@ -26,7 +26,7 @@ android:paddingEnd="32dp" android:gravity="center" android:textColor="@android:color/white" - android:text="SimplyE will be ending its ebook and audiobooks service on August 30th, 2025." + android:text="Please note: SimplyE will discontinue service in late August 2025. Learn more: nypl.org/ebookhelp" android:background="#143661" />