From 35a7673088298c86d758c1c02242371704c677f1 Mon Sep 17 00:00:00 2001
From: bordasb <bordasb@uni.coventry.ac.uk>
Date: Sat, 29 Jun 2019 13:49:15 +0100
Subject: [PATCH] migrated to androidx

---
 app/src/main/java/com/boba/runassistant/MainActivity.java | 2 +-
 app/src/main/res/layout/activity_main.xml                 | 8 +++++++-
 app/src/main/res/values/strings.xml                       | 3 ++-
 gradle.properties                                         | 3 ++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/boba/runassistant/MainActivity.java b/app/src/main/java/com/boba/runassistant/MainActivity.java
index debe032..db9581b 100644
--- a/app/src/main/java/com/boba/runassistant/MainActivity.java
+++ b/app/src/main/java/com/boba/runassistant/MainActivity.java
@@ -1,6 +1,6 @@
 package com.boba.runassistant;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 public class MainActivity extends AppCompatActivity {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6a3e676..761f4f3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
 		android:id="@+id/textView"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:text="@string/chooseTypeNotif" />
+		android:text="@string/chooseTypeNotification" />
 
 	<RadioGroup
 		android:layout_width="match_parent"
@@ -37,4 +37,10 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/startRunning" />
+
+	<Button
+		android:id="@+id/buttonCheckPrevious"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/checkPrevious" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7ba15f..86d8fe8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,9 @@
 <resources>
 	<string name="app_name">Run Assistant</string>
 
-	<string name="chooseTypeNotif">Please select type of running activity:</string>
+	<string name="chooseTypeNotification">Please select type of running activity:</string>
 	<string name="startRunning">Start running</string>
 	<string name="indoor">Indoor running</string>
 	<string name="outdoor">Outdoor running</string>
+	<string name="checkPrevious">Check previous activities</string>
 </resources>
diff --git a/gradle.properties b/gradle.properties
index 82618ce..5cd40bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,5 +11,6 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
+android.useAndroidX=true
+android.enableJetifier=true