8.32.1 Production

.java-version

@@ -1 +1 @@
-17
+21

CREDITS.md

@@ -9,7 +9,7 @@ Many thanks for your contributions and the years spent working together!
 * Mike Herbig
 * John Oberhauser
 * Devota Aabel
-* Daniel Brooks
+* [@bassrock](https://github.com/bassrock)
 * Tim Choh
 * Thomas Ezan
 * James Yopp

Pocket/build.gradle.kts

@@ -15,8 +15,8 @@ plugins {
 }
 
 val versionMajor = 8 // Max value of 200
-val versionMinor = 31 // Max of two digits
-val versionPatch = 0 // Max of two digits
+val versionMinor = 32 // Max of two digits
+val versionPatch = 1 // Max of two digits
 val versionBuild = 0 // Max of three digits
 
 // See usage and more details below, but this produces version numbers like 6.2.4.1 and codes like 60204001
@@ -63,30 +63,15 @@ android {
         versionName = "$versionMajor.$versionMinor.$versionPatch.$versionBuild"
 
         vectorDrawables.useSupportLibrary = true // https://medium.com/@chrisbanes/appcompat-v23-2-age-of-the-vectors-91cbafa87c88#.m9i38hx27
-        resourceConfigurations.addAll(
-            arrayOf(
-                "de",
-                "es",
-                "es-rES",
-                "fr",
-                "fr-rCA",
-                "it",
-                "ja",
-                "ko",
-                "nl",
-                "pl",
-                "pt",
-                "pt-rBR",
-                "ru",
-                "zh",
-                "zh-rCN",
-                "zh-rTW"
-            )
-        )
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    androidResources {
+        localeFilters += listOf("de", "es", "es-rES", "fr", "fr-rCA", "it", "ja", "ko", "nl", "pl", "pt", "pt-rBR", "ru", "zh", "zh-rCN", "zh-rTW")
+        generateLocaleConfig = true
+    }
+
     flavorDimensions.add(FlavorDimensions.TARGET)
     productFlavors {
         // Development
@@ -346,4 +331,12 @@ dependencies {
     implementation(libs.sentry.okhttp)
 }
 
+kapt {
+    arguments {
+        arg("dagger.fastInit", "enabled")
+        arg("dagger.useBindingGraphFix", "ENABLED")
+        arg("dagger.ignoreProvisionKeyWildcards", "ENABLED")
+    }
+}
+
 registerCopyMergedManifestTask()

Pocket/merged_manifests/playUnsignedRelease/AndroidManifest.xml

@@ -3,8 +3,8 @@
     package="com.ideashower.readitlater.pro"
     android:installLocation="auto"
     android:targetSandboxVersion="2"
-    android:versionCode="83100000"
-    android:versionName="8.31.0.0" >
+    android:versionCode="83201000"
+    android:versionName="8.32.1.0" >
 
     <uses-sdk
         android:minSdkVersion="23"
@@ -84,7 +84,7 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/nm_icon"
-        android:localeConfig="@xml/locale_config"
+        android:localeConfig="@xml/_generated_res_locale_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/Theme.PocketDefault" >
 

Pocket/src/main/AndroidManifest.xml

@@ -57,7 +57,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/nm_icon"
         android:theme="@style/Theme.PocketDefault"
-        android:localeConfig="@xml/locale_config"
         android:networkSecurityConfig="@xml/network_security_config">
 
         <!-- Declaring support for larger aspect ratios than the default 1.86 (including Galaxy S8). see https://android-developers.googleblog.com/2017/03/update-your-app-to-take-advantage-of.html -->

Pocket/src/main/java/com/pocket/app/App.java

@@ -185,7 +185,7 @@ public void onCreate() {
 						"Help with Pocket",
 						message,
 						true, true,
-						new ErrorReport(t),
+						new ErrorReport(t, message),
 						null));
 
 		// Note: Recompile and Reverse Engineer Detection is currently hidden in Assets.start():
@@ -276,9 +276,9 @@ public static App from(Context context) {
 	/**
 	 * Convenience method for getting a string resource.
 	 * 
-	 * @param id
 	 * @deprecated access from a context you get in a constructor or parameter, avoid static access
 	 */
+	@Deprecated
 	public static String getStringResource(int id) {
 		if (id == 0) {
 			return null;

Pocket/src/main/java/com/pocket/app/home/Home.kt

@@ -19,7 +19,7 @@ class Home {
             corpusRecommendationId: String?,
         )
         fun onSeeAllRecommendationsClicked(
-            slateId: String,
+            index: Int,
             slateTitle: String
         )
         fun onSaveClicked(url: String, isSaved: Boolean, corpusRecommendationId: String?)
@@ -70,7 +70,7 @@ class Home {
         data object GoToMyList : Event()
 
         data class GoToSlateDetails(
-            val slateId: String,
+            val index: Int,
         ) : Event()
 
         data class GoToTopicDetails(

Pocket/src/main/java/com/pocket/app/home/HomeFragment.kt

@@ -143,7 +143,7 @@ class HomeFragment : AbsPocketFragment() {
             }
             is Home.Event.GoToSlateDetails -> {
                 findNavController().navigateSafely(
-                    HomeFragmentDirections.goToSlateDetails(event.slateId)
+                    HomeFragmentDirections.goToSlateDetails(event.index)
                 )
             }
             is Home.Event.GoToTopicDetails -> {

Pocket/src/main/java/com/pocket/app/home/HomeViewModel.kt

@@ -202,7 +202,6 @@ class HomeViewModel @Inject constructor(
                     // Report and filter out.
                     errorHandler.reportOnProductionOrThrow(RuntimeException(
                         "Slate is empty: " + listOf(
-                            "id = ${slate.id}",
                             "title = ${slate.title}",
                             "locale = $localeString",
                         )
@@ -287,9 +286,9 @@ class HomeViewModel @Inject constructor(
         )
     }
 
-    override fun onSeeAllRecommendationsClicked(slateId: String, slateTitle: String) {
+    override fun onSeeAllRecommendationsClicked(index: Int, slateTitle: String) {
         tracker.track(HomeEvents.slateSeeAllClicked(slateTitle = slateTitle))
-        _events.tryEmit(Home.Event.GoToSlateDetails(slateId))
+        _events.tryEmit(Home.Event.GoToSlateDetails(index))
     }
 
     override fun onTopicClicked(topicId: String, topicTitle: String) {
@@ -380,10 +379,7 @@ class HomeViewModel @Inject constructor(
         val title: String?,
         val subheadline: String?,
         val recommendations: List<RecommendationUiState>,
-    ) {
-        // Exclude slate id from `.equals()` etc., because it's not stable.
-        lateinit var slateId: String
-    }
+    )
 
     private fun DomainSlate.toRecommendationSlateUiState(
         stringLoader: StringLoader,
@@ -394,9 +390,7 @@ class HomeViewModel @Inject constructor(
         recommendations = recommendations
             .map { it.toRecommendationUiState(stringLoader) }
             .take(recommendationsPerSlate)
-    ).apply {
-        slateId = id
-    }
+    )
 
 
     data class TopicUiState(

Pocket/src/main/java/com/pocket/app/home/details/slates/SlateDetailsFragment.kt

@@ -39,7 +39,7 @@ class SlateDetailsFragment : DetailsFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.onInitialized(args.slateId)
+        viewModel.onInitialized(args.index)
     }
 
     override fun goToReader(event: DetailsViewModel.Event.GoToReader) {

Pocket/src/main/java/com/pocket/app/home/details/slates/SlateDetailsViewModel.kt

@@ -29,23 +29,23 @@ class SlateDetailsViewModel @Inject constructor(
     itemRepository = itemRepository,
     save = save,
     tracker = tracker,
-), SlateDetailsInteractions {
+) {
 
     private val localeString = locale.toString()
 
-    override fun onInitialized(slateId: String) {
-        setupSlateCollector(slateId)
+    fun onInitialized(index: Int) {
+        setupSlateCollector(index)
         _uiState.edit {
             copy(
                 screenState = ScreenState.Recommendations
             )
         }
     }
 
-    private fun setupSlateCollector(slateId: String) {
+    private fun setupSlateCollector(index: Int) {
         viewModelScope.launch {
             homeRepository.getLineup(localeString).collect { lineup ->
-                val slate = lineup.find { it.id == slateId }
+                val slate = lineup.getOrNull(index)
                 _uiState.edit {
                     copy(
                         title = slate?.title ?: "",
@@ -85,7 +85,3 @@ class SlateDetailsViewModel @Inject constructor(
         )
     }
 }
-
-interface SlateDetailsInteractions {
-    fun onInitialized(slateId: String)
-}

Pocket/src/main/java/com/pocket/app/home/slates/SlatesAdapter.kt

@@ -52,8 +52,8 @@ class SlatesAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) =
         when (holder) {
-            is SlateViewHolder -> holder.bind(getItem(position))
-            is SlatesTabletViewHolder -> holder.bind(getItem(position))
+            is SlateViewHolder -> holder.bind(getItem(position), position)
+            is SlatesTabletViewHolder -> holder.bind(getItem(position), position)
             else -> {}
         }
 
@@ -84,7 +84,7 @@ class SlatesAdapter(
             binding.minorCardRecyclerView.itemAnimator = null
         }
 
-        fun bind(state: HomeViewModel.RecommendationSlateUiState) {
+        fun bind(state: HomeViewModel.RecommendationSlateUiState, position: Int) {
             binding.title.text = state.title
             if (state.subheadline != null) {
                 binding.subtitle.text = state.subheadline
@@ -93,9 +93,7 @@ class SlatesAdapter(
             }
             binding.slateSeeAllLayout.apply {
                 setOnClickListener {
-                    if (state.slateId.isNotBlank()) {
-                        viewModel.onSeeAllRecommendationsClicked(state.slateId, state.title.orEmpty())
-                    }
+                    viewModel.onSeeAllRecommendationsClicked(position, state.title.orEmpty())
                 }
                 engageable.uiEntityComponentDetail = state.title
             }
@@ -139,17 +137,15 @@ class SlatesAdapter(
             binding.minorCardRecyclerView.itemAnimator = null
         }
 
-        fun bind(state: HomeViewModel.RecommendationSlateUiState) {
+        fun bind(state: HomeViewModel.RecommendationSlateUiState, position: Int) {
             binding.title.text = state.title
             if (state.subheadline != null) {
                 binding.subtitle.text = state.subheadline
             } else {
                 binding.subtitle.visibility = GONE
             }
             binding.seeAllLayout.setOnClickListener {
-                if (state.slateId.isNotBlank()) {
-                    viewModel.onSeeAllRecommendationsClicked(state.slateId, state.title.orEmpty())
-                }
+                viewModel.onSeeAllRecommendationsClicked(position, state.title.orEmpty())
             }
 
             // first item goes to the hero card

Pocket/src/main/java/com/pocket/app/list/MyListFragment.kt

@@ -23,9 +23,11 @@ import com.pocket.app.list.add.AddUrlBottomSheetFragment
 import com.pocket.app.list.bulkedit.BulkEditListItemAnimator
 import com.pocket.app.list.bulkedit.BulkEditOverflowBottomSheetFragment
 import com.pocket.app.list.filter.FilterBottomSheetFragment
-import com.pocket.app.list.list.*
+import com.pocket.app.list.list.MyListAdapter
+import com.pocket.app.list.list.MyListPagingScrollListener
 import com.pocket.app.list.list.loading.SkeletonListFadeAnimator
 import com.pocket.app.list.list.overflow.ItemOverflowBottomSheetFragment
+import com.pocket.app.list.notes.NotesList
 import com.pocket.app.list.search.RecentSearchAdapter
 import com.pocket.app.list.tags.TagBottomSheetFragment
 import com.pocket.app.premium.Premium
@@ -70,8 +72,6 @@ class MyListFragment : AbsPocketFragment() {
     // used to remember the scroll position when coming back to this screen
     private var recyclerViewState: Parcelable? = null
 
-    override fun getActionViewName(): CxtView = CxtView.LIST
-
     override fun getScreenIdentifierString(): String = "saves"
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -94,6 +94,7 @@ class MyListFragment : AbsPocketFragment() {
         super.onViewCreated(view, savedInstanceState)
         setupListView()
         setupSearchList()
+        setupNotesList()
         fxaFeature.showMigrationMessage(activity)
         setupUiListeners()
         SkeletonListFadeAnimator(binding.skeletonList, viewLifecycleOwner, viewModel)
@@ -276,6 +277,12 @@ class MyListFragment : AbsPocketFragment() {
         )
     }
 
+    private fun setupNotesList() {
+        binding.notes.setContent {
+            NotesList()
+        }
+    }
+
     // this could be refactored to be in the view model
     @Suppress("MagicNumber")
     private fun setupContinueReading() {