Relook icones

AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj

@@ -238,6 +238,9 @@
 	<AndroidResource Include="..\..\Data\Icons\Resources\drawable\$(MainLogo).png">
 	  <Link>Resources\drawable\main.png</Link>
 	</AndroidResource>
+	<AndroidResource Include="..\..\Data\Icons\Resources\drawable\$(MainLogo)_big.png">
+	  <Link>Resources\drawable\main_big.png</Link>
+	</AndroidResource>
     <AndroidAsset Include="..\..\Data\library.ver">
       <Link>Assets\library.ver</Link>
     </AndroidAsset>
@@ -587,6 +590,12 @@
     <AndroidResource Include="Resources\drawable-xhdpi\scroll_unfurled.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\scroll_unfurled.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\swordman.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\swordman.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\swordman.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\swordman.png" />
+  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\xml\searchable.xml" />
   </ItemGroup>

AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs

@@ -8402,103 +8402,109 @@ namespace AideDeJeu.Droid
 			public const int main = 2131165298;
 			
 			// aapt resource value: 0x7F070073
-			public const int MaterialActivityIndicatorBackground = 2131165299;
+			public const int main_big = 2131165299;
 			
 			// aapt resource value: 0x7F070074
-			public const int MaterialProgressBar = 2131165300;
+			public const int MaterialActivityIndicatorBackground = 2131165300;
 			
 			// aapt resource value: 0x7F070075
-			public const int mtrl_snackbar_background = 2131165301;
+			public const int MaterialProgressBar = 2131165301;
 			
 			// aapt resource value: 0x7F070076
-			public const int mtrl_tabs_default_indicator = 2131165302;
+			public const int mtrl_snackbar_background = 2131165302;
 			
 			// aapt resource value: 0x7F070077
-			public const int navigation_empty_icon = 2131165303;
+			public const int mtrl_tabs_default_indicator = 2131165303;
 			
 			// aapt resource value: 0x7F070078
-			public const int notification_action_background = 2131165304;
+			public const int navigation_empty_icon = 2131165304;
 			
 			// aapt resource value: 0x7F070079
-			public const int notification_bg = 2131165305;
+			public const int notification_action_background = 2131165305;
 			
 			// aapt resource value: 0x7F07007A
-			public const int notification_bg_low = 2131165306;
+			public const int notification_bg = 2131165306;
 			
 			// aapt resource value: 0x7F07007B
-			public const int notification_bg_low_normal = 2131165307;
+			public const int notification_bg_low = 2131165307;
 			
 			// aapt resource value: 0x7F07007C
-			public const int notification_bg_low_pressed = 2131165308;
+			public const int notification_bg_low_normal = 2131165308;
 			
 			// aapt resource value: 0x7F07007D
-			public const int notification_bg_normal = 2131165309;
+			public const int notification_bg_low_pressed = 2131165309;
 			
 			// aapt resource value: 0x7F07007E
-			public const int notification_bg_normal_pressed = 2131165310;
+			public const int notification_bg_normal = 2131165310;
 			
 			// aapt resource value: 0x7F07007F
-			public const int notification_icon_background = 2131165311;
+			public const int notification_bg_normal_pressed = 2131165311;
 			
 			// aapt resource value: 0x7F070080
-			public const int notification_template_icon_bg = 2131165312;
+			public const int notification_icon_background = 2131165312;
 			
 			// aapt resource value: 0x7F070081
-			public const int notification_template_icon_low_bg = 2131165313;
+			public const int notification_template_icon_bg = 2131165313;
 			
 			// aapt resource value: 0x7F070082
-			public const int notification_tile_bg = 2131165314;
+			public const int notification_template_icon_low_bg = 2131165314;
 			
 			// aapt resource value: 0x7F070083
-			public const int notify_panel_notification_icon_bg = 2131165315;
+			public const int notification_tile_bg = 2131165315;
 			
 			// aapt resource value: 0x7F070084
-			public const int plain_arrow_down = 2131165316;
+			public const int notify_panel_notification_icon_bg = 2131165316;
 			
 			// aapt resource value: 0x7F070085
-			public const int plain_arrow_up = 2131165317;
+			public const int plain_arrow_down = 2131165317;
 			
 			// aapt resource value: 0x7F070086
-			public const int rolling_dice_cup = 2131165318;
+			public const int plain_arrow_up = 2131165318;
 			
 			// aapt resource value: 0x7F070087
-			public const int round_star = 2131165319;
+			public const int rolling_dice_cup = 2131165319;
 			
 			// aapt resource value: 0x7F070088
-			public const int scroll_unfurled = 2131165320;
+			public const int round_star = 2131165320;
 			
 			// aapt resource value: 0x7F070089
-			public const int settings_knobs = 2131165321;
+			public const int scroll_unfurled = 2131165321;
 			
 			// aapt resource value: 0x7F07008A
-			public const int share = 2131165322;
+			public const int settings_knobs = 2131165322;
 			
 			// aapt resource value: 0x7F07008B
-			public const int speaker = 2131165323;
+			public const int share = 2131165323;
 			
 			// aapt resource value: 0x7F07008C
-			public const int speaker_off = 2131165324;
+			public const int speaker = 2131165324;
 			
 			// aapt resource value: 0x7F07008D
-			public const int spell_book = 2131165325;
+			public const int speaker_off = 2131165325;
 			
 			// aapt resource value: 0x7F07008E
-			public const int splash = 2131165326;
+			public const int spell_book = 2131165326;
 			
 			// aapt resource value: 0x7F07008F
-			public const int stars_stack = 2131165327;
+			public const int splash = 2131165327;
 			
 			// aapt resource value: 0x7F070090
-			public const int tooltip_frame_dark = 2131165328;
+			public const int stars_stack = 2131165328;
 			
 			// aapt resource value: 0x7F070091
-			public const int tooltip_frame_light = 2131165329;
+			public const int swordman = 2131165329;
 			
 			// aapt resource value: 0x7F070092
-			public const int trash_can = 2131165330;
+			public const int tooltip_frame_dark = 2131165330;
 			
 			// aapt resource value: 0x7F070093
-			public const int wooden_sign = 2131165331;
+			public const int tooltip_frame_light = 2131165331;
+			
+			// aapt resource value: 0x7F070094
+			public const int trash_can = 2131165332;
+			
+			// aapt resource value: 0x7F070095
+			public const int wooden_sign = 2131165333;
 			
 			static Drawable()
 			{

AideDeJeu/AideDeJeu/Views/MainPage.xaml

@@ -68,7 +68,9 @@
         </Style>
     </ContentPage.Resources>
     <ContentPage.Content>
-        <ScrollView>
+        <Grid>
+            <Image Source="main_big.png" Opacity="0.5" />
+            <ScrollView BackgroundColor="Transparent">
                 <FlexLayout>
                     <!--<ActivityIndicator 
                             VerticalOptions="StartAndExpand"
@@ -90,18 +92,6 @@
                 </ActivityIndicator>-->
                     <!--<Label Text="{Binding Main.DebugCount.Result, StringFormat='Count : {0}'}" TextColor="Transparent" />-->
                     <!--<Label Text="{Binding Main.Navigator.TestNotify}" TextColor="Transparent" />-->
-                <Frame>
-                    <Grid>
-                        <Label Text="Personnages" FontFamily="{StaticResource LinuxLibertineCapitals}" />
-                        <ImageButton Source="main.png" Command="{Binding Main.Navigator.PlayerCharacterEditorCommand, Mode=OneTime}" />
-                    </Grid>
-                </Frame>
-                <Frame>
-                    <Grid>
-                        <Label Text="Dés" FontFamily="{StaticResource LinuxLibertineCapitals}" />
-                        <ImageButton Source="d20.png" Command="{Binding Main.Navigator.DicesCommand, Mode=OneTime}" />
-                    </Grid>
-                </Frame>
                     <Frame>
                         <Grid>
                             <Label Text="Bibliothèque" FontFamily="{StaticResource LinuxLibertineCapitals}" />
@@ -120,6 +110,18 @@
                             <ImageButton Source="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand, Mode=OneTime}" />
                         </Grid>
                     </Frame>
+                    <Frame>
+                        <Grid>
+                            <Label Text="Personnages" FontFamily="{StaticResource LinuxLibertineCapitals}" />
+                            <ImageButton Source="swordman.png" Command="{Binding Main.Navigator.PlayerCharacterEditorCommand, Mode=OneTime}" />
+                        </Grid>
+                    </Frame>
+                    <Frame>
+                        <Grid>
+                            <Label Text="Dés" FontFamily="{StaticResource LinuxLibertineCapitals}" />
+                            <ImageButton Source="d20.png" Command="{Binding Main.Navigator.DicesCommand, Mode=OneTime}" />
+                        </Grid>
+                    </Frame>
                     <Frame>
                         <Grid>
                             <Label Text="A propos de..." FontFamily="{StaticResource LinuxLibertineCapitals}" />
@@ -128,5 +130,6 @@
                     </Frame>
                 </FlexLayout>
             </ScrollView>
+        </Grid>
     </ContentPage.Content>
 </ContentPage>

AideDeJeu/AideDeJeu/Views/MainShell.xaml

@@ -137,18 +137,8 @@
         <!--</StackLayout>-->
     </Shell.FlyoutHeader>
 
-    <ShellContent Title="Accueil" Route="home" ContentTemplate="{DataTemplate local:MainPage}" />
+    <ShellContent Title="Accueil" Route="home" Icon="main.png" ContentTemplate="{DataTemplate local:MainPage}" />
     <!--<ShellContent Title="Personnages" Route="pceditor" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" />-->
-    <FlyoutItem Title="Personnages" Route="pceditor" Icon="main.png">
-        <Tab Title="Personnages">
-            <ShellContent Title="Race" ContentTemplate="{DataTemplate pc:RacePage}" />
-            <ShellContent Title="Historique" ContentTemplate="{DataTemplate pc:BackgroundPage}" />
-            <ShellContent Title="Classe" ContentTemplate="{DataTemplate pc:ClassPage}" />
-            <ShellContent Title="Caractéristiques" ContentTemplate="{DataTemplate pc:AbilitiesPage}" />
-            <ShellContent Title="Finalisation" ContentTemplate="{DataTemplate pc:FinalizePage}" />
-        </Tab>
-    </FlyoutItem>
-    <ShellContent Title="Dés" Icon="d20.png" Route="dices" ContentTemplate="{DataTemplate local:DicesPage}" />
     <FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
         <ShellContent Title="Bibliothèque" Route="library" Icon="spell_book.png">
             <ShellContent.ContentTemplate>
@@ -164,6 +154,16 @@
         <ShellContent Title="Favoris" Route="bookmarks" ContentTemplate="{DataTemplate library:BookmarksPage}" Icon="stars_stack.png" />
         <ShellContent Title="Recherche" Route="deepsearch" ContentTemplate="{DataTemplate library:DeepSearchPage}"  Icon="crystal_ball.png" />
     </FlyoutItem>
+    <FlyoutItem Title="Personnages" Route="pceditor" Icon="swordman.png">
+        <Tab Title="Personnages">
+            <ShellContent Title="Race" ContentTemplate="{DataTemplate pc:RacePage}" />
+            <ShellContent Title="Historique" ContentTemplate="{DataTemplate pc:BackgroundPage}" />
+            <ShellContent Title="Classe" ContentTemplate="{DataTemplate pc:ClassPage}" />
+            <ShellContent Title="Caractéristiques" ContentTemplate="{DataTemplate pc:AbilitiesPage}" />
+            <ShellContent Title="Finalisation" ContentTemplate="{DataTemplate pc:FinalizePage}" />
+        </Tab>
+    </FlyoutItem>
+    <ShellContent Title="Dés" Icon="d20.png" Route="dices" ContentTemplate="{DataTemplate local:DicesPage}" />
     <ShellContent Title="A propos de..." Route="about" Icon="wooden_sign.png" ContentTemplate="{DataTemplate local:AboutPage}" />
     <!--<ShellItem Title="Accueil" FlyoutDisplayOptions="AsSingleItem">
         <ShellContent Title="Accueil" ContentTemplate="{DataTemplate local:MainPage}" />

Data/Icons/convert.bat

@@ -57,8 +57,16 @@ call convertone.bat speaker_off speaker-off
 
 call convertone.bat high_shot high-shot
 
-:nouveau
-
 call convertone.bat tied_scroll tied-scroll
 
+call convertmain.bat high_shot_big high-shot
+
+call convertmain.bat battle_axe_big battle-axe
+
+call convertmain.bat tied_scroll_big tied-scroll
+
+:nouveau
+
+call convertone.bat swordman swordman
+
 pause

Data/Icons/convertmain.bat

@@ -0,0 +1,19 @@
+set INKSCAPE=..\..\Ignore\inkscape\inkscape.com
+set ANDROID_PATH=..\..\AideDeJeu\AideDeJeu.Android\Resources\
+set UWP_PATH=..\..\AideDeJeu\AideDeJeu.UWP\
+set IOS_PATH=..\..\AideDeJeu\AideDeJeu.iOS\Media.xcassets\
+
+rem goto ios
+
+:android
+
+%INKSCAPE% -z -e %ANDROID_PATH%drawable\%1.png -w 1024 -h 1024 %2.svg
+
+:uwp
+
+%INKSCAPE% -z -e %UWP_PATH%%1.png -w 1024 -h 1024 %2.svg
+
+:ios
+
+md %IOS_PATH%%1.imageset\
+%INKSCAPE% -z -e %IOS_PATH%%1.imageset\%1.png -w 1024 -h 1024 %2.svg

Data/Icons/swordman.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><path d="M0 0h512v512H0z" fill="#fff" fill-opacity="0"></path><g class="" transform="translate(0,0)" style="touch-action: none;"><path d="M467.838 35.848c-53.208 3.518-101.284 8.091-139.14 50.18 9.869 29.563 26.168 65.884 46.613 95.234 20.504 29.436 44.758 50.59 68.61 53.297 35.265-33.057 53.699-112.599 23.917-198.711zM189.8 46.02a70.936 54.43 66.039 0 0-15.987 3.638 70.936 54.43 66.039 0 0-20.931 86.928 70.936 54.43 66.039 0 0 51.62 45.443c2.392 57.507-19.428 43.883-70.534 73.606l15.888 31.69c35.566-13.731 51.844-19.703 69.27-44.317 32.586 93.92-1.874 157.236-23.688 247.078l33.711 4.916c23.698-57.247 55.114-122.355 62.438-181.422 48.937 51.134 77.498 114.641 114.65 169.143l35.82-14.75c-45.81-80.724-65.633-128.371-150.591-262.19 26.819-.194 49.826-6.592 70.683-15.422-7.036-10.105-13.565-20.882-19.529-31.886-28.223 12.083-59.028 16.997-90.14.855a70.936 54.43 66.039 0 0-.118-66.955 70.936 54.43 66.039 0 0-62.562-46.355zM15.47 87.309l3.287 34.09 52.6 107.77 21.568-10.526-52.383-107.325-25.072-24.01zm97.066 139.566l-46.756 22.822 3.137 18.496 56.271-27.464-12.652-13.854zm2.318 36.701l-21.568 10.528 16.668 34.15 21.568-10.527-16.668-34.15z" fill="#000" fill-opacity="1"></path></g></svg>