Merge pull request #75 from brminnick/AppStore-Screenshots

Fix KeyNotFoundException
brminnick · May 8, 2020 · 4b828cb · 4b828cb
2 parents 0cd9b46 + 7dae0c4
commit 4b828cb
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/GitTrends.Android/Properties/AndroidManifest.xml b/GitTrends.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="20" android:versionName="1.0.2" package="com.minnick.gittrends" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="21" android:versionName="1.0.3" package="com.minnick.gittrends" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 	<application android:label="GitTrends" android:fullBackupContent="@xml/auto_backup_rules">

diff --git a/GitTrends.Android/Services/NotificationService_Android.cs b/GitTrends.Android/Services/NotificationService_Android.cs
@@ -12,13 +12,18 @@
 using Microsoft.Azure.NotificationHubs;
 using Xamarin.Forms;
 
-[assembly: Dependency(typeof(BadgeService_Android))]
+[assembly: Dependency(typeof(NotificationService_Android))]
 namespace GitTrends.Droid
 {
-    public class BadgeService_Android : INotificationService
+    public class NotificationService_Android : INotificationService
     {
         Context CurrentContext => Xamarin.Essentials.Platform.AppContext;
 
+        public void Initialize()
+        {
+
+        }
+
         public Task<bool?> AreNotificationEnabled()
         {
             bool isPushNotificationEnabled;

diff --git a/GitTrends.iOS/Info.plist b/GitTrends.iOS/Info.plist
@@ -55,13 +55,13 @@
 		<string>processing</string>
 	</array>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
 		<string>com.minnick.GitTrends.NotifyTrendingRepositories</string>
 		<string>com.minnick.GitTrends.CleanUpDatabase</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>21</string>
 </dict>
 </plist>
diff --git a/GitTrends.iOS/Services/NotificationService_iOS.cs b/GitTrends.iOS/Services/NotificationService_iOS.cs
@@ -11,7 +11,7 @@ namespace GitTrends.iOS
 {
     public class NotificationService_iOS : INotificationService
     {
-        public NotificationService_iOS()
+        public void Initialize()
         {
             using var scope = ContainerService.Container.BeginLifetimeScope();
             scope.Resolve<NotificationService>().RegisterForNotificationsCompleted += HandleRegisterForNotificationsCompleted;

diff --git a/GitTrends/App.cs b/GitTrends/App.cs
@@ -3,6 +3,7 @@
 using AsyncAwaitBestPractices;
 using Autofac;
 using Shiny;
+using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
 using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
@@ -74,7 +75,10 @@ void InitializeEssentialServices()
             using var scope = ContainerService.Container.BeginLifetimeScope();
 
             var themeService = scope.Resolve<ThemeService>();
+            themeService.Initialize();
+
             var notificationService = DependencyService.Resolve<INotificationService>();
+            notificationService.Initialize();
         }
 
         void OnResumed() => _resumedEventManager.HandleEvent(this, EventArgs.Empty, nameof(Resumed));

diff --git a/GitTrends/Services/INotificationService.cs b/GitTrends/Services/INotificationService.cs
@@ -6,5 +6,6 @@ public interface INotificationService
     {
         Task SetiOSBadgeCount(int count);
         Task<bool?> AreNotificationEnabled();
+        void Initialize();
     }
 }
diff --git a/GitTrends/Services/ThemeService.cs b/GitTrends/Services/ThemeService.cs
@@ -17,8 +17,6 @@ public ThemeService(AnalyticsService analyticsService)
             _analyticsService = analyticsService;
 
             Application.Current.RequestedThemeChanged += HandleRequestedThemeChanged;
-
-            SetAppTheme(Preference);
         }
 
         public static event EventHandler<PreferredTheme> PreferenceChanged
@@ -37,6 +35,8 @@ public PreferredTheme Preference
             }
         }
 
+        public void Initialize() => SetAppTheme(Preference);
+
         void SetAppTheme(PreferredTheme preferredTheme)
         {
             BaseTheme theme = preferredTheme switch