From 99db50fb073cdc4ebda43268d7c993623ed16f40 Mon Sep 17 00:00:00 2001 From: benha Date: Thu, 10 Feb 2022 15:26:24 -0500 Subject: [PATCH 1/7] Fix merge conflict in strings.xml --- app/src/main/res/values/strings.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) 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 From f4cbf97f4510b7b2a62e22e641209158eb8cedd6 Mon Sep 17 00:00:00 2001 From: benha Date: Fri, 11 Feb 2022 12:50:01 -0500 Subject: [PATCH 2/7] Remove hardcoded plural usage. --- .../res/layout/fragment_debrief_checkout.xml | 3 +- .../main/res/layout/fragment_debrief_main.xml | 200 +----------------- .../res/layout/fragment_debrief_share.xml | 4 +- 3 files changed, 6 insertions(+), 201 deletions(-) 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" /> - + Date: Thu, 17 Feb 2022 14:47:15 -0500 Subject: [PATCH 3/7] Fix UI refresh in PublicationsFragment.kt when clicking on a publication --- .../adapters/MorePublicationsAdapter.kt | 17 +++---- .../volume/fragments/OnboardingFragTwo.kt | 6 ++- .../volume/fragments/PublicationsFragment.kt | 48 ++++++++++++++++++- 3 files changed, 56 insertions(+), 15 deletions(-) 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..b103139 100644 --- a/app/src/main/java/com/cornellappdev/volume/fragments/PublicationsFragment.kt +++ b/app/src/main/java/com/cornellappdev/volume/fragments/PublicationsFragment.kt @@ -1,14 +1,18 @@ package com.cornellappdev.volume.fragments +import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.content.IntentFilter import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.Fragment +import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.LinearLayoutManager import com.apollographql.apollo.api.Response @@ -39,7 +43,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 @@ -47,6 +51,7 @@ class PublicationsFragment : Fragment(), FollowingHorizontalAdapter.AdapterOnCli private lateinit var graphQlUtil: GraphQlUtil private var _binding: FragmentPublicationsBinding? = null private val binding get() = _binding!! +// private lateinit var receiver:Receiver override fun onAttach(context: Context) { super.onAttach(context) @@ -319,7 +324,8 @@ class PublicationsFragment : Fragment(), FollowingHorizontalAdapter.AdapterOnCli MorePublicationsAdapter( morePublications, prefUtils, - this@PublicationsFragment + this@PublicationsFragment, + mAdapterOnClicker = this@PublicationsFragment ) layoutManager = LinearLayoutManager(context) setHasFixedSize(true) @@ -373,4 +379,42 @@ 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) + } + +// fun refresh(){ +// setupPublicationsView(binding, isRefreshing = true) +// binding.rvMorePublications.adapter?.notifyDataSetChanged() +// binding.rvFollowing.adapter?.notifyDataSetChanged() +// } + + override fun onResume() { + super.onResume() +// receiver= Receiver() +// context?.let { LocalBroadcastManager.getInstance(it).registerReceiver(receiver, IntentFilter("TAG_REFRESH")) } + } + + override fun onPause() { + super.onPause() +// context?.let { LocalBroadcastManager.getInstance(it).unregisterReceiver(receiver)} + } + +// inner class Receiver: BroadcastReceiver() { +// override fun onReceive(context: Context?, intent: Intent?) { +// refresh() +// } +// +// } } \ No newline at end of file From b0b8b7783c35834cadcefd51a95e401c1dfbf34a Mon Sep 17 00:00:00 2001 From: benha Date: Tue, 22 Feb 2022 11:50:49 -0500 Subject: [PATCH 4/7] Remove BroadcastReciever --- .../volume/fragments/PublicationsFragment.kt | 28 ------------------- 1 file changed, 28 deletions(-) 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 b103139..ab9403a 100644 --- a/app/src/main/java/com/cornellappdev/volume/fragments/PublicationsFragment.kt +++ b/app/src/main/java/com/cornellappdev/volume/fragments/PublicationsFragment.kt @@ -1,18 +1,14 @@ package com.cornellappdev.volume.fragments -import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.content.IntentFilter import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.Fragment -import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.LinearLayoutManager import com.apollographql.apollo.api.Response @@ -51,7 +47,6 @@ class PublicationsFragment : Fragment(), FollowingHorizontalAdapter.AdapterOnCli private lateinit var graphQlUtil: GraphQlUtil private var _binding: FragmentPublicationsBinding? = null private val binding get() = _binding!! -// private lateinit var receiver:Receiver override fun onAttach(context: Context) { super.onAttach(context) @@ -394,27 +389,4 @@ class PublicationsFragment : Fragment(), FollowingHorizontalAdapter.AdapterOnCli resultLauncher.launch(intent) } -// fun refresh(){ -// setupPublicationsView(binding, isRefreshing = true) -// binding.rvMorePublications.adapter?.notifyDataSetChanged() -// binding.rvFollowing.adapter?.notifyDataSetChanged() -// } - - override fun onResume() { - super.onResume() -// receiver= Receiver() -// context?.let { LocalBroadcastManager.getInstance(it).registerReceiver(receiver, IntentFilter("TAG_REFRESH")) } - } - - override fun onPause() { - super.onPause() -// context?.let { LocalBroadcastManager.getInstance(it).unregisterReceiver(receiver)} - } - -// inner class Receiver: BroadcastReceiver() { -// override fun onReceive(context: Context?, intent: Intent?) { -// refresh() -// } -// -// } } \ No newline at end of file From 3cb749fd1cef184380f5326195805e5eedc51182 Mon Sep 17 00:00:00 2001 From: benha Date: Tue, 22 Feb 2022 12:38:51 -0500 Subject: [PATCH 5/7] Fix Home Fragment scrolling bug --- app/src/main/res/layout/fragment_home.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index f8075c2..73d4894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -20,13 +20,14 @@ android:layout_width="160dp" android:layout_height="50dp" android:layout_marginLeft="6dp" - android:layout_marginTop="80dp" + android:layout_marginTop="20dp" android:contentDescription="@string/description_main_volume_logo" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/volume_title" tools:srcCompat="@drawable/volume_title" /> + + + From 78f04ad758773cf353e445b75b9f92ad06a25150 Mon Sep 17 00:00:00 2001 From: benha Date: Tue, 22 Feb 2022 16:04:44 -0500 Subject: [PATCH 6/7] Fix Publications Fragment scrolling bug --- app/src/main/res/layout/fragment_publications.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_publications.xml b/app/src/main/res/layout/fragment_publications.xml index d190d7f..bc522bd 100644 --- a/app/src/main/res/layout/fragment_publications.xml +++ b/app/src/main/res/layout/fragment_publications.xml @@ -36,9 +36,8 @@ From b4ec77e17ff5c2416d10ab6f6f9671643d500a52 Mon Sep 17 00:00:00 2001 From: benha Date: Thu, 10 Mar 2022 20:42:08 -0500 Subject: [PATCH 7/7] Fix Publications Fragment scrolling bug --- app/src/main/res/layout/fragment_publications.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/fragment_publications.xml b/app/src/main/res/layout/fragment_publications.xml index bc522bd..e1dc551 100644 --- a/app/src/main/res/layout/fragment_publications.xml +++ b/app/src/main/res/layout/fragment_publications.xml @@ -161,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" />