diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 35ffc65..526b4c2 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,6 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index 6199cc2..237ba08 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle index 08f9f82..cf22e62 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 31 - buildToolsVersion "30.0.1" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.example.simpleparadox.listycity" - minSdkVersion 15 - targetSdkVersion 31 + minSdkVersion 16 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -21,7 +21,6 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } - packagingOptions { exclude 'META-INF/LICENSE.md' exclude 'META-INF/DEPENDENCIES' @@ -40,10 +39,12 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.3.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test:rules:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.3.1' } diff --git a/app/src/androidTest/java/com/example/simpleparadox/listycity/MainActivityTest.java b/app/src/androidTest/java/com/example/simpleparadox/listycity/MainActivityTest.java index 918a8b1..a8633f6 100644 --- a/app/src/androidTest/java/com/example/simpleparadox/listycity/MainActivityTest.java +++ b/app/src/androidTest/java/com/example/simpleparadox/listycity/MainActivityTest.java @@ -91,6 +91,15 @@ public void checkCiyListItem(){ assertEquals("Edmonton", city); } + /** + * switching between activities + */ + @Test + public void switchactivities(){ + solo.clickOnButton("Show Activity"); + solo.clickOnButton("Main Activity"); + } + /** * Close activity after each test * @throws Exception diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7c22486..2d31c26 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + diff --git a/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java b/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java index 86e614c..7ff48f2 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java @@ -2,6 +2,7 @@ import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.util.SparseBooleanArray; @@ -71,6 +72,14 @@ public void onClick(View v) { } }); + final Button showact = findViewById(R.id.gotoshowactivity); + showact.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(MainActivity.this, ShowActivity.class); + startActivity(intent); + } + }); + } diff --git a/app/src/main/java/com/example/simpleparadox/listycity/ShowActivity.java b/app/src/main/java/com/example/simpleparadox/listycity/ShowActivity.java new file mode 100644 index 0000000..c62a9d3 --- /dev/null +++ b/app/src/main/java/com/example/simpleparadox/listycity/ShowActivity.java @@ -0,0 +1,25 @@ +package com.example.simpleparadox.listycity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +public class ShowActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_show); + + final Button mainact = findViewById(R.id.gotomainactivity); + mainact.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(ShowActivity.this, MainActivity.class); + startActivity(intent); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4abdba2..c62d0eb 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,13 +5,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".MainActivity"> + tools:context=".MainActivity" + android:layout_margin="10dp"> - + android:orientation="vertical"> + + + + + + + + \ No newline at end of file