Merge pull request #36 from JFouts/master

Turn Pokestops Purple when used, #26
ST-Apps · Jul 31, 2016 · 40b4390 · 40b4390
2 parents a1870f7 + 197dc71
commit 40b4390
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/PokemonGo-UWP/App.xaml b/PokemonGo-UWP/App.xaml
@@ -26,6 +26,7 @@
             <utils:PokemonDataToVisibilityConverter x:Key="PokemonDataToVisibilityConverter" />
             <utils:ItemAwardToPokemonSpriteConverter x:Key="ItemAwardToPokemonSpriteConverter" />
             <utils:NearbyPokemonDistanceToDistanceImageConverter x:Key="NearbyPokemonDistanceToDistanceImageConverter" />
+            <utils:PokestopToIconConverter x:Key="PokestopToIconConverter" />
 
         </ResourceDictionary>
     </Application.Resources>

diff --git a/PokemonGo-UWP/Assets/Icons/pokestop_near_inactive.png b/PokemonGo-UWP/Assets/Icons/pokestop_near_inactive.png
diff --git a/PokemonGo-UWP/PokemonGo-UWP.csproj b/PokemonGo-UWP/PokemonGo-UWP.csproj
@@ -121,6 +121,7 @@
     <Content Include="Assets\Icons\Footprint_Near.png" />
     <Content Include="Assets\Icons\FrontPortraitRing.png" />
     <Content Include="Assets\Icons\pokestop_near.png" />
+    <Content Include="Assets\Icons\pokestop_near_inactive.png" />
     <Content Include="Assets\Icons\stardust_painted.png" />
     <Content Include="Assets\Icons\stardust_vector.png" />
     <Content Include="Assets\Items\Egg.png" />

diff --git a/PokemonGo-UWP/Utils/Converters.cs b/PokemonGo-UWP/Utils/Converters.cs
@@ -8,6 +8,7 @@
 using AllEnum;
 using Google.Protobuf.Collections;
 using PokemonGo.RocketAPI.GeneratedCode;
+using PokemonGo.RocketAPI.Extensions;
 
 namespace PokemonGo_UWP.Utils
 {
@@ -227,6 +228,26 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
         #endregion
     }
 
+    public class PokestopToIconConverter : IValueConverter
+    {
+        #region Implementation of IValueConverter
+
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var cooldown = (long)value;
+            var inactve = "_inactive";
+            if (cooldown < DateTime.UtcNow.ToUnixTime()) inactve = "";
+            return new Uri($"ms-appx:///Assets/Icons/pokestop_near{inactve}.png");
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            return value;
+        }
+
+        #endregion
+    }
+
     public class EmptyConverter : IValueConverter
     {
         #region Implementation of IValueConverter

diff --git a/PokemonGo-UWP/Views/GameMapPage.xaml b/PokemonGo-UWP/Views/GameMapPage.xaml
@@ -139,7 +139,7 @@
                         <Button Style="{ThemeResource ImageButtonStyle}"
                                 CommandParameter="{Binding}"
                                 Command="{Binding TrySearchPokestop, Source={Binding GameManagerViewModel, Source={StaticResource Locator}}}">
-                            <Image Source="../Assets/Icons/pokestop_near.png"
+                            <Image Source="{Binding CooldownCompleteTimestampMs, Converter={StaticResource PokestopToIconConverter}}"
                                    maps:MapControl.Location="{Binding Converter={StaticResource MapObjectToGeopointConverter}, ConverterParameter=pokestop}"
                                    maps:MapControl.NormalizedAnchorPoint="0,1"
                                    Stretch="Uniform"