diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index 0f5ea8ce..e76af48e 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -768,6 +768,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs index aef3f7fd..a8c114df 100644 --- a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs +++ b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs @@ -8478,25 +8478,31 @@ namespace AideDeJeu.Droid public const int share = 2131165324; // aapt resource value: 0x7F07008D - public const int spell_book = 2131165325; + public const int speaker = 2131165325; // aapt resource value: 0x7F07008E - public const int splash = 2131165326; + public const int speaker_off = 2131165326; // aapt resource value: 0x7F07008F - public const int stars_stack = 2131165327; + public const int spell_book = 2131165327; // aapt resource value: 0x7F070090 - public const int tooltip_frame_dark = 2131165328; + public const int splash = 2131165328; // aapt resource value: 0x7F070091 - public const int tooltip_frame_light = 2131165329; + public const int stars_stack = 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() { diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/speaker.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/speaker.png new file mode 100644 index 00000000..e177fb05 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/speaker.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/speaker_off.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/speaker_off.png new file mode 100644 index 00000000..f7c45345 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/speaker_off.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/speaker.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/speaker.png new file mode 100644 index 00000000..4bb2ef81 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/speaker.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/speaker_off.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/speaker_off.png new file mode 100644 index 00000000..b558b0ee Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/speaker_off.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/speaker.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/speaker.png new file mode 100644 index 00000000..1fbed6ec Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/speaker.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/speaker_off.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/speaker_off.png new file mode 100644 index 00000000..2ed74b92 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/speaker_off.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/speaker.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/speaker.png new file mode 100644 index 00000000..e177fb05 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable/speaker.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/speaker_off.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/speaker_off.png new file mode 100644 index 00000000..f7c45345 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable/speaker_off.png differ diff --git a/AideDeJeu/AideDeJeu.UWP/speaker.png b/AideDeJeu/AideDeJeu.UWP/speaker.png new file mode 100644 index 00000000..1fbed6ec Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/speaker.png differ diff --git a/AideDeJeu/AideDeJeu.UWP/speaker_off.png b/AideDeJeu/AideDeJeu.UWP/speaker_off.png new file mode 100644 index 00000000..2ed74b92 Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/speaker_off.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/speaker.imageset/speaker.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/speaker.imageset/speaker.png new file mode 100644 index 00000000..6ce27281 Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/speaker.imageset/speaker.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/speaker_off.imageset/speaker_off.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/speaker_off.imageset/speaker_off.png new file mode 100644 index 00000000..6543d086 Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/speaker_off.imageset/speaker_off.png differ diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpeechViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpeechViewModel.cs index 21f23624..dd3eb69c 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/SpeechViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/SpeechViewModel.cs @@ -32,6 +32,13 @@ namespace AideDeJeu.ViewModels } } + public string SpeakerIcon + { + get + { + return Speaking ? "speaker.png" : "speaker_off.png"; + } + } public bool Speaking { get @@ -60,6 +67,7 @@ namespace AideDeJeu.ViewModels _CancellationTokenSource = new CancellationTokenSource(); OnPropertyChanged(nameof(Speaking)); OnPropertyChanged(nameof(NotSpeaking)); + OnPropertyChanged(nameof(SpeakerIcon)); var options = new Xamarin.Essentials.SpeechOptions(); var locales = (await Xamarin.Essentials.TextToSpeech.GetLocalesAsync()).ToList(); if (item.Id.Contains("_vo.md")) @@ -83,6 +91,7 @@ namespace AideDeJeu.ViewModels _CancellationTokenSource = null; OnPropertyChanged(nameof(Speaking)); OnPropertyChanged(nameof(NotSpeaking)); + OnPropertyChanged(nameof(SpeakerIcon)); } } diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml index ad75816a..37aeed0d 100644 --- a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml @@ -24,7 +24,8 @@ - + + diff --git a/Data/Icons/convert.bat b/Data/Icons/convert.bat index 7add494e..4f1e5eda 100644 --- a/Data/Icons/convert.bat +++ b/Data/Icons/convert.bat @@ -49,8 +49,12 @@ call convertone.bat share share call convertone.bat cancel cancel -:nouveau - call convertone.bat scroll_unfurled scroll-unfurled +:nouveau + +call convertone.bat speaker speaker + +call convertone.bat speaker_off speaker-off + pause diff --git a/Data/Icons/speaker-off.svg b/Data/Icons/speaker-off.svg new file mode 100644 index 00000000..04426213 --- /dev/null +++ b/Data/Icons/speaker-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Data/Icons/speaker.svg b/Data/Icons/speaker.svg new file mode 100644 index 00000000..58c68071 --- /dev/null +++ b/Data/Icons/speaker.svg @@ -0,0 +1 @@ + \ No newline at end of file