From 0a5f9f1b23d73f31927b26e376baabee2434a8de Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 4 Apr 2019 23:15:24 -0400 Subject: [PATCH] remove description from base cell --- .../Renderers/BoxedView/Cells/BaseCellView.cs | 68 --- src/Android/Resources/Resource.designer.cs | 437 +++++++++--------- .../Resources/layout/CellBaseView.axml | 10 +- src/App/Controls/BoxedView/BoxedView.cs | 21 - src/App/Controls/BoxedView/Cells/BaseCell.cs | 31 -- 5 files changed, 218 insertions(+), 349 deletions(-) diff --git a/src/Android/Renderers/BoxedView/Cells/BaseCellView.cs b/src/Android/Renderers/BoxedView/Cells/BaseCellView.cs index ede1e27b8..edb2e86cf 100644 --- a/src/Android/Renderers/BoxedView/Cells/BaseCellView.cs +++ b/src/Android/Renderers/BoxedView/Cells/BaseCellView.cs @@ -39,7 +39,6 @@ namespace Bit.Droid.Renderers.BoxedView protected BaseCell CellBase => Cell as BaseCell; public App.Controls.BoxedView.BoxedView CellParent => Cell.Parent as App.Controls.BoxedView.BoxedView; public TextView TitleLabel { get; set; } - public TextView DescriptionLabel { get; set; } public LinearLayout ContentStack { get; set; } public LinearLayout AccessoryStack { get; set; } @@ -52,7 +51,6 @@ namespace Bit.Droid.Renderers.BoxedView contentView.LayoutParameters = new ViewGroup.LayoutParams(-1, -1); TitleLabel = contentView.FindViewById(Resource.Id.CellTitle); - DescriptionLabel = contentView.FindViewById(Resource.Id.CellDescription); ContentStack = contentView.FindViewById(Resource.Id.CellContentStack); AccessoryStack = contentView.FindViewById(Resource.Id.CellAccessoryView); @@ -92,18 +90,6 @@ namespace Bit.Droid.Renderers.BoxedView { UpdateTitleFontSize(); } - else if(e.PropertyName == BaseCell.DescriptionProperty.PropertyName) - { - UpdateDescriptionText(); - } - else if(e.PropertyName == BaseCell.DescriptionFontSizeProperty.PropertyName) - { - UpdateDescriptionFontSize(); - } - else if(e.PropertyName == BaseCell.DescriptionColorProperty.PropertyName) - { - UpdateDescriptionColor(); - } else if(e.PropertyName == BaseCell.BackgroundColorProperty.PropertyName) { UpdateBackgroundColor(); @@ -130,14 +116,6 @@ namespace Bit.Droid.Renderers.BoxedView { UpdateWithForceLayout(UpdateTitleFontSize); } - else if(e.PropertyName == App.Controls.BoxedView.BoxedView.CellDescriptionColorProperty.PropertyName) - { - UpdateDescriptionColor(); - } - else if(e.PropertyName == App.Controls.BoxedView.BoxedView.CellDescriptionFontSizeProperty.PropertyName) - { - UpdateWithForceLayout(UpdateDescriptionFontSize); - } else if(e.PropertyName == App.Controls.BoxedView.BoxedView.CellBackgroundColorProperty.PropertyName) { UpdateBackgroundColor(); @@ -167,9 +145,6 @@ namespace Bit.Droid.Renderers.BoxedView UpdateTitleText(); UpdateTitleColor(); UpdateTitleFontSize(); - UpdateDescriptionText(); - UpdateDescriptionColor(); - UpdateDescriptionFontSize(); UpdateIsEnabled(); @@ -246,45 +221,6 @@ namespace Bit.Droid.Renderers.BoxedView } } - private void UpdateDescriptionText() - { - DescriptionLabel.Text = CellBase.Description; - DescriptionLabel.Visibility = string.IsNullOrEmpty(DescriptionLabel.Text) ? - ViewStates.Gone : ViewStates.Visible; - } - - private void UpdateDescriptionFontSize() - { - if(CellBase.DescriptionFontSize > 0) - { - DescriptionLabel.SetTextSize(ComplexUnitType.Sp, (float)CellBase.DescriptionFontSize); - } - else if(CellParent != null) - { - DescriptionLabel.SetTextSize(ComplexUnitType.Sp, (float)CellParent.CellDescriptionFontSize); - } - else - { - DescriptionLabel.SetTextSize(ComplexUnitType.Sp, _defaultFontSize); - } - } - - private void UpdateDescriptionColor() - { - if(CellBase.DescriptionColor != Color.Default) - { - DescriptionLabel.SetTextColor(CellBase.DescriptionColor.ToAndroid()); - } - else if(CellParent != null && CellParent.CellDescriptionColor != Color.Default) - { - DescriptionLabel.SetTextColor(CellParent.CellDescriptionColor.ToAndroid()); - } - else - { - DescriptionLabel.SetTextColor(_defaultTextColor); - } - } - protected virtual void UpdateIsEnabled() { SetEnabledAppearance(CellBase.IsEnabled); @@ -297,7 +233,6 @@ namespace Bit.Droid.Renderers.BoxedView Focusable = false; DescendantFocusability = DescendantFocusability.AfterDescendants; TitleLabel.Alpha = 1f; - DescriptionLabel.Alpha = 1f; } else { @@ -306,7 +241,6 @@ namespace Bit.Droid.Renderers.BoxedView DescendantFocusability = DescendantFocusability.BlockDescendants; // to turn like disabled TitleLabel.Alpha = 0.3f; - DescriptionLabel.Alpha = 0.3f; } } @@ -325,8 +259,6 @@ namespace Bit.Droid.Renderers.BoxedView TitleLabel?.Dispose(); TitleLabel = null; - DescriptionLabel?.Dispose(); - DescriptionLabel = null; ContentStack?.Dispose(); ContentStack = null; AccessoryStack?.Dispose(); diff --git a/src/Android/Resources/Resource.designer.cs b/src/Android/Resources/Resource.designer.cs index 91dd1286d..8cb4763ed 100644 --- a/src/Android/Resources/Resource.designer.cs +++ b/src/Android/Resources/Resource.designer.cs @@ -6534,8 +6534,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a003a public const int CTRL = 2131361850; - // aapt resource value: 0x7f0a00a9 - public const int CellAccessoryView = 2131361961; + // aapt resource value: 0x7f0a00a8 + public const int CellAccessoryView = 2131361960; // aapt resource value: 0x7f0a00a5 public const int CellBody = 2131361957; @@ -6543,29 +6543,26 @@ namespace Bit.Droid // aapt resource value: 0x7f0a00a6 public const int CellContentStack = 2131361958; - // aapt resource value: 0x7f0a00a8 - public const int CellDescription = 2131361960; - // aapt resource value: 0x7f0a00a7 public const int CellTitle = 2131361959; - // aapt resource value: 0x7f0a00aa - public const int ContentCellBody = 2131361962; + // aapt resource value: 0x7f0a00a9 + public const int ContentCellBody = 2131361961; - // aapt resource value: 0x7f0a00ab - public const int ContentCellBorder = 2131361963; + // aapt resource value: 0x7f0a00aa + public const int ContentCellBorder = 2131361962; // aapt resource value: 0x7f0a003b public const int FUNCTION = 2131361851; - // aapt resource value: 0x7f0a00ba - public const int FooterCellText = 2131361978; - - // aapt resource value: 0x7f0a00bc - public const int HeaderCellBorder = 2131361980; + // aapt resource value: 0x7f0a00b9 + public const int FooterCellText = 2131361977; // aapt resource value: 0x7f0a00bb - public const int HeaderCellText = 2131361979; + public const int HeaderCellBorder = 2131361979; + + // aapt resource value: 0x7f0a00ba + public const int HeaderCellText = 2131361978; // aapt resource value: 0x7f0a003c public const int META = 2131361852; @@ -6576,8 +6573,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a003e public const int SYM = 2131361854; - // aapt resource value: 0x7f0a00ef - public const int action0 = 2131362031; + // aapt resource value: 0x7f0a00ee + public const int action0 = 2131362030; // aapt resource value: 0x7f0a008d public const int action_bar = 2131361933; @@ -6600,17 +6597,17 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0069 public const int action_bar_title = 2131361897; - // aapt resource value: 0x7f0a00ec - public const int action_container = 2131362028; + // aapt resource value: 0x7f0a00eb + public const int action_container = 2131362027; // aapt resource value: 0x7f0a008e public const int action_context_bar = 2131361934; - // aapt resource value: 0x7f0a00f3 - public const int action_divider = 2131362035; + // aapt resource value: 0x7f0a00f2 + public const int action_divider = 2131362034; - // aapt resource value: 0x7f0a00ed - public const int action_image = 2131362029; + // aapt resource value: 0x7f0a00ec + public const int action_image = 2131362028; // aapt resource value: 0x7f0a0003 public const int action_menu_divider = 2131361795; @@ -6627,11 +6624,11 @@ namespace Bit.Droid // aapt resource value: 0x7f0a006b public const int action_mode_close_button = 2131361899; - // aapt resource value: 0x7f0a00ee - public const int action_text = 2131362030; + // aapt resource value: 0x7f0a00ed + public const int action_text = 2131362029; - // aapt resource value: 0x7f0a00fc - public const int actions = 2131362044; + // aapt resource value: 0x7f0a00fb + public const int actions = 2131362043; // aapt resource value: 0x7f0a006c public const int activity_chooser_view_content = 2131361900; @@ -6687,8 +6684,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0072 public const int buttonPanel = 2131361906; - // aapt resource value: 0x7f0a00f0 - public const int cancel_action = 2131362032; + // aapt resource value: 0x7f0a00ef + public const int cancel_action = 2131362031; // aapt resource value: 0x7f0a004c public const int center = 2131361868; @@ -6702,8 +6699,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0086 public const int checkbox = 2131361926; - // aapt resource value: 0x7f0a00f8 - public const int chronometer = 2131362040; + // aapt resource value: 0x7f0a00f7 + public const int chronometer = 2131362039; // aapt resource value: 0x7f0a0061 public const int clip_horizontal = 2131361889; @@ -6714,8 +6711,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0040 public const int collapseActionView = 2131361856; - // aapt resource value: 0x7f0a00ae - public const int container = 2131361966; + // aapt resource value: 0x7f0a00ad + public const int container = 2131361965; // aapt resource value: 0x7f0a0082 public const int content = 2131361922; @@ -6723,8 +6720,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0075 public const int contentPanel = 2131361909; - // aapt resource value: 0x7f0a00af - public const int coordinator = 2131361967; + // aapt resource value: 0x7f0a00ae + public const int coordinator = 2131361966; // aapt resource value: 0x7f0a007c public const int custom = 2131361916; @@ -6738,20 +6735,20 @@ namespace Bit.Droid // aapt resource value: 0x7f0a006f public const int default_activity_button = 2131361903; - // aapt resource value: 0x7f0a00b1 - public const int design_bottom_sheet = 2131361969; - - // aapt resource value: 0x7f0a00b6 - public const int design_menu_item_action_area = 2131361974; + // aapt resource value: 0x7f0a00b0 + public const int design_bottom_sheet = 2131361968; // aapt resource value: 0x7f0a00b5 - public const int design_menu_item_action_area_stub = 2131361973; + public const int design_menu_item_action_area = 2131361973; // aapt resource value: 0x7f0a00b4 - public const int design_menu_item_text = 2131361972; + public const int design_menu_item_action_area_stub = 2131361972; // aapt resource value: 0x7f0a00b3 - public const int design_navigation_view = 2131361971; + public const int design_menu_item_text = 2131361971; + + // aapt resource value: 0x7f0a00b2 + public const int design_navigation_view = 2131361970; // aapt resource value: 0x7f0a0027 public const int disableHome = 2131361831; @@ -6762,8 +6759,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0037 public const int end = 2131361847; - // aapt resource value: 0x7f0a00fe - public const int end_padder = 2131362046; + // aapt resource value: 0x7f0a00fd + public const int end_padder = 2131362045; // aapt resource value: 0x7f0a0046 public const int enterAlways = 2131361862; @@ -6795,11 +6792,11 @@ namespace Bit.Droid // aapt resource value: 0x7f0a005c public const int @fixed = 2131361884; - // aapt resource value: 0x7f0a00b8 - public const int flyoutcontent_appbar = 2131361976; + // aapt resource value: 0x7f0a00b7 + public const int flyoutcontent_appbar = 2131361975; - // aapt resource value: 0x7f0a00b9 - public const int flyoutcontent_recycler = 2131361977; + // aapt resource value: 0x7f0a00b8 + public const int flyoutcontent_recycler = 2131361976; // aapt resource value: 0x7f0a0067 public const int forever = 2131361895; @@ -6819,8 +6816,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0071 public const int icon = 2131361905; - // aapt resource value: 0x7f0a00fd - public const int icon_group = 2131362045; + // aapt resource value: 0x7f0a00fc + public const int icon_group = 2131362044; // aapt resource value: 0x7f0a0041 public const int ifRoom = 2131361857; @@ -6828,8 +6825,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a006e public const int image = 2131361902; - // aapt resource value: 0x7f0a00f9 - public const int info = 2131362041; + // aapt resource value: 0x7f0a00f8 + public const int info = 2131362040; // aapt resource value: 0x7f0a0068 public const int italic = 2131361896; @@ -6840,8 +6837,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a004e public const int labeled = 2131361870; - // aapt resource value: 0x7f0a00ad - public const int largeLabel = 2131361965; + // aapt resource value: 0x7f0a00ac + public const int largeLabel = 2131361964; // aapt resource value: 0x7f0a0054 public const int left = 2131361876; @@ -6858,23 +6855,23 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0070 public const int list_item = 2131361904; - // aapt resource value: 0x7f0a00ff - public const int main_appbar = 2131362047; - - // aapt resource value: 0x7f0a0102 - public const int main_scrollview = 2131362050; + // aapt resource value: 0x7f0a00fe + public const int main_appbar = 2131362046; // aapt resource value: 0x7f0a0101 - public const int main_tablayout = 2131362049; + public const int main_scrollview = 2131362049; // aapt resource value: 0x7f0a0100 - public const int main_toolbar = 2131362048; + public const int main_tablayout = 2131362048; - // aapt resource value: 0x7f0a0109 - public const int masked = 2131362057; + // aapt resource value: 0x7f0a00ff + public const int main_toolbar = 2131362047; - // aapt resource value: 0x7f0a00f2 - public const int media_actions = 2131362034; + // aapt resource value: 0x7f0a0108 + public const int masked = 2131362056; + + // aapt resource value: 0x7f0a00f1 + public const int media_actions = 2131362033; // aapt resource value: 0x7f0a009c public const int message = 2131361948; @@ -6885,143 +6882,143 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0059 public const int mini = 2131361881; - // aapt resource value: 0x7f0a00d9 - public const int mr_art = 2131362009; - - // aapt resource value: 0x7f0a00ca - public const int mr_cast_checkbox = 2131361994; - - // aapt resource value: 0x7f0a00c3 - public const int mr_cast_close_button = 2131361987; - - // aapt resource value: 0x7f0a00be - public const int mr_cast_group_icon = 2131361982; - - // aapt resource value: 0x7f0a00bf - public const int mr_cast_group_name = 2131361983; - - // aapt resource value: 0x7f0a00bd - public const int mr_cast_list = 2131361981; - - // aapt resource value: 0x7f0a00c2 - public const int mr_cast_meta = 2131361986; - - // aapt resource value: 0x7f0a00c4 - public const int mr_cast_meta_art = 2131361988; - - // aapt resource value: 0x7f0a00c6 - public const int mr_cast_meta_subtitle = 2131361990; - - // aapt resource value: 0x7f0a00c5 - public const int mr_cast_meta_title = 2131361989; - - // aapt resource value: 0x7f0a00c8 - public const int mr_cast_route_icon = 2131361992; + // aapt resource value: 0x7f0a00d8 + public const int mr_art = 2131362008; // aapt resource value: 0x7f0a00c9 - public const int mr_cast_route_name = 2131361993; + public const int mr_cast_checkbox = 2131361993; - // aapt resource value: 0x7f0a00c7 - public const int mr_cast_stop_button = 2131361991; + // aapt resource value: 0x7f0a00c2 + public const int mr_cast_close_button = 2131361986; - // aapt resource value: 0x7f0a00cb - public const int mr_cast_volume_layout = 2131361995; + // aapt resource value: 0x7f0a00bd + public const int mr_cast_group_icon = 2131361981; - // aapt resource value: 0x7f0a00cc - public const int mr_cast_volume_slider = 2131361996; + // aapt resource value: 0x7f0a00be + public const int mr_cast_group_name = 2131361982; - // aapt resource value: 0x7f0a00ce - public const int mr_chooser_list = 2131361998; - - // aapt resource value: 0x7f0a00d1 - public const int mr_chooser_route_desc = 2131362001; - - // aapt resource value: 0x7f0a00cf - public const int mr_chooser_route_icon = 2131361999; - - // aapt resource value: 0x7f0a00d0 - public const int mr_chooser_route_name = 2131362000; - - // aapt resource value: 0x7f0a00cd - public const int mr_chooser_title = 2131361997; - - // aapt resource value: 0x7f0a00d6 - public const int mr_close = 2131362006; - - // aapt resource value: 0x7f0a00dc - public const int mr_control_divider = 2131362012; - - // aapt resource value: 0x7f0a00e7 - public const int mr_control_playback_ctrl = 2131362023; - - // aapt resource value: 0x7f0a00ea - public const int mr_control_subtitle = 2131362026; - - // aapt resource value: 0x7f0a00e9 - public const int mr_control_title = 2131362025; - - // aapt resource value: 0x7f0a00e8 - public const int mr_control_title_container = 2131362024; - - // aapt resource value: 0x7f0a00d7 - public const int mr_custom_control = 2131362007; - - // aapt resource value: 0x7f0a00d8 - public const int mr_default_control = 2131362008; - - // aapt resource value: 0x7f0a00d3 - public const int mr_dialog_area = 2131362003; - - // aapt resource value: 0x7f0a00e2 - public const int mr_dialog_header_name = 2131362018; - - // aapt resource value: 0x7f0a00d2 - public const int mr_expandable_area = 2131362002; - - // aapt resource value: 0x7f0a00eb - public const int mr_group_expand_collapse = 2131362027; - - // aapt resource value: 0x7f0a00c0 - public const int mr_group_volume_route_name = 2131361984; + // aapt resource value: 0x7f0a00bc + public const int mr_cast_list = 2131361980; // aapt resource value: 0x7f0a00c1 - public const int mr_group_volume_slider = 2131361985; + public const int mr_cast_meta = 2131361985; - // aapt resource value: 0x7f0a00da - public const int mr_media_main_control = 2131362010; + // aapt resource value: 0x7f0a00c3 + public const int mr_cast_meta_art = 2131361987; + + // aapt resource value: 0x7f0a00c5 + public const int mr_cast_meta_subtitle = 2131361989; + + // aapt resource value: 0x7f0a00c4 + public const int mr_cast_meta_title = 2131361988; + + // aapt resource value: 0x7f0a00c7 + public const int mr_cast_route_icon = 2131361991; + + // aapt resource value: 0x7f0a00c8 + public const int mr_cast_route_name = 2131361992; + + // aapt resource value: 0x7f0a00c6 + public const int mr_cast_stop_button = 2131361990; + + // aapt resource value: 0x7f0a00ca + public const int mr_cast_volume_layout = 2131361994; + + // aapt resource value: 0x7f0a00cb + public const int mr_cast_volume_slider = 2131361995; + + // aapt resource value: 0x7f0a00cd + public const int mr_chooser_list = 2131361997; + + // aapt resource value: 0x7f0a00d0 + public const int mr_chooser_route_desc = 2131362000; + + // aapt resource value: 0x7f0a00ce + public const int mr_chooser_route_icon = 2131361998; + + // aapt resource value: 0x7f0a00cf + public const int mr_chooser_route_name = 2131361999; + + // aapt resource value: 0x7f0a00cc + public const int mr_chooser_title = 2131361996; // aapt resource value: 0x7f0a00d5 - public const int mr_name = 2131362005; - - // aapt resource value: 0x7f0a00e3 - public const int mr_picker_close_button = 2131362019; - - // aapt resource value: 0x7f0a00e4 - public const int mr_picker_list = 2131362020; - - // aapt resource value: 0x7f0a00e5 - public const int mr_picker_route_icon = 2131362021; - - // aapt resource value: 0x7f0a00e6 - public const int mr_picker_route_name = 2131362022; + public const int mr_close = 2131362005; // aapt resource value: 0x7f0a00db - public const int mr_playback_control = 2131362011; + public const int mr_control_divider = 2131362011; - // aapt resource value: 0x7f0a00d4 - public const int mr_title_bar = 2131362004; + // aapt resource value: 0x7f0a00e6 + public const int mr_control_playback_ctrl = 2131362022; - // aapt resource value: 0x7f0a00dd - public const int mr_volume_control = 2131362013; + // aapt resource value: 0x7f0a00e9 + public const int mr_control_subtitle = 2131362025; - // aapt resource value: 0x7f0a00de - public const int mr_volume_group_list = 2131362014; + // aapt resource value: 0x7f0a00e8 + public const int mr_control_title = 2131362024; - // aapt resource value: 0x7f0a00e0 - public const int mr_volume_item_icon = 2131362016; + // aapt resource value: 0x7f0a00e7 + public const int mr_control_title_container = 2131362023; + + // aapt resource value: 0x7f0a00d6 + public const int mr_custom_control = 2131362006; + + // aapt resource value: 0x7f0a00d7 + public const int mr_default_control = 2131362007; + + // aapt resource value: 0x7f0a00d2 + public const int mr_dialog_area = 2131362002; // aapt resource value: 0x7f0a00e1 - public const int mr_volume_slider = 2131362017; + public const int mr_dialog_header_name = 2131362017; + + // aapt resource value: 0x7f0a00d1 + public const int mr_expandable_area = 2131362001; + + // aapt resource value: 0x7f0a00ea + public const int mr_group_expand_collapse = 2131362026; + + // aapt resource value: 0x7f0a00bf + public const int mr_group_volume_route_name = 2131361983; + + // aapt resource value: 0x7f0a00c0 + public const int mr_group_volume_slider = 2131361984; + + // aapt resource value: 0x7f0a00d9 + public const int mr_media_main_control = 2131362009; + + // aapt resource value: 0x7f0a00d4 + public const int mr_name = 2131362004; + + // aapt resource value: 0x7f0a00e2 + public const int mr_picker_close_button = 2131362018; + + // aapt resource value: 0x7f0a00e3 + public const int mr_picker_list = 2131362019; + + // aapt resource value: 0x7f0a00e4 + public const int mr_picker_route_icon = 2131362020; + + // aapt resource value: 0x7f0a00e5 + public const int mr_picker_route_name = 2131362021; + + // aapt resource value: 0x7f0a00da + public const int mr_playback_control = 2131362010; + + // aapt resource value: 0x7f0a00d3 + public const int mr_title_bar = 2131362003; + + // aapt resource value: 0x7f0a00dc + public const int mr_volume_control = 2131362012; + + // aapt resource value: 0x7f0a00dd + public const int mr_volume_group_list = 2131362013; + + // aapt resource value: 0x7f0a00df + public const int mr_volume_item_icon = 2131362015; + + // aapt resource value: 0x7f0a00e0 + public const int mr_volume_slider = 2131362016; // aapt resource value: 0x7f0a0014 public const int mtrl_child_content_container = 2131361812; @@ -7032,8 +7029,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a002f public const int multiply = 2131361839; - // aapt resource value: 0x7f0a00b2 - public const int navigation_header_container = 2131361970; + // aapt resource value: 0x7f0a00b1 + public const int navigation_header_container = 2131361969; // aapt resource value: 0x7f0a0042 public const int never = 2131361858; @@ -7044,14 +7041,14 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0025 public const int normal = 2131361829; - // aapt resource value: 0x7f0a00fb - public const int notification_background = 2131362043; - - // aapt resource value: 0x7f0a00f5 - public const int notification_main_column = 2131362037; + // aapt resource value: 0x7f0a00fa + public const int notification_background = 2131362042; // aapt resource value: 0x7f0a00f4 - public const int notification_main_column_container = 2131362036; + public const int notification_main_column = 2131362036; + + // aapt resource value: 0x7f0a00f3 + public const int notification_main_column_container = 2131362035; // aapt resource value: 0x7f0a0060 public const int outline = 2131361888; @@ -7080,11 +7077,11 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0055 public const int right = 2131361877; - // aapt resource value: 0x7f0a00fa - public const int right_icon = 2131362042; + // aapt resource value: 0x7f0a00f9 + public const int right_icon = 2131362041; - // aapt resource value: 0x7f0a00f6 - public const int right_side = 2131362038; + // aapt resource value: 0x7f0a00f5 + public const int right_side = 2131362037; // aapt resource value: 0x7f0a000c public const int save_image_matrix = 2131361804; @@ -7149,14 +7146,14 @@ namespace Bit.Droid // aapt resource value: 0x7f0a004f public const int selected = 2131361871; - // aapt resource value: 0x7f0a0103 - public const int shellcontent_appbar = 2131362051; - - // aapt resource value: 0x7f0a0105 - public const int shellcontent_scrollview = 2131362053; + // aapt resource value: 0x7f0a0102 + public const int shellcontent_appbar = 2131362050; // aapt resource value: 0x7f0a0104 - public const int shellcontent_toolbar = 2131362052; + public const int shellcontent_scrollview = 2131362052; + + // aapt resource value: 0x7f0a0103 + public const int shellcontent_toolbar = 2131362051; // aapt resource value: 0x7f0a0083 public const int shortcut = 2131361923; @@ -7170,11 +7167,11 @@ namespace Bit.Droid // aapt resource value: 0x7f0a002c public const int showTitle = 2131361836; - // aapt resource value: 0x7f0a0106 - public const int sliding_tabs = 2131362054; + // aapt resource value: 0x7f0a0105 + public const int sliding_tabs = 2131362053; - // aapt resource value: 0x7f0a00ac - public const int smallLabel = 2131361964; + // aapt resource value: 0x7f0a00ab + public const int smallLabel = 2131361963; // aapt resource value: 0x7f0a0016 public const int snackbar_action = 2131361814; @@ -7206,8 +7203,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a0056 public const int start = 2131361878; - // aapt resource value: 0x7f0a00f1 - public const int status_bar_latest_event_content = 2131362033; + // aapt resource value: 0x7f0a00f0 + public const int status_bar_latest_event_content = 2131362032; // aapt resource value: 0x7f0a005b public const int stretch = 2131361883; @@ -7248,8 +7245,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a005a public const int textStart = 2131361882; - // aapt resource value: 0x7f0a00b7 - public const int text_input_password_toggle = 2131361975; + // aapt resource value: 0x7f0a00b6 + public const int text_input_password_toggle = 2131361974; // aapt resource value: 0x7f0a0018 public const int textinput_counter = 2131361816; @@ -7260,8 +7257,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a001a public const int textinput_helper_text = 2131361818; - // aapt resource value: 0x7f0a00f7 - public const int time = 2131362039; + // aapt resource value: 0x7f0a00f6 + public const int time = 2131362038; // aapt resource value: 0x7f0a0023 public const int title = 2131361827; @@ -7272,8 +7269,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a007e public const int title_template = 2131361918; - // aapt resource value: 0x7f0a0107 - public const int toolbar = 2131362055; + // aapt resource value: 0x7f0a0106 + public const int toolbar = 2131362054; // aapt resource value: 0x7f0a0045 public const int top = 2131361861; @@ -7281,8 +7278,8 @@ namespace Bit.Droid // aapt resource value: 0x7f0a007d public const int topPanel = 2131361917; - // aapt resource value: 0x7f0a00b0 - public const int touch_outside = 2131361968; + // aapt resource value: 0x7f0a00af + public const int touch_outside = 2131361967; // aapt resource value: 0x7f0a000f public const int transition_current_scene = 2131361807; @@ -7314,11 +7311,11 @@ namespace Bit.Droid // aapt resource value: 0x7f0a001b public const int view_offset_helper = 2131361819; - // aapt resource value: 0x7f0a0108 - public const int visible = 2131362056; + // aapt resource value: 0x7f0a0107 + public const int visible = 2131362055; - // aapt resource value: 0x7f0a00df - public const int volume_item_container = 2131362015; + // aapt resource value: 0x7f0a00de + public const int volume_item_container = 2131362014; // aapt resource value: 0x7f0a0043 public const int withText = 2131361859; diff --git a/src/Android/Resources/layout/CellBaseView.axml b/src/Android/Resources/layout/CellBaseView.axml index 384a44632..4dda6c7db 100644 --- a/src/Android/Resources/layout/CellBaseView.axml +++ b/src/Android/Resources/layout/CellBaseView.axml @@ -12,8 +12,7 @@ android:orientation="vertical" android:layout_centerVertical="true" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="4dp"> + android:layout_height="wrap_content"> - SetValue(CellValueTextFontSizeProperty, value); } - public Color CellDescriptionColor - { - get => (Color)GetValue(CellDescriptionColorProperty); - set => SetValue(CellDescriptionColorProperty, value); - } - - [TypeConverter(typeof(FontSizeConverter))] - public double CellDescriptionFontSize - { - get => (double)GetValue(CellDescriptionFontSizeProperty); - set => SetValue(CellDescriptionFontSizeProperty, value); - } - public Color CellBackgroundColor { get => (Color)GetValue(CellBackgroundColorProperty); diff --git a/src/App/Controls/BoxedView/Cells/BaseCell.cs b/src/App/Controls/BoxedView/Cells/BaseCell.cs index b78f782ba..7e68fdaca 100644 --- a/src/App/Controls/BoxedView/Cells/BaseCell.cs +++ b/src/App/Controls/BoxedView/Cells/BaseCell.cs @@ -15,18 +15,6 @@ namespace Bit.App.Controls.BoxedView public static BindableProperty TitleFontSizeProperty = BindableProperty.Create( nameof(TitleFontSize), typeof(double), typeof(BaseCell), -1.0, defaultBindingMode: BindingMode.OneWay); - public static BindableProperty DescriptionProperty = BindableProperty.Create( - nameof(Description), typeof(string), typeof(BaseCell), default(string), - defaultBindingMode: BindingMode.OneWay); - - public static BindableProperty DescriptionColorProperty = BindableProperty.Create( - nameof(DescriptionColor), typeof(Color), typeof(BaseCell), default(Color), - defaultBindingMode: BindingMode.OneWay); - - public static BindableProperty DescriptionFontSizeProperty = BindableProperty.Create( - nameof(DescriptionFontSize), typeof(double), typeof(BaseCell), -1.0d, - defaultBindingMode: BindingMode.OneWay); - public static BindableProperty BackgroundColorProperty = BindableProperty.Create( nameof(BackgroundColor), typeof(Color), typeof(BaseCell), default(Color), defaultBindingMode: BindingMode.OneWay); @@ -50,25 +38,6 @@ namespace Bit.App.Controls.BoxedView set => SetValue(TitleFontSizeProperty, value); } - public string Description - { - get => (string)GetValue(DescriptionProperty); - set => SetValue(DescriptionProperty, value); - } - - public Color DescriptionColor - { - get => (Color)GetValue(DescriptionColorProperty); - set => SetValue(DescriptionColorProperty, value); - } - - [TypeConverter(typeof(FontSizeConverter))] - public double DescriptionFontSize - { - get => (double)GetValue(DescriptionFontSizeProperty); - set => SetValue(DescriptionFontSizeProperty, value); - } - public Color BackgroundColor { get => (Color)GetValue(BackgroundColorProperty);