unitTests() changed to unitTests

EmiliaZorin · Jun 7, 2020 · 2ecfc86 · 2ecfc86
1 parent 969e75a
commit 2ecfc86
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,7 +30,7 @@ android {
 
     testOptions {
         unitTests.all {
-            unitTests()
+            unitTests
         }
     }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         android:roundIcon="@mipmap/app_logo2_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <!-- MAIN ACTIVITY -->
+        <activity android:name=".utilities.EntranceDialog"></activity>
+        <activity android:name=".utilities.PopupEntranceWindow" /> <!-- MAIN ACTIVITY -->
         <activity
             android:name=".utilities.SplashScreenActivity"
             android:launchMode="singleTop"
@@ -29,7 +30,6 @@
             android:name=".map_profile.profile.WatchProfile"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.NoActionBar" />
-
         <activity
             android:name=".settings.SettingsActivity"
             android:launchMode="singleTop"
@@ -42,7 +42,6 @@
             android:name=".credits.EditCreditActivity"
             android:launchMode="singleTop"
             android:parentActivityName=".map_profile.maps.MapActivity" />
-
         <activity
             android:name=".settings.admin.UsersListActivity"
             android:launchMode="singleTop" /> <!-- Login, Register, Reset/Change password -->

diff --git a/app/src/main/java/com/evan/parknbark/map_profile/profile/WatchProfile.java b/app/src/main/java/com/evan/parknbark/map_profile/profile/WatchProfile.java
@@ -254,6 +254,7 @@ public boolean onMenuItemClick(MenuItem item) {
                 String age = mEditTextDogAge.getText().toString();
                 String breed = mEditTextDogBreed.getText().toString();
                 saveProfile(name, breed, age);
+                user.setBuiltProfile(true);
                 hiddenItem = false;
                 hideItemInsideToolbar();
                 mButtonUploadPic.setVisibility(View.INVISIBLE);

diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
@@ -7,7 +7,8 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     tools:context=".map_profile.maps.MapActivity"
-    tools:openDrawer="start">
+    tools:openDrawer="start"
+    >
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/mipmap-hdpi/dog1.jpg b/app/src/main/res/mipmap-hdpi/dog1.jpg
diff --git a/app/src/main/res/mipmap-hdpi/dog2.jpg b/app/src/main/res/mipmap-hdpi/dog2.jpg
diff --git a/app/src/main/res/mipmap-hdpi/dog31.jpg b/app/src/main/res/mipmap-hdpi/dog31.jpg
diff --git a/app/src/main/res/mipmap-hdpi/dog_in_frame.png b/app/src/main/res/mipmap-hdpi/dog_in_frame.png
diff --git a/app/src/main/res/mipmap-hdpi/entrance_dog_pic.png b/app/src/main/res/mipmap-hdpi/entrance_dog_pic.png
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "de.mannodermaus.gradle.plugins:android-junit5:1.3.2.0"