Merge

app/src/androidTest/java/com/h/pixeldroid/ProfileTest.kt

@@ -6,7 +6,6 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
 import org.hamcrest.Matchers.not
 
 import org.junit.Rule
@@ -16,8 +15,8 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class ProfileTest {
     @get:Rule
-    var activityRule: ActivityScenarioRule<MainActivity>
-            = ActivityScenarioRule(MainActivity::class.java)
+    var activityRule: ActivityScenarioRule<MainActivityMarie>
+            = ActivityScenarioRule(MainActivityMarie::class.java)
 
     @Test
     fun testFollowersTextView() {

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         android:theme="@style/AppTheme">
         <activity android:name=".PostActivity"></activity>
         <activity android:name=".ProfileActivity"></activity>
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivityMarie">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".MainActivityMarie">
 
     <TextView
         android:layout_width="wrap_content"