Merge pull request #6390 from grzesiek2010/COLLECT-6374_1

Fixed updating app bar color

androidshared/src/main/java/org/odk/collect/androidshared/ui/ObviousProgressBar.kt

@@ -3,23 +3,31 @@ package org.odk.collect.androidshared.ui
 import android.content.Context
 import android.os.Handler
 import android.util.AttributeSet
-import android.widget.ProgressBar
+import com.google.android.material.progressindicator.LinearProgressIndicator
 
 /**
  * A progress bar that shows for a minimum amount fo time so it's obvious to the user that
  * something has happened.
  */
-class ObviousProgressBar(context: Context, attrs: AttributeSet?) : ProgressBar(context, attrs) {
+class ObviousProgressBar(
+    context: Context,
+    attrs: AttributeSet?
+) : LinearProgressIndicator(context, attrs) {
     private val handler = Handler()
     private var shownAt: Long? = null
 
-    fun show() {
+    init {
+        super.setVisibility(GONE)
+        super.setIndeterminate(true)
+    }
+
+    override fun show() {
         handler.removeCallbacksAndMessages(null)
         shownAt = System.currentTimeMillis()
         super.setVisibility(VISIBLE)
     }
 
-    fun hide() {
+    override fun hide() {
         if (shownAt != null) {
             val timeShown = System.currentTimeMillis() - shownAt!!
 

androidshared/src/main/res/layout/app_bar_layout.xml

@@ -1,23 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     When scrolling, the top app bar fills with a contrasting color to create a visual separation.
+     This works automatically if your scrolling view (e.g., `RecyclerView`, `ListView`) is placed directly
+     beneath the `AppBarLayout`. However, if the scrolling view is nested within another view
+     (such as a `ConstraintLayout`, which is common in this app), you need to help the app bar determine
+     whether it should lift by setting `app:liftOnScrollTargetViewId` to the ID of the scrolling view.
+     Since this `AppBarLayout` is used throughout the app with various scrolling views, it’s best to
+     use a shared ID like `scrollable_container`.
+     If the scrollable view is added programmatically or it is displayed in a `ViewPager` with a
+     shared id, it may not work as expected anyway, and `app:liftOnScrollTargetViewId` might
+     need to be updated programmatically after adding such a view.
+     The `ODKView` and its `odk_view_container` or `DeleteFormsActivity` are good examples of this scenario.
+-->
 <com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/appBarLayout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:liftOnScrollTargetViewId="@+id/scrollable_container">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        tools:title="Title" />
+        android:layout_height="wrap_content">
 
-    <org.odk.collect.androidshared.ui.ObviousProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/appBarLayout"
-        android:layout_marginTop="-7dp"
-        android:indeterminate="true"
-        android:visibility="gone" />
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:title="Title" />
+
+        <org.odk.collect.androidshared.ui.ObviousProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.appbar.AppBarLayout>

collect_app/src/main/java/org/odk/collect/android/activities/AppListActivity.java

@@ -131,7 +131,7 @@ public void setContentView(@LayoutRes int layoutResID) {
     }
 
     private void init() {
-        listView = findViewById(android.R.id.list);
+        listView = findViewById(R.id.scrollable_container);
         listView.setOnItemClickListener((AdapterView.OnItemClickListener) this);
         listView.setEmptyView(findViewById(android.R.id.empty));
         progressBar = findViewById(org.odk.collect.androidshared.R.id.progressBar);

collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java

@@ -65,6 +65,7 @@
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.javarosa.core.model.FormDef;
@@ -263,6 +264,7 @@ public class FormFillingActivity extends LocalizedActivity implements AnimationL
     private Animation inAnimation;
     private Animation outAnimation;
 
+    private AppBarLayout appBarLayout;
     private FrameLayout questionHolder;
     private SwipeHandler.View currentView;
 
@@ -468,6 +470,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         formError = null;
 
+        appBarLayout = findViewById(org.odk.collect.androidshared.R.id.appBarLayout);
         questionHolder = findViewById(R.id.questionholder);
 
         initToolbar();
@@ -1417,6 +1420,7 @@ public void showView(SwipeHandler.View next, FormAnimationType from) {
         } else {
             animationCompletionSet = 2;
         }
+        appBarLayout.setLiftOnScrollTargetViewId(R.id.odk_view_container);
         // start InAnimation for transition...
         currentView.startAnimation(inAnimation);
 

collect_app/src/main/java/org/odk/collect/android/instancemanagement/send/InstanceUploaderListActivity.java

@@ -195,7 +195,7 @@ public void onUploadButtonsClicked() {
     public void setContentView(View view) {
         super.setContentView(view);
 
-        listView = findViewById(android.R.id.list);
+        listView = findViewById(R.id.scrollable_container);
         listView.setOnItemClickListener((AdapterView.OnItemClickListener) this);
         listView.setEmptyView(findViewById(android.R.id.empty));
         progressBar = findViewById(org.odk.collect.androidshared.R.id.progressBar);

collect_app/src/main/res/layout/form_chooser_list.xml

@@ -8,7 +8,7 @@
     <include layout="@layout/app_bar_layout"/>
 
     <ListView
-        android:id="@id/android:list"
+        android:id="@+id/scrollable_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:nestedScrollingEnabled="true"

collect_app/src/main/res/layout/form_download_list.xml

@@ -21,7 +21,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <ListView
-                android:id="@android:id/list"
+                android:id="@+id/scrollable_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:nestedScrollingEnabled="true"

collect_app/src/main/res/layout/instance_uploader_list.xml

@@ -21,7 +21,7 @@
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <ListView
-            android:id="@android:id/list"
+            android:id="@+id/scrollable_container"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:nestedScrollingEnabled="true"

collect_app/src/main/res/layout/manual_project_creator_dialog_layout.xml

@@ -15,6 +15,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.core.widget.NestedScrollView
+            android:id="@+id/scrollable_container"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="@+id/shadow_up"

collect_app/src/main/res/layout/qr_code_project_creator_dialog_layout.xml

@@ -14,6 +14,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.core.widget.NestedScrollView
+            android:id="@+id/scrollable_container"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="@+id/shadow_up"

lists/src/main/java/org/odk/collect/lists/selects/MultiSelectListFragment.kt

@@ -8,6 +8,8 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.appbar.AppBarLayout
 import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
 import org.odk.collect.lists.R
 import org.odk.collect.lists.databinding.MultiSelectListBinding
@@ -19,6 +21,9 @@ class MultiSelectListFragment<T, VH : MultiSelectAdapter.ViewHolder<T>>(
     private val onViewCreated: (MultiSelectListBinding) -> Unit = {}
 ) : Fragment() {
 
+    private var appBarLayout: AppBarLayout? = null
+    private lateinit var list: RecyclerView
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
 
@@ -50,15 +55,19 @@ class MultiSelectListFragment<T, VH : MultiSelectAdapter.ViewHolder<T>>(
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        appBarLayout = requireActivity().findViewById(org.odk.collect.androidshared.R.id.appBarLayout)
+
         val binding = MultiSelectListBinding.bind(view)
         onViewCreated(binding)
 
-        binding.list.layoutManager = LinearLayoutManager(requireContext())
+        list = binding.list
+        list.layoutManager = LinearLayoutManager(requireContext())
         val adapter = MultiSelectAdapter(
             multiSelectViewModel,
             viewHolderFactory
         )
-        binding.list.adapter = adapter
+        list.adapter = adapter
+
         multiSelectViewModel.getData().observe(viewLifecycleOwner) {
             adapter.data = it
             binding.empty.isVisible = it.isEmpty()
@@ -68,4 +77,9 @@ class MultiSelectListFragment<T, VH : MultiSelectAdapter.ViewHolder<T>>(
             adapter.selected = it
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        appBarLayout?.setLiftOnScrollTargetView(list)
+    }
 }