diff --git a/app/src/main/java/com/cornellappdev/volume/adapters/MorePublicationsAdapter.kt b/app/src/main/java/com/cornellappdev/volume/adapters/MorePublicationsAdapter.kt index 250563a..4c37d49 100644 --- a/app/src/main/java/com/cornellappdev/volume/adapters/MorePublicationsAdapter.kt +++ b/app/src/main/java/com/cornellappdev/volume/adapters/MorePublicationsAdapter.kt @@ -25,12 +25,16 @@ class MorePublicationsAdapter( var publicationList: MutableList, private val prefUtils: PrefUtils, private val mAdapterOnClickHandler: AdapterOnClickHandler?, - private val isOnboarding: Boolean = false) : + private val isOnboarding: Boolean = false, + private val mAdapterOnClicker:AdapterOnClicker?) : RecyclerView.Adapter() { interface AdapterOnClickHandler { fun onFollowClick(wasFollowed: Boolean) } + interface AdapterOnClicker{ + fun onMorePublicationClicked(publication: Publication, isOnboarding: Boolean) + } class MorePublicationVH( val binding: ItemMorePublicationBinding @@ -133,16 +137,7 @@ class MorePublicationsAdapter( } holder.binding.clPublicationLayout.setOnClickListener { view -> - val intent = Intent(view.context, PublicationProfileActivity::class.java) - intent.putExtra(Publication.INTENT_KEY, currentItem) - intent.putParcelableExtra( - NavigationSource.INTENT_KEY, if (isOnboarding) { - NavigationSource.ONBOARDING - } else { - NavigationSource.MORE_PUBLICATIONS - } - ) - view.context.startActivity(intent) + mAdapterOnClicker?.onMorePublicationClicked(currentItem,isOnboarding) } } diff --git a/app/src/main/java/com/cornellappdev/volume/fragments/OnboardingFragTwo.kt b/app/src/main/java/com/cornellappdev/volume/fragments/OnboardingFragTwo.kt index 49109cd..f86f56f 100644 --- a/app/src/main/java/com/cornellappdev/volume/fragments/OnboardingFragTwo.kt +++ b/app/src/main/java/com/cornellappdev/volume/fragments/OnboardingFragTwo.kt @@ -30,7 +30,7 @@ import io.reactivex.schedulers.Schedulers * * @see {@link com.cornellappdev.volume.R.layout#fragment_onboarding_two} */ -class OnboardingFragTwo : Fragment(), MorePublicationsAdapter.AdapterOnClickHandler { +class OnboardingFragTwo : Fragment(), MorePublicationsAdapter.AdapterOnClickHandler, MorePublicationsAdapter.AdapterOnClicker { interface DataPassListener { fun onPublicationFollowed(numFollowed: Int) @@ -145,7 +145,7 @@ class OnboardingFragTwo : Fragment(), MorePublicationsAdapter.AdapterOnClickHand publicationRV = onboardingBinding.rvPublications with(publicationRV) { adapter = - MorePublicationsAdapter(allPublicationsList, prefUtils, this@OnboardingFragTwo) + MorePublicationsAdapter(allPublicationsList, prefUtils, this@OnboardingFragTwo, mAdapterOnClicker = this@OnboardingFragTwo) layoutManager = LinearLayoutManager(context) setHasFixedSize(true) } @@ -173,4 +173,6 @@ class OnboardingFragTwo : Fragment(), MorePublicationsAdapter.AdapterOnClickHand super.onDestroyView() _binding = null } + + override fun onMorePublicationClicked(publication: Publication, isOnboarding: Boolean) = Unit } \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/volume/fragments/PublicationsFragment.kt b/app/src/main/java/com/cornellappdev/volume/fragments/PublicationsFragment.kt index 1a37fc1..ab9403a 100644 --- a/app/src/main/java/com/cornellappdev/volume/fragments/PublicationsFragment.kt +++ b/app/src/main/java/com/cornellappdev/volume/fragments/PublicationsFragment.kt @@ -39,7 +39,7 @@ import io.reactivex.schedulers.Schedulers * @see {@link com.cornellappdev.volume.R.layout#fragment_publications} */ class PublicationsFragment : Fragment(), FollowingHorizontalAdapter.AdapterOnClickHandler, - MorePublicationsAdapter.AdapterOnClickHandler { + MorePublicationsAdapter.AdapterOnClickHandler, MorePublicationsAdapter.AdapterOnClicker { private lateinit var resultLauncher: ActivityResultLauncher private lateinit var prefUtils: PrefUtils @@ -319,7 +319,8 @@ class PublicationsFragment : Fragment(), FollowingHorizontalAdapter.AdapterOnCli MorePublicationsAdapter( morePublications, prefUtils, - this@PublicationsFragment + this@PublicationsFragment, + mAdapterOnClicker = this@PublicationsFragment ) layoutManager = LinearLayoutManager(context) setHasFixedSize(true) @@ -373,4 +374,19 @@ class PublicationsFragment : Fragment(), FollowingHorizontalAdapter.AdapterOnCli override fun onFollowClick(wasFollowed: Boolean) { setupPublicationsView(binding, isRefreshing = true) } + + + override fun onMorePublicationClicked(publication: Publication, isOnboarding: Boolean) { + val intent = Intent(view?.context, PublicationProfileActivity::class.java) + intent.putExtra(Publication.INTENT_KEY, publication) + intent.putParcelableExtra( + NavigationSource.INTENT_KEY, if (isOnboarding) { + NavigationSource.ONBOARDING + } else { + NavigationSource.MORE_PUBLICATIONS + } + ) + resultLauncher.launch(intent) + } + } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_debrief_checkout.xml b/app/src/main/res/layout/fragment_debrief_checkout.xml index 903d962..a18243f 100644 --- a/app/src/main/res/layout/fragment_debrief_checkout.xml +++ b/app/src/main/res/layout/fragment_debrief_checkout.xml @@ -62,10 +62,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="110dp" - android:text="@string/x_h_ago" + android:text="" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="@id/iv_article_image" app:layout_constraintTop_toBottomOf="@id/iv_article_image" /> + >>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent"> -<<<<<<< HEAD -======= - android:layout_width="match_parent" - android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools"> ->>>>>>> f4f8cd8 (Add main debrief fragment) -======= ->>>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 >>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 android:layout_marginTop="36dp" android:contentDescription="@string/description_main_volume_logo" app:layout_constraintLeft_toLeftOf="parent" @@ -40,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="@string/your_weekly_debrief" + android:text="@string/your_weekly_debrief_date" android:textSize="17sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -57,51 +40,11 @@ android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@+id/tv_your_debrief" /> -<<<<<<< HEAD -======= - app:layout_constraintTop_toTopOf="parent" - android:layout_marginTop="36dp" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" - android:contentDescription="@string/description_main_volume_logo" - app:srcCompat="@drawable/volume_title" - tools:srcCompat="@drawable/volume_title"/> - - - - ->>>>>>> f4f8cd8 (Add main debrief fragment) -======= ->>>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 >>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 android:layout_marginLeft="44dp" android:layout_marginTop="26dp" android:contentDescription="@string/description_volume_bars_logo" @@ -146,64 +89,11 @@ app:layout_constraintBottom_toBottomOf="@id/tv_read" app:layout_constraintLeft_toRightOf="@id/tv_number_articles_read" app:layout_constraintTop_toTopOf="@id/tv_read" /> -<<<<<<< HEAD -======= - app:layout_constraintTop_toBottomOf="@id/tv_in_the_past_week" - android:layout_marginTop="26dp" - app:layout_constraintLeft_toLeftOf="parent" - android:layout_marginLeft="44dp" - android:contentDescription="@string/description_volume_bars_logo" - app:srcCompat="@drawable/volume_three_bars" - tools:srcCompat="@drawable/volume_three_bars"/> - - - - - - ->>>>>>> f4f8cd8 (Add main debrief fragment) -======= ->>>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 >>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 android:layout_marginLeft="44dp" android:layout_marginTop="26dp" android:contentDescription="@string/description_shout_out_icon" @@ -301,7 +191,7 @@ -<<<<<<< HEAD -======= - app:layout_constraintTop_toBottomOf="@id/iv_volume_bars" - android:layout_marginTop="26dp" - app:layout_constraintLeft_toLeftOf="parent" - android:layout_marginLeft="44dp" - android:contentDescription="@string/description_shout_out_icon" - app:srcCompat="@drawable/orange_shoutout" - tools:srcCompat="@drawable/orange_shoutout"/> - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> f4f8cd8 (Add main debrief fragment) -======= ->>>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_debrief_share.xml b/app/src/main/res/layout/fragment_debrief_share.xml index ffcf2ca..0a92a6d 100644 --- a/app/src/main/res/layout/fragment_debrief_share.xml +++ b/app/src/main/res/layout/fragment_debrief_share.xml @@ -62,11 +62,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="110dp" - android:text="@string/x_h_ago" + android:text="" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="@id/iv_article_image" app:layout_constraintTop_toBottomOf="@id/iv_article_image" /> - + + + + diff --git a/app/src/main/res/layout/fragment_publications.xml b/app/src/main/res/layout/fragment_publications.xml index d190d7f..e1dc551 100644 --- a/app/src/main/res/layout/fragment_publications.xml +++ b/app/src/main/res/layout/fragment_publications.xml @@ -36,9 +36,8 @@ @@ -162,6 +161,7 @@ android:id="@+id/rv_more_publications" android:layout_width="match_parent" android:layout_height="wrap_content" + android:minHeight="380dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/iv_more_publications_header" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b5699e3..80a02e2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -100,7 +100,7 @@ Please try again later - Your weekly debrief, %1$s- %2$s + Your weekly debrief, %1$s- %2$s In the past week, you… read %1$d @@ -110,18 +110,9 @@ shout-outs You were among the top

active readers last week!


Keep up the volume! 📣
%1$s -<<<<<<< HEAD -<<<<<<< HEAD Stay updated with Cornell student publications, all in one place Continue to Volume bookmarked -======= ->>>>>>> f4f8cd8 (Add main debrief fragment) -======= - Stay updated with Cornell student publications, all in one place - Continue to Volume - bookmarked ->>>>>>> 3612530a34a309e9c10cd8ad4c0b0a07d1cd09d7 Main Volume logo