Fixed click-ability & focusability of nested children of BottomSheetListView.java class and other minor fixes.

buggysofts-com · buggysofts-com · commit 6be420d46c8d · 2022-10-30T22:18:09.000+06:00
diff --git a/BottomSheetMenu/src/main/java/com/buggysofts/bottomsheetmenu/BottomSheetListView.java b/BottomSheetMenu/src/main/java/com/buggysofts/bottomsheetmenu/BottomSheetListView.java
@@ -20,11 +20,6 @@ public BottomSheetListView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
 
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return true;
-    }
-
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
         if (canScrollVertically(this)) {
diff --git a/BottomSheetMenu/src/main/java/com/buggysofts/bottomsheetmenu/BottomSheetMenu.java b/BottomSheetMenu/src/main/java/com/buggysofts/bottomsheetmenu/BottomSheetMenu.java
@@ -9,8 +9,8 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -35,11 +35,10 @@ public class BottomSheetMenu {
     // menu to be shown
     private final Menu mainMenu;
     // main root view, menu list view
-    private final View mainView;
-    private final FrameLayout bottomSheetContentRoot;
-    private final ListView menuList;
-    private final View headerView;
-    private final View footerView;
+    private final ViewGroup mainView;
+    private final BottomSheetListView menuList;
+    private final ViewGroup headerView;
+    private final ViewGroup footerView;
     private final TextView titleView;
     private final LinearLayout customHeaderHolder;
     private final LinearLayout customFooterHolder;
@@ -223,30 +222,33 @@ public BottomSheetMenu(@NonNull Context context,
                 LayoutInflater inflater = LayoutInflater.from(context);
 
                 // initialize class field views
-                mainView = inflater.inflate(
+                mainView = (ViewGroup) inflater.inflate(
                     R.layout.bottom_sheet_menu_layout,
-                    null
-                );
-                headerView = inflater.inflate(
-                    R.layout.menu_header_view,
-                    null
-                );
-                footerView = inflater.inflate(
-                    R.layout.menu_footer_view,
-                    null
-                );
-                bottomSheetContentRoot = mainView.findViewById(
-                    R.id.bottom_sheet_content_root
+                    null,
+                    false
                 );
+
                 menuList = mainView.findViewById(
                     R.id.menu_list
                 );
+
+                headerView = (ViewGroup) inflater.inflate(
+                    R.layout.menu_header_view,
+                    menuList,
+                    false
+                );
                 titleView = headerView.findViewById(
                     R.id.menu_title
                 );
                 customHeaderHolder = headerView.findViewById(
                     R.id.custom_header_holder
                 );
+
+                footerView = (ViewGroup) inflater.inflate(
+                    R.layout.menu_footer_view,
+                    menuList,
+                    false
+                );
                 customFooterHolder = footerView.findViewById(
                     R.id.custom_footer_holder
                 );
@@ -291,18 +293,23 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
     /////////////////////////
 
     private void applyProperties() {
-        // add header and footer views in the list view
+        // set item to be focusable
+        menuList.setItemsCanFocus(true);
+
+        // set header and footer dividers if any divider is specified
         menuList.setHeaderDividersEnabled(dividerDrawable != null);
         menuList.setFooterDividersEnabled(dividerDrawable != null);
+
+        // add header and footer views in the list view
         menuList.addHeaderView(
             headerView,
             null,
-            dividerDrawable != null
+            true
         );
         menuList.addFooterView(
             footerView,
             null,
-            dividerDrawable != null
+            true
         );
 
         // set initial properties to the views
diff --git a/BottomSheetMenu/src/main/java/com/buggysofts/bottomsheetmenu/BottomSheetMenuAdapter.java b/BottomSheetMenu/src/main/java/com/buggysofts/bottomsheetmenu/BottomSheetMenuAdapter.java
@@ -92,7 +92,8 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
         if (convertView == null) {
             convertView = LayoutInflater.from(getContext()).inflate(
                 R.layout.menu_item_node,
-                null
+                parent,
+                false
             );
             holder = new ViewHolder(
                 convertView.findViewById(R.id.item_txt),
diff --git a/BottomSheetMenu/src/main/res/layout/menu_footer_view.xml b/BottomSheetMenu/src/main/res/layout/menu_footer_view.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
         android:id="@+id/custom_footer_holder"
diff --git a/BottomSheetMenu/src/main/res/layout/menu_header_view.xml b/BottomSheetMenu/src/main/res/layout/menu_header_view.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
         android:id="@+id/custom_header_holder"
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Finally, add this dependency to your app/module level build.gradle file
 
 dependencies {
     ...
-    implementation 'com.github.buggysofts-com:BottomSheetMenu:v1.0.7'
+    implementation 'com.github.buggysofts-com:BottomSheetMenu:v1.0.8'
 }
 ```
 And you are done importing the library.
diff --git a/app/src/main/java/com/buggysofts/bottomsheetmenuimpl/MainActivity.java b/app/src/main/java/com/buggysofts/bottomsheetmenuimpl/MainActivity.java
@@ -5,6 +5,8 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
@@ -88,7 +90,26 @@ public void onClick(MenuItem item) {
                                 @Nullable
                                 @Override
                                 public View getInitialView() {
-                                    return getLayoutInflater().inflate(R.layout.sample_header, null);
+                                    View inflate = getLayoutInflater().inflate(R.layout.sample_header, null);
+                                    ImageView imageView = inflate.findViewById(R.id.imageView);
+                                    TextView textView = inflate.findViewById(R.id.textView);
+                                    imageView.setOnClickListener(
+                                        new View.OnClickListener() {
+                                            @Override
+                                            public void onClick(View v) {
+                                                Toast.makeText(MainActivity.this, "Hi from head!", Toast.LENGTH_SHORT).show();
+                                            }
+                                        }
+                                    );
+                                    textView.setOnClickListener(
+                                        new View.OnClickListener() {
+                                            @Override
+                                            public void onClick(View v) {
+                                                Toast.makeText(MainActivity.this, "Hi from body!", Toast.LENGTH_SHORT).show();
+                                            }
+                                        }
+                                    );
+                                    return inflate;
                                 }
 
                                 @Nullable
diff --git a/app/src/main/res/layout/sample_header.xml b/app/src/main/res/layout/sample_header.xml
@@ -11,25 +11,31 @@
         android:layout_marginTop="16dp"
         android:src="@drawable/ic_android"
         app:tint="#1aa260"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/textView2"
+        android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:text="Header View"
         android:textColor="#000000"
         android:textStyle="bold"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/textView2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -41,5 +47,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2" />
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
 </androidx.constraintlayout.widget.ConstraintLayout>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ Finally, add this dependency to your app/module level build.gradle file`
`34`	`34`
`35`	`35`	`dependencies {`
`36`	`36`	`...`
`37`		`- implementation 'com.github.buggysofts-com:BottomSheetMenu:v1.0.7'`
	`37`	`+ implementation 'com.github.buggysofts-com:BottomSheetMenu:v1.0.8'`
`38`	`38`	`}`
`39`	`39`	```
`40`	`40`	`And you are done importing the library.`