Merge remote-tracking branch 'refs/remotes/origin/master'

pull/6/head
Marc CHEVALDONNE 2 months ago
commit 1a09e5ff18

@ -93,42 +93,52 @@ Global
{5E1D0DEE-CD68-4AAD-9597-9BFF30C8214C}.Release|Any CPU.Build.0 = Release|Any CPU
{5F26E535-4541-4C99-BD92-2DDB4EB65705}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F26E535-4541-4C99-BD92-2DDB4EB65705}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F26E535-4541-4C99-BD92-2DDB4EB65705}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{5F26E535-4541-4C99-BD92-2DDB4EB65705}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F26E535-4541-4C99-BD92-2DDB4EB65705}.Release|Any CPU.Build.0 = Release|Any CPU
{CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}.Release|Any CPU.Build.0 = Release|Any CPU
{1559C59B-727D-402D-A140-30B111DBF224}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1559C59B-727D-402D-A140-30B111DBF224}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1559C59B-727D-402D-A140-30B111DBF224}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{1559C59B-727D-402D-A140-30B111DBF224}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1559C59B-727D-402D-A140-30B111DBF224}.Release|Any CPU.Build.0 = Release|Any CPU
{E1F1F0CA-6E77-414E-B6D0-3302D850121C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1F1F0CA-6E77-414E-B6D0-3302D850121C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1F1F0CA-6E77-414E-B6D0-3302D850121C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{E1F1F0CA-6E77-414E-B6D0-3302D850121C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E1F1F0CA-6E77-414E-B6D0-3302D850121C}.Release|Any CPU.Build.0 = Release|Any CPU
{1D959883-1D6E-4E29-A575-69173C9BBC97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D959883-1D6E-4E29-A575-69173C9BBC97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D959883-1D6E-4E29-A575-69173C9BBC97}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{1D959883-1D6E-4E29-A575-69173C9BBC97}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D959883-1D6E-4E29-A575-69173C9BBC97}.Release|Any CPU.Build.0 = Release|Any CPU
{9F174F30-18D0-4B6B-A8E0-A4D0EB12FBEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F174F30-18D0-4B6B-A8E0-A4D0EB12FBEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F174F30-18D0-4B6B-A8E0-A4D0EB12FBEE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{9F174F30-18D0-4B6B-A8E0-A4D0EB12FBEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F174F30-18D0-4B6B-A8E0-A4D0EB12FBEE}.Release|Any CPU.Build.0 = Release|Any CPU
{17CBE4C6-9579-4B76-9520-F902C932C535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17CBE4C6-9579-4B76-9520-F902C932C535}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17CBE4C6-9579-4B76-9520-F902C932C535}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{17CBE4C6-9579-4B76-9520-F902C932C535}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17CBE4C6-9579-4B76-9520-F902C932C535}.Release|Any CPU.Build.0 = Release|Any CPU
{94DB81BA-1FCB-4E65-B1AD-BA68B445C457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94DB81BA-1FCB-4E65-B1AD-BA68B445C457}.Debug|Any CPU.Build.0 = Debug|Any CPU
{94DB81BA-1FCB-4E65-B1AD-BA68B445C457}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{94DB81BA-1FCB-4E65-B1AD-BA68B445C457}.Release|Any CPU.ActiveCfg = Release|Any CPU
{94DB81BA-1FCB-4E65-B1AD-BA68B445C457}.Release|Any CPU.Build.0 = Release|Any CPU
{83D42923-CEFB-48EE-986B-95D584386837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83D42923-CEFB-48EE-986B-95D584386837}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83D42923-CEFB-48EE-986B-95D584386837}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{83D42923-CEFB-48EE-986B-95D584386837}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83D42923-CEFB-48EE-986B-95D584386837}.Release|Any CPU.Build.0 = Release|Any CPU
{A9F7103F-9AAD-4A1F-9174-8568FEB3C1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9F7103F-9AAD-4A1F-9174-8568FEB3C1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9F7103F-9AAD-4A1F-9174-8568FEB3C1F0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{A9F7103F-9AAD-4A1F-9174-8568FEB3C1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9F7103F-9AAD-4A1F-9174-8568FEB3C1F0}.Release|Any CPU.Build.0 = Release|Any CPU
{F417F2C0-EDA9-4B7A-B4FC-00764091B750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@ -24,7 +24,7 @@
<ApplicationTitle>ex_CustomThemes</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>fr.uca.iut.ex_customthemes</ApplicationId>
<ApplicationId>fr.uca.iut.excustomthemes</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

@ -12,7 +12,7 @@
FontSize="60"
TextColor="DarkSalmon"/>
<Image HorizontalOptions="Start">
<Image HorizontalOptions="Start" WidthRequest="60" HeightRequest="60">
<Image.Source>
<FontImageSource Glyph="{StaticResource ion-bug}"
FontFamily="Ionicons"

@ -13,6 +13,7 @@ public static class MauiProgram
{
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
fonts.AddFont("ionicons.ttf", "Ionicons");
});
#if DEBUG

@ -7,6 +7,6 @@
<x:String x:Key="ion-ios-tennisball-outline">&#xf4ba;</x:String>
<x:String x:Key="ion-android-bicycle">&#xf369;</x:String>
<x:String x:Key="ion-bug">&#xf2be;</x:String>
<x:String x:Key="ion-bug">&#xf128;</x:String>
<x:String x:Key="ion-close-circled">&#xf128;</x:String>
</ResourceDictionary>

@ -24,7 +24,7 @@
<ApplicationTitle>ex_GlyphsFont</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.ex_glyphsfont</ApplicationId>
<ApplicationId>com.companyname.exglyphsfont</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

@ -25,7 +25,7 @@
<ApplicationTitle>ex_CustomContentView</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.ex_customcontentview</ApplicationId>
<ApplicationId>com.companyname.excustomcontentview</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

@ -25,7 +25,7 @@
<ApplicationTitle>ex_DataTemplateSelector</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.ex_datatemplateselector</ApplicationId>
<ApplicationId>com.companyname.exdatatemplateselector</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

@ -24,7 +24,7 @@
<ApplicationTitle>ex_Localization</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>fr.uca.iut.ex_localization</ApplicationId>
<ApplicationId>fr.uca.iut.exlocalization</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

@ -24,7 +24,7 @@
<ApplicationTitle>ex_Localization2</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>fr.uca.iut.ex_localization2</ApplicationId>
<ApplicationId>fr.uca.iut.exlocalization2</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

@ -24,7 +24,7 @@
<ApplicationTitle>ex_Localization3</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>fr.uca.iut.ex_localization3</ApplicationId>
<ApplicationId>fr.uca.iut.exlocalization3</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

@ -24,7 +24,7 @@
<ApplicationTitle>ex_Preferences</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>fr.uca.iut.ex_preferences</ApplicationId>
<ApplicationId>fr.uca.iut.expreferences</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

Loading…
Cancel
Save