Merge pull request #163 from muak/development

Development
muak · Apr 30, 2021 · dde17cb · dde17cb
2 parents e24ca2c + 268a523
commit dde17cb
Show file tree

Hide file tree

Showing 7 changed files with 295 additions and 217 deletions.
diff --git a/SettingsView/Cells/CellBase.cs b/SettingsView/Cells/CellBase.cs
@@ -394,6 +394,28 @@ public double IconRadius
             get { return (double)GetValue(IconRadiusProperty); }
             set { SetValue(IconRadiusProperty, value); }
         }
+
+        /// <summary>
+        /// The IsVisible property.
+        /// </summary>
+        public static BindableProperty IsVisibleProperty =
+            BindableProperty.Create(
+                nameof(IsVisible),
+                typeof(bool),
+                typeof(Section),
+                true,
+                defaultBindingMode: BindingMode.OneWay
+            );
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="CellBase"/> is visible.
+        /// </summary>
+        /// <value><c>true</c> if is visible; otherwise, <c>false</c>.</value>
+        public bool IsVisible
+        {
+            get { return (bool)GetValue(IsVisibleProperty); }
+            set { SetValue(IsVisibleProperty, value); }
+        }
 
         /// <summary>
         /// Gets or sets the section.

diff --git a/SettingsView/Cells/PickerCell.cs b/SettingsView/Cells/PickerCell.cs
@@ -342,6 +342,27 @@ public bool UsePickToClose {
             set { SetValue(UsePickToCloseProperty, value); }
         }
 
+        /// <summary>
+        /// The padding property.
+        /// </summary>
+        public static BindableProperty PaddingProperty =
+            BindableProperty.Create(
+                nameof(Padding),
+                typeof(Thickness),
+                typeof(PickerCell),
+                new Thickness(0, 0, 0, 0),
+                defaultBindingMode: BindingMode.OneWay
+            );
+
+        /// <summary>
+        /// Gets or sets the padding property.
+        /// </summary>
+        /// <value>Padding in device-independent pixels</value>
+        public Thickness Padding {
+            get { return (Thickness)GetValue(PaddingProperty); }
+            set { SetValue(PaddingProperty, value); }
+        }
+
         internal IList MergedSelectedList {
             get {
                 if (SelectionMode == SelectionMode.Single) 

diff --git a/SettingsView/Platforms/Android/Cells/PickerCellRenderer.cs b/SettingsView/Platforms/Android/Cells/PickerCellRenderer.cs
@@ -236,6 +236,12 @@ void CreateDialog()
             _listView = new AListView(_context);
             _listView.Focusable = false;
             _listView.DescendantFocusability = Android.Views.DescendantFocusability.AfterDescendants;
+            _listView.SetPadding(
+                (int) _context.ToPixels(_PickerCell.Padding.Left),
+                (int) _context.ToPixels(_PickerCell.Padding.Top),
+                (int) _context.ToPixels(_PickerCell.Padding.Right),
+                (int) _context.ToPixels(_PickerCell.Padding.Bottom)
+            );
             _listView.SetDrawSelectorOnTop(true);
             _listView.ChoiceMode = _PickerCell.MaxSelectedNumber == 1 ? Android.Widget.ChoiceMode.Single : Android.Widget.ChoiceMode.Multiple;
             _adapter = new PickerAdapter(_context, _PickerCell, _listView);

diff --git a/SettingsView/Platforms/Android/SettingsViewRecyclerAdapter.cs b/SettingsView/Platforms/Android/SettingsViewRecyclerAdapter.cs
@@ -176,18 +176,22 @@ public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int positi
 
             var vHolder = holder as ViewHolder;
             vHolder.RowInfo = rowInfo;
+
+            bool cellVisible = (rowInfo.Cell as CellBase)?.IsVisible ?? true;
 
             if(!rowInfo.Section.IsVisible ||
+               !cellVisible ||
                (rowInfo.ViewType == ViewType.CustomFooter && !rowInfo.Section.FooterVisible))
             {
                 vHolder.ItemView.Visibility = ViewStates.Gone;
                 vHolder.ItemView.SetMinimumHeight(0);
                 vHolder.ItemView.LayoutParameters.Height = 0;
                 return;
             }
-
+            
             vHolder.ItemView.Visibility = ViewStates.Visible;
-
+            vHolder.ItemView.LayoutParameters.Height = -2; //wrap_content
+
             switch (rowInfo.ViewType)
             {
                 case ViewType.TextHeader: