Theme:: Perbaikan tampilan dan responsibilitas

bachtiarpanjaitan · Sep 27, 2024 · 96a1f29 · 96a1f29
1 parent fcdadab
commit 96a1f29
Show file tree

Hide file tree

Showing 22 changed files with 143 additions and 136 deletions.
diff --git a/Bepe/Components/FilterOne.cs b/Bepe/Components/FilterOne.cs
@@ -24,6 +24,14 @@ public static class FilterOne
         VerticalOptions = LayoutOptions.Center,
         Text = "Tambah",
         WidthRequest = 100,
+        ImageSource = new FontImageSource()
+        {
+            Glyph = "\uE145", //
+            FontFamily = "MaterialIcons",
+            Size = 15,
+            Color = Colors.DarkOrange
+        },
+        ContentLayout = new Button.ButtonContentLayout(Button.ButtonContentLayout.ImagePosition.Left, 10),
         Margin = new Thickness(5, 0)
     };
     private static readonly Label ModuleLabel = new()

diff --git a/Bepe/Components/SideMenu.cs b/Bepe/Components/SideMenu.cs
@@ -25,24 +25,44 @@ public VerticalStackLayout CreateSideMenu()
             {
                 foreach (var mi in menuItems)
                 {
-                    menuLayout.Add(ItemMenu(mi.Value.Label, mi.Value.Page));
+                    menuLayout.Add(ItemMenu(mi.Value));
                 }
             }
             return menuLayout;
         }
 
-        private Button ItemMenu(string text, string page)
+        private HorizontalStackLayout ItemMenu(MenuItemPage item)
         {
+            var icon = new Image()
+            {
+                Source = new FontImageSource()
+                {
+                    Glyph = item.Icon, //
+                    FontFamily = "MaterialIcons",
+                    Size = 20,
+                    Color = Colors.DarkOrange
+                },
+                HorizontalOptions = LayoutOptions.Start
+            };
             var button = new Button
             {
-                Text = text,
-                CornerRadius = 5,
-                Margin = 5
+                Text = item.Label,
+                FontAttributes = FontAttributes.Bold,
+                Margin = 5,
+                BorderColor = Colors.Transparent,
             };
 
-            button.Clicked += (s, e) => OnCLickItem(s, e, page);
+            button.Clicked += (s, e) => OnCLickItem(s, e, item.Page);
 
-            return button;
+            return new HorizontalStackLayout()
+            {
+                Children =
+                {
+                    icon,
+                    button
+                },
+                Margin = new Thickness(10,0)
+            };
         }
 
         private async void OnCLickItem(object sender, EventArgs e, string page)

diff --git a/Bepe/Controllers/PageController.cs b/Bepe/Controllers/PageController.cs
@@ -43,12 +43,6 @@ public void OnClickSideMenuItemAsync(object obj, EventHandlerPageArgs e)
             }
 
         }
-
-        public void ClearEvent()
-        {
-            sm.ItemTapped -= OnClickSideMenuItemAsync;
-            _contentView = null;
-        }
     }
 }
 
diff --git a/Bepe/Types/MenuItemPage.cs b/Bepe/Types/MenuItemPage.cs
@@ -5,8 +5,8 @@ public class MenuItemPage
 	{
         public string Label { get; set; }
         public string Page { get; set; }
-		public string name { get; set; }
-		public string icon { get; set; }
+		public string Name { get; set; }
+		public string Icon { get; set; }
         public MenuItemPage()
 		{
 

diff --git a/IhandCashier.csproj b/IhandCashier.csproj
@@ -131,9 +131,6 @@
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </EmbeddedResource>
 	</ItemGroup>
-	<ItemGroup>
-	  <ImageAsset Include="Resources\Images\document.png" />
-	</ItemGroup>
 	<ItemGroup>
 	  <MauiPlatformSpecificFolder Remove="Platforms\Android\" />
 	  <MauiPlatformSpecificFolder Remove="Platforms\iOS\" />

diff --git a/Layouts/MainLayout.xaml.cs b/Layouts/MainLayout.xaml.cs
@@ -25,6 +25,24 @@ public MainLayout()
         DatagridProvider.DataGrid.RowHeight = 35;
         DatagridProvider.DataGrid.DefaultStyle = Helper.SetDataGridStyle();
         DatagridProvider.DataGrid.SelectionMode = DataGridSelectionMode.SingleDeselect;
+        DatagridProvider.PrevButton.ImageSource = new FontImageSource()
+        {
+            Glyph = "\ueaa7", 
+            FontFamily = "MaterialIcons",
+            Size = 20,
+            Color = Colors.DarkOrange
+        };
+        DatagridProvider.NextButton.ImageSource = new FontImageSource()
+        {
+            Glyph = "\ueaaa", //
+            FontFamily = "MaterialIcons",
+            Size = 20,
+            Color = Colors.DarkOrange,
+        };
+        DatagridProvider.PrevButton.ContentLayout =
+            new Button.ButtonContentLayout(Button.ButtonContentLayout.ImagePosition.Left, 10);
+        DatagridProvider.NextButton.ContentLayout =
+            new Button.ButtonContentLayout(Button.ButtonContentLayout.ImagePosition.Right, 10);
         Container.Content = new PageHome();
 
     }

diff --git a/MauiProgram.cs b/MauiProgram.cs
@@ -20,6 +20,7 @@ public static MauiApp CreateMauiApp()
 			{
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
 				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+				fonts.AddFont("MaterialIcons-Regular.ttf", "MaterialIcons");
 			});
         builder.Services.AddAppServices();
 

diff --git a/Pages/PageDataBarang.xaml.cs b/Pages/PageDataBarang.xaml.cs
@@ -9,16 +9,10 @@ public partial class PageDataBarang : PageController
 	public PageDataBarang()
 	{
 		InitializeComponent();
-        SideMenus.Add("barang", new MenuItemPage { Label = "BARANG", Page =  typeof(GridDataBarang).FullName });
-        SideMenus.Add("harga_pembelian", new MenuItemPage { Label = "HARGA PEMBELIAN", Page = typeof(GridDataHargaBarang).FullName });
-        SideMenus.Add("satuan", new MenuItemPage { Label = "SATUAN", Page = typeof(GridDataSatuanBarang).FullName });
-        SideMenus.Add("basic_satuan", new MenuItemPage { Label = "SATUAN DASAR", Page = typeof(GridDataSatuanDasarBarang).FullName });
+        SideMenus.Add("barang", new MenuItemPage { Label = "BARANG", Page =  typeof(GridDataBarang).FullName, Icon = "\uE8EF"});
+        SideMenus.Add("harga_pembelian", new MenuItemPage { Label = "HARGA PEMBELIAN", Page = typeof(GridDataHargaBarang).FullName, Icon = "\uf05b"});
+        SideMenus.Add("satuan", new MenuItemPage { Label = "SATUAN", Page = typeof(GridDataSatuanBarang).FullName, Icon = "\uE268"});
+        SideMenus.Add("basic_satuan", new MenuItemPage { Label = "SATUAN DASAR", Page = typeof(GridDataSatuanDasarBarang).FullName, Icon = "\uE3F2"});
         DefineLayoutTwoColumn();
-        Unloaded += OnUnloaded;
-	}
-
-	private void OnUnloaded(object sender, EventArgs e)
-	{
-		ClearEvent();
-	}
+	} 
 }
diff --git a/Pages/PageDataPengguna.xaml.cs b/Pages/PageDataPengguna.xaml.cs
@@ -10,9 +10,9 @@ public PageDataPengguna()
 	{
 		InitializeComponent();
 
-        SideMenus.Add("kasir", new MenuItemPage { Label = "DATA KASIR", Page = typeof(GridDataKasir).FullName });
-        SideMenus.Add("pemasok", new MenuItemPage { Label = "DATA PEMASOK", Page = typeof(GridDataPemasok).FullName });
-        SideMenus.Add("pelanggan", new MenuItemPage { Label = "DATA PELANGGAN", Page = typeof(GridDataPelanggan).FullName });
+        SideMenus.Add("kasir", new MenuItemPage { Label = "DATA KASIR", Page = typeof(GridDataKasir).FullName, Icon = "\ueF3D"});
+        SideMenus.Add("pemasok", new MenuItemPage { Label = "DATA PEMASOK", Page = typeof(GridDataPemasok).FullName, Icon = "\uF8D9"});
+        SideMenus.Add("pelanggan", new MenuItemPage { Label = "DATA PELANGGAN", Page = typeof(GridDataPelanggan).FullName, Icon = "\uF8D7"});
 
         DefineLayoutTwoColumn();
 	}

diff --git a/Pages/PagePenerimaanBarang.xaml.cs b/Pages/PagePenerimaanBarang.xaml.cs
@@ -10,7 +10,7 @@ public partial class PagePenerimaanBarang : PageController
     public PagePenerimaanBarang()
 	{
 		InitializeComponent();
-        SideMenus.Add("penerimaan_barang", new MenuItemPage { Label = "PENERIMAAN", Page =  typeof(GridPenerimaanBarang).FullName });
+        SideMenus.Add("penerimaan_barang", new MenuItemPage { Label = "PENERIMAAN", Page =  typeof(GridPenerimaanBarang).FullName, Icon = "\uE558"});
         DefineLayoutTwoColumn();
     }
 }
diff --git a/Pages/PagePenjualanBarang.xaml.cs b/Pages/PagePenjualanBarang.xaml.cs
@@ -14,7 +14,7 @@ public partial class PagePenjualanBarang
     public PagePenjualanBarang()
     {
         InitializeComponent();
-        SideMenus.Add("penjualan_barang", new MenuItemPage { Label = "PENJUALAN", Page =  typeof(GridPenjualanBarang).FullName });
+        SideMenus.Add("penjualan_barang", new MenuItemPage { Label = "PENJUALAN", Page =  typeof(GridPenjualanBarang).FullName, Icon = "\uf17e"});
         DefineLayoutTwoColumn();
     }
 }
diff --git a/Pages/PageReturnBarang.xaml.cs b/Pages/PageReturnBarang.xaml.cs
@@ -13,8 +13,8 @@ public partial class PageReturnBarang
     public PageReturnBarang()
     {
         InitializeComponent();
-        SideMenus.Add("return_beli", new MenuItemPage { Label = "RETURN BELI", Page =  typeof(GridReturnBeli).FullName });
-        SideMenus.Add("return_jual", new MenuItemPage { Label = "RETURN JUAL", Page =  typeof(GridReturnJual).FullName });
+        SideMenus.Add("return_beli", new MenuItemPage { Label = "RETURN BELI", Page =  typeof(GridReturnBeli).FullName, Icon = "\ue889"});
+        SideMenus.Add("return_jual", new MenuItemPage { Label = "RETURN JUAL", Page =  typeof(GridReturnJual).FullName, Icon = "\ue923"});
 
         DefineLayoutTwoColumn();
     }

diff --git a/Pages/PageSetting.xaml.cs b/Pages/PageSetting.xaml.cs
@@ -10,8 +10,8 @@ public PageSetting()
 	{
 		InitializeComponent();
 
-		SideMenus.Add("setting_aplikasi", new MenuItemPage { Label = "APLIKASI", Page =  typeof(SettingApplication).FullName });
-		SideMenus.Add("setting_hak_akses", new MenuItemPage { Label = "HAK AKSES", Page =  typeof(SettingAcl).FullName });
+		SideMenus.Add("setting_aplikasi", new MenuItemPage { Label = "APLIKASI", Page =  typeof(SettingApplication).FullName, Icon = "\ue1b1"});
+		SideMenus.Add("setting_hak_akses", new MenuItemPage { Label = "HAK AKSES", Page =  typeof(SettingAcl).FullName, Icon = "\ue32a"});
 
 		DefineLayoutTwoColumn();
 	}

diff --git a/Pages/PageStokBarang.xaml.cs b/Pages/PageStokBarang.xaml.cs
@@ -14,8 +14,8 @@ public partial class PageStokBarang
     public PageStokBarang()
     {
         InitializeComponent();
-        SideMenus.Add("stok_barang", new MenuItemPage { Label = "STOK", Page =  typeof(GridStokBarang).FullName });
-        SideMenus.Add("stok_penyesuaian_barang", new MenuItemPage { Label = "PENYESUAIAN", Page =  typeof(GridPenyesuaianBarang).FullName });
+        SideMenus.Add("stok_barang", new MenuItemPage { Label = "STOK", Page =  typeof(GridStokBarang).FullName, Icon = "\uebb8"});
+        SideMenus.Add("stok_penyesuaian_barang", new MenuItemPage { Label = "PENYESUAIAN", Page =  typeof(GridPenyesuaianBarang).FullName, Icon = "\ue3ca"});
 
         DefineLayoutTwoColumn();
     }

diff --git a/Pages/Views/BaseView.cs b/Pages/Views/BaseView.cs
@@ -1,11 +1,51 @@
+using IhandCashier.Bepe.Types;
 using IhandCashier.Core.Maui.Providers;
 
 namespace IhandCashier.Pages.Views;
 
 public class BaseView : ContentView
 {
+    private static EventHandler _RefreshlickedHandlerRef;
+    private static EventHandler _EditClickedHandlerRef;
+    private static EventHandler _DeleteClickedHandlerRef;
+
+    public static MenuFlyoutItem RefreshMenu = new() { Text = "Refresh Data"};
+    public static MenuFlyoutItem EditMenu = new() { Text = "Ubah Data"};
+    public static MenuFlyoutItem DeleteMenu = new() { Text = "Hapus Data"};
     public void ResetView()
     {
         DatagridProvider.Reset();
+        DatagridProvider.DataGrid.BindingContext = null;
     }
+
+    public void SetContextMenuHandler(MenuFlyout ContextMenu, ContextMenuHandlers handler)
+    {
+        if (_RefreshlickedHandlerRef != null)RefreshMenu.Clicked -= _RefreshlickedHandlerRef;
+        if (_EditClickedHandlerRef != null) EditMenu.Clicked -= _EditClickedHandlerRef;
+        if (_DeleteClickedHandlerRef != null) DeleteMenu.Clicked -= _DeleteClickedHandlerRef;
+
+        if(handler.RefreshHandler != null) ContextMenu.Add(RefreshMenu);
+        if(handler.EditHandler != null) ContextMenu.Add(EditMenu);
+        if (handler.DeleteHandler != null)
+        {
+            ContextMenu.Add(new MenuFlyoutSeparator());
+            ContextMenu.Add(DeleteMenu);
+        }
+
+
+        _RefreshlickedHandlerRef = handler.RefreshHandler;
+        _EditClickedHandlerRef = handler.EditHandler;
+        _DeleteClickedHandlerRef = handler.DeleteHandler;
+
+        RefreshMenu.Clicked += _RefreshlickedHandlerRef;
+        EditMenu.Clicked += _EditClickedHandlerRef;
+        DeleteMenu.Clicked += _DeleteClickedHandlerRef;
+    }
+}
+
+public class ContextMenuHandlers
+{
+    public EventHandler? RefreshHandler { get; set; }
+    public EventHandler? EditHandler { get; set; }
+    public EventHandler? DeleteHandler { get; set; }
 }
diff --git a/Pages/Views/GridDataBarang.xaml.cs b/Pages/Views/GridDataBarang.xaml.cs
@@ -25,18 +25,19 @@ public GridDataBarang()
             InitializeComponent();
             FilterOne.Initialize(ModuleName);
             ResetView();
-            CreateContextMenu();
-            DatagridProvider.DataGrid.Columns.Clear();
+            SetContextMenuHandler(ContextMenu,new ContextMenuHandlers
+            {
+                DeleteHandler = OnDeleteClicked,
+                EditHandler = OnEditClicked,
+                RefreshHandler = OnRefreshClicked
+            });
             List<ColumnType> columns = [
                 new ()  { Type = ColumnTypes.Numeric,MappingName = "id", TextAlignment = TextAlignment.Center,ColumnMode = ColumnWidthMode.FitByCell ,HeaderText = "ID", Format = "N0" },
                 new() { Type = ColumnTypes.Text, MappingName = "kode", HeaderText = "KODE" },
                 new() { Type = ColumnTypes.Text, MappingName = "nama", HeaderText = "NAMA BARANG"},
                 new() { Type = ColumnTypes.Image, MappingImage = "resourceGambar" ,MappingName = "resourceGambarThumbnail", Width = 110, HeaderText = "GAMBAR", ImageHeight = 50, ImageWidth = 50}
             ];
-            foreach (var c in columns.Select(col => col.Create()))
-            {
-                DatagridProvider.DataGrid.Columns.Add(c);
-            };
+            foreach (var c in columns.Select(col => col.Create())) DatagridProvider.DataGrid.Columns.Add(c);;
             Content = DatagridProvider.LayoutDatagrid;
 
             DatagridProvider.ShowLoader();
@@ -86,21 +87,6 @@ private void OnEditClicked(object sender, EventArgs e)
             }
         }
 
-        private void CreateContextMenu()
-        {
-            MenuFlyoutItem refreshMenu = new() { Text = "Refresh Data"};
-            MenuFlyoutItem editMenu = new() { Text = "Ubah Data"};
-            MenuFlyoutItem deleteMenu = new() { Text = "Hapus Data"};
-            editMenu.Clicked += OnEditClicked;
-            deleteMenu.Clicked += OnDeleteClicked;
-            refreshMenu.Clicked += OnRefreshClicked;
-            ContextMenu.Add(refreshMenu);
-            ContextMenu.Add(editMenu);
-            ContextMenu.Add(new MenuFlyoutSeparator());
-            ContextMenu.Add(deleteMenu);
-
-        }
-
         private void OnRefreshClicked(object sender, EventArgs e)
         {
             _pagination.RefreshData();

diff --git a/Pages/Views/GridDataHargaBarang.xaml.cs b/Pages/Views/GridDataHargaBarang.xaml.cs
@@ -26,8 +26,13 @@ public GridDataHargaBarang()
   {
     InitializeComponent();
     FilterOne.Initialize(ModuleName);
-    CreateContextMenu();
     ResetView();
+    SetContextMenuHandler(ContextMenu,new ContextMenuHandlers
+    {
+      DeleteHandler = OnDeleteClicked,
+      EditHandler = OnEditClicked,
+      RefreshHandler = OnRefreshClicked
+    });
     List<ColumnType> columns = [
       new() { Type = ColumnTypes.Numeric,MappingName = "id", TextAlignment = TextAlignment.Center,ColumnMode = ColumnWidthMode.FitByCell ,HeaderText = "ID", Format = "N0" },
       new() { Type = ColumnTypes.Text, MappingName = "kode", HeaderText = "KODE",ColumnMode = ColumnWidthMode.FitByCell },
@@ -51,20 +56,6 @@ public GridDataHargaBarang()
     });
   }
 
-  private void CreateContextMenu()
-  {
-    MenuFlyoutItem refreshMenu = new() { Text = "Refresh Data"};
-    MenuFlyoutItem editMenu = new() { Text = "Ubah Data"};
-    MenuFlyoutItem deleteMenu = new() { Text = "Hapus Data"};
-    editMenu.Clicked += OnEditClicked;
-    deleteMenu.Clicked += OnDeleteClicked;
-    refreshMenu.Clicked += OnRefreshClicked;
-    ContextMenu.Add(refreshMenu);
-    ContextMenu.Add(editMenu);
-    ContextMenu.Add(new MenuFlyoutSeparator());
-    ContextMenu.Add(deleteMenu);
-  }
-
   private void OnClick(object sender, DataGridCellTappedEventArgs e)
   {
     _selectedProduct = e.RowData as ProductPriceDto;

diff --git a/Pages/Views/GridDataKasir.xaml.cs b/Pages/Views/GridDataKasir.xaml.cs
@@ -22,7 +22,6 @@ public GridDataKasir()
 		InitializeComponent();
 
 		FilterOne.Initialize(ModuleName);
-
 		ResetView();
 		List<ColumnType> columns = [
 			new ColumnType { Type = ColumnTypes.Numeric,TextAlignment = TextAlignment.Center,MappingName = "id", ColumnMode = ColumnWidthMode.FitByCell ,HeaderText = "ID", Format = "N0" },