Modify DemoApp

Modify AppIcon,SplashIcon Modify Colors of Theme Modfiy ListView to TMListView Modify order of Controls
trimble-oss · Aug 30, 2023 · 4609f85 · 4609f85
1 parent 7480155
commit 4609f85
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 37 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,26 +11,27 @@ public MainPage()
             InitializeComponent();
             ControlNames = new ObservableCollection<string>
             {
+                "Accordion",
+                "Badge",
                 "Button",
+                "Card",
+                "CheckBox",
+                "Chips",
+                "DataGrid",
                 "Input",
                 "MultiLineInput",
                 "NumberInput",
+                "ListView",
                 "Modal",
-                "Toast",
-                "CheckBox",
-                "Card",
+                "PopupView",
+                "ProgressBar",
                 "RadioButton",
-                "Spinner",
                 "SegmentedControl",
-                "ListView",
-                "DataGrid",
-                "PopupView",
-                "TabbedPage",
-                "Badge",
-                "Accordion",
-                "Chips",
+                "Spinner",
                 "Switch",
-                "ProgressBar"
+                "TabbedPage",
+                "Toast"
+
             };
             BindingContext = this;
         }
@@ -100,7 +100,7 @@ private void ItemTapped(object sender, ItemTappedEventArgs e)
                         break;
                     case "Switch":
                         Navigation.PushAsync(new SwitchSamplePage());
-                        break; 
+                        break;
                     default:
                         Console.WriteLine("Default Case");
                         break;

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>
+  <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>