Merge branch 'develop' of github.com:trimble-oss/modus-mobile-maui-co…

…mponents into 179-Alert-Dialogue # Conflicts: # DemoApp/DemoApp/MainPage.xaml.cs
trimble-oss · Aug 31, 2023 · 93fffe6 · 93fffe6
2 parents 62ec80c + e0dc453
commit 93fffe6
Show file tree

Hide file tree

Showing 35 changed files with 989 additions and 1,057 deletions.
diff --git a/DemoApp/DemoApp/DemoApp.csproj b/DemoApp/DemoApp/DemoApp.csproj
@@ -44,10 +44,10 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#0063a3" />
 
 		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#0063a3"  BaseSize="128,128"/>
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />

diff --git a/DemoApp/DemoApp/MainPage.xaml b/DemoApp/DemoApp/MainPage.xaml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:modus="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
              Title="Controls Page"
              x:Class="DemoApp.MainPage">
-  <ListView ItemsSource="{Binding ControlNames}"
-            ItemTapped="ItemTapped">
-    <ListView.ItemTemplate>
+
+  <modus:TMListView ItemsSource="{Binding ControlNames}"
+                    ItemTapped="ItemTapped">
+    <modus:TMListView.ItemTemplate>
       <DataTemplate>
-        <ViewCell>
-          <StackLayout HorizontalOptions="Center" VerticalOptions="Center">
-            <Label Text="{Binding}"
-                 HorizontalOptions="Center"
-                 VerticalOptions="Center" />
-          </StackLayout>
-        </ViewCell>
+        <modus:TextCell Title="{Binding}"></modus:TextCell>
       </DataTemplate>
-    </ListView.ItemTemplate>
-  </ListView>
+    </modus:TMListView.ItemTemplate>
+  </modus:TMListView>
 </ContentPage>
diff --git a/DemoApp/DemoApp/MainPage.xaml.cs b/DemoApp/DemoApp/MainPage.xaml.cs
@@ -1,6 +1,5 @@
 using DemoApp.Views;
 using System.Collections.ObjectModel;
-using Trimble.Modus.Components.Popup.Services;
 
 namespace DemoApp
 {
@@ -12,27 +11,30 @@ public MainPage()
             InitializeComponent();
             ControlNames = new ObservableCollection<string>
             {
+                "Accordion",
+                "Badge",
                 "Button",
+                "Card",
+                "CheckBox",
+                "Chips",
+                "DataGrid",
+                "Display Alert",
                 "Input",
                 "MultiLineInput",
                 "NumberInput",
+                "ListView",
                 "Modal",
-                "Toast",
-                "CheckBox",
-                "Card",
+                "PopupView",
+                "ProgressBar",
                 "RadioButton",
-                "Spinner",
                 "SegmentedControl",
-                "ListView",
-                "DataGrid",
-                "PopupView",
+                "Spinner",
+                "Switch",
                 "TabbedPage",
-                "Badge",
                 "Accordion",
                 "Chips",
                 "Switch",
                 "ProgressBar",
-                "Display Alert"
             };
             BindingContext = this;
         }

diff --git a/DemoApp/DemoApp/Platforms/Android/Resources/values/colors.xml b/DemoApp/DemoApp/Platforms/Android/Resources/values/colors.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="colorPrimary">#512BD4</color>
-  <color name="colorPrimaryDark">#2B0B98</color>
-  <color name="colorAccent">#2B0B98</color>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="colorPrimary">#0063a3</color>
+  <color name="colorPrimaryDark">#0063a3</color>
+  <color name="colorAccent">#0063a3</color>
+</resources>
diff --git a/DemoApp/DemoApp/Resources/AppIcon/appicon.svg b/DemoApp/DemoApp/Resources/AppIcon/appicon.svg
diff --git a/DemoApp/DemoApp/Resources/AppIcon/appiconfg.svg b/DemoApp/DemoApp/Resources/AppIcon/appiconfg.svg
diff --git a/DemoApp/DemoApp/Resources/Splash/splash.svg b/DemoApp/DemoApp/Resources/Splash/splash.svg
diff --git a/DemoApp/DemoApp/Resources/Styles/Colors.xaml b/DemoApp/DemoApp/Resources/Styles/Colors.xaml
@@ -3,9 +3,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-  <Color x:Key="Primary">#512BD4</Color>
-  <Color x:Key="Secondary">#DFD8F7</Color>
-  <Color x:Key="Tertiary">#2B0B98</Color>
+  <Color x:Key="Primary">#0063a3</Color>
+  <Color x:Key="Secondary">#0063a3</Color> 
+  <Color x:Key="Tertiary">#0063a3</Color>
   <Color x:Key="White">White</Color>
   <Color x:Key="Black">Black</Color>
   <Color x:Key="Gray100">#E1E1E1</Color>

diff --git a/DemoApp/DemoApp/Views/AccordionSamplePage.xaml b/DemoApp/DemoApp/Views/AccordionSamplePage.xaml
@@ -11,7 +11,6 @@
                  Margin="10">
       <Label Text="Size"
              FontSize="Large"
-             FontAttributes="Bold"
              HorizontalOptions="Start"
              Margin="0,10,0,0" />
       <modus:TMRadioButtonGroup x:Name="AccordionSize"
@@ -28,7 +27,6 @@
       </modus:TMRadioButtonGroup>
       <Label Text="Chevron Position"
              FontSize="Large"
-             FontAttributes="Bold"
              HorizontalOptions="Start"
              Margin="0,10,0,0" />
       <modus:TMRadioButtonGroup x:Name="PositionGroup"

diff --git a/DemoApp/DemoApp/Views/ListViewPage.xaml b/DemoApp/DemoApp/Views/ListViewPage.xaml
diff --git a/DemoApp/DemoApp/Views/ListViewPage.xaml.cs b/DemoApp/DemoApp/Views/ListViewPage.xaml.cs