diff --git a/app/build.gradle b/app/build.gradle index de58543..6c79007 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,14 +21,25 @@ android { } } + //https://developer.android.com/training/testing/set-up-project +// useLibrary 'android.test.runner' +// useLibrary 'android.test.base' +// useLibrary 'android.test.mock' + } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.android.support:appcompat-v7:28.0.0-rc02' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.android.support:design:28.0.0-rc02' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test:rules:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2' + } diff --git a/app/src/androidTest/java/cz/josefadamcik/activityjournal/MainActivityTest.kt b/app/src/androidTest/java/cz/josefadamcik/activityjournal/MainActivityTest.kt new file mode 100644 index 0000000..8d6c19d --- /dev/null +++ b/app/src/androidTest/java/cz/josefadamcik/activityjournal/MainActivityTest.kt @@ -0,0 +1,30 @@ +package cz.josefadamcik.activityjournal + +import android.support.test.espresso.Espresso.onView +import android.support.test.espresso.assertion.ViewAssertions.matches + +import android.support.test.espresso.matcher.ViewMatchers.* +import android.support.test.filters.LargeTest +import android.support.test.rule.ActivityTestRule +import android.support.test.runner.AndroidJUnit4 +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + + +@RunWith(AndroidJUnit4::class) +@LargeTest +class MainActivityTest { + @Rule + @JvmField + var activityRule: ActivityTestRule = ActivityTestRule(MainActivity::class.java) + + @Test + fun applicationStart_activityDisplays() { + onView(withId(R.id.fab)) + .check(matches(isDisplayed())) + onView(withId(R.id.toolbar)) + .check(matches(isDisplayed())) + } + +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 01e90bd..135d9cf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,3 +1,4 @@ + @@ -7,5 +8,17 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"/> - + android:theme="@style/AppTheme"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/cz/josefadamcik/activityjournal/MainActivity.kt b/app/src/main/java/cz/josefadamcik/activityjournal/MainActivity.kt new file mode 100644 index 0000000..8e8a033 --- /dev/null +++ b/app/src/main/java/cz/josefadamcik/activityjournal/MainActivity.kt @@ -0,0 +1,22 @@ +package cz.josefadamcik.activityjournal + +import android.os.Bundle +import android.support.design.widget.Snackbar +import android.support.v7.app.AppCompatActivity; + +import kotlinx.android.synthetic.main.activity_main.* + +class MainActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + setSupportActionBar(toolbar) + + fab.setOnClickListener { view -> + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show() + } + } + +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..87851cb --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml new file mode 100644 index 0000000..d8b962d --- /dev/null +++ b/app/src/main/res/layout/content_main.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..59a0b0c --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,3 @@ + + 16dp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7078a4a..713f176 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ ActivityJournal + MainActivity diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5885930..177cefc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,4 +8,13 @@ @color/colorAccent + + +