diff --git a/AdvancedAndroid_TeaTime.zip b/AdvancedAndroid_TeaTime.zip new file mode 100644 index 00000000..21b1b644 Binary files /dev/null and b/AdvancedAndroid_TeaTime.zip differ diff --git a/app/build.gradle b/app/build.gradle index d3d271dd..3823336c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 31 defaultConfig { applicationId "com.example.android.teatime" - minSdkVersion 16 - targetSdkVersion 25 + minSdkVersion 19 + targetSdkVersion 31 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,13 +19,13 @@ android { } dependencies { - compile 'com.android.support:design:25.1.0' - compile 'com.android.support:support-annotations:25.1.0' - compile 'com.google.android.gms:play-services-appindexing:9.8.0' - - // Testing-only dependencies - androidTestCompile 'com.android.support:support-annotations:25.1.0' - androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' - + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.annotation:annotation:1.3.0' + implementation 'com.google.firebase:firebase-appindexing:20.0.0' + //testing dependencies + androidTestImplementation 'androidx.annotation:annotation:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test:rules:1.4.0' } diff --git a/app/src/androidTest/java/com/example/android/teatime/OrderActivityBasicTest.java b/app/src/androidTest/java/com/example/android/teatime/OrderActivityBasicTest.java index 07fb8ea9..22a3129c 100644 --- a/app/src/androidTest/java/com/example/android/teatime/OrderActivityBasicTest.java +++ b/app/src/androidTest/java/com/example/android/teatime/OrderActivityBasicTest.java @@ -16,6 +16,15 @@ package com.example.android.teatime; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; + +import androidx.test.filters.LargeTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; @@ -37,7 +46,7 @@ @RunWith(AndroidJUnit4.class) public class OrderActivityBasicTest { - + /** * The ActivityTestRule is a rule provided by Android used for functional testing of a single * activity. The activity that will be tested will be launched before each test that's annotated @@ -45,10 +54,8 @@ public class OrderActivityBasicTest { * the test and methods annotated with @After are complete. This rule allows you to directly * access the activity during the test. */ - @Rule - public ActivityTestRule mActivityTestRule = - new ActivityTestRule<>(OrderActivity.class); + public ActivityTestRule mActivityTestRule = new ActivityTestRule<>(OrderActivity.class); @Test public void clickDecrementButton_ChangesQuantityAndCost() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 026e6268..d4208808 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,8 @@ android:theme="@style/AppTheme"> + android:screenOrientation="portrait" + android:exported="true"> diff --git a/app/src/main/java/com/example/android/teatime/MenuActivity.java b/app/src/main/java/com/example/android/teatime/MenuActivity.java index 57f09c96..30011ee9 100644 --- a/app/src/main/java/com/example/android/teatime/MenuActivity.java +++ b/app/src/main/java/com/example/android/teatime/MenuActivity.java @@ -18,8 +18,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.widget.AdapterView; import android.widget.GridView; diff --git a/app/src/main/java/com/example/android/teatime/OrderActivity.java b/app/src/main/java/com/example/android/teatime/OrderActivity.java index 64c77bf0..225a230d 100644 --- a/app/src/main/java/com/example/android/teatime/OrderActivity.java +++ b/app/src/main/java/com/example/android/teatime/OrderActivity.java @@ -18,8 +18,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; diff --git a/app/src/main/java/com/example/android/teatime/OrderSummaryActivity.java b/app/src/main/java/com/example/android/teatime/OrderSummaryActivity.java index fa28fbb9..cfec3e82 100644 --- a/app/src/main/java/com/example/android/teatime/OrderSummaryActivity.java +++ b/app/src/main/java/com/example/android/teatime/OrderSummaryActivity.java @@ -18,8 +18,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml index f86f0a78..bb811e79 100644 --- a/app/src/main/res/layout/activity_menu.xml +++ b/app/src/main/res/layout/activity_menu.xml @@ -18,7 +18,7 @@ android:layout_height="match_parent" android:background="@color/screenBackgroundGrey"> - - -