Merge pull request #18 from niilopoutanen/Develop

Develop to Main
niilopoutanen · Sep 27, 2022 · b2b637d · b2b637d
2 parents a49474a + 4cd64bc
commit b2b637d
Show file tree

Hide file tree

Showing 5 changed files with 2,994 additions and 2,585 deletions.
diff --git a/TODO-app/TODO-app/MainActivity.cs b/TODO-app/TODO-app/MainActivity.cs
@@ -12,6 +12,7 @@
 using Android.Views.InputMethods;
 using TODO_app.Resources.layout;
 using Java.Lang;
+using Firebase.Analytics;
 
 namespace TODO_app
 {
@@ -86,6 +87,13 @@ public class MainActivity : AppCompatActivity
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
+            //GoogleAnalytics.Current.Config.TrackingId = "4095321217";
+            //GoogleAnalytics.Current.Config.AppId = "com.tiimi1.todo_app";
+            //GoogleAnalytics.Current.Config.AppName = "TODO-app";
+            //GoogleAnalytics.Current.Config.AppVersion = "1.3.0.0";
+            //GoogleAnalytics.Current.InitTracker();
+            //GoogleAnalytics.Current.Tracker.SendView("MainPage");
+            FirebaseAnalytics.GetInstance(this);
             LoadSettings();
             base.OnCreate(savedInstanceState);
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
@@ -179,7 +187,7 @@ private void CheckIfMissedAnymore()
                     amountOfMissed++;
                 }
             }
-
+            missedTasksCount.Text = amountOfMissed.ToString();
             if (amountOfMissed <= 0)
             {
                 missedTasksBtn.Visibility = ViewStates.Gone;
@@ -687,7 +695,7 @@ private void ArrowModify(object sender, EventArgs e)
 
                 case Resource.Id.DayArrowDown:
                     daySelected--;
-                    if (daySelected < DateTime.DaysInMonth(YearSelected, MonthSelected))
+                    if (daySelected < 1) 
                     {
                         daySelected++;
                     }

diff --git a/TODO-app/TODO-app/Properties/AndroidManifest.xml b/TODO-app/TODO-app/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="2" android:versionName="1.2" package="com.tiimi1.todo_app" android:installLocation="preferExternal">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="3" android:versionName="1.3" package="com.tiimi1.todo_app" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />