Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
id("com.android.application")
kotlin("android")
kotlin("android.extensions")
id("org.jmailen.kotlinter")
//id("com.banno.gordon") version "localVersion"
}
Expand All @@ -25,13 +24,6 @@ repositories {
}

dependencies {
implementation(kotlin("stdlib-jdk7"))

implementation("androidx.appcompat:appcompat:1.2.0")
implementation("androidx.core:core-ktx:1.3.1")
implementation("androidx.constraintlayout:constraintlayout:1.1.3")
implementation("com.google.android.material:material:1.2.0")

androidTestImplementation("androidx.test:runner:1.2.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.banno.android.gordontest

import org.junit.Assert
import org.junit.Assume
import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
Expand All @@ -21,11 +20,10 @@ class ParameterizedTest(private val parameter: Any) {
}
}

@Test fun parameterizedA() = Assert.assertEquals(1, 1)
@Test fun parameterizedB() = Assume.assumeTrue(1 == parameter)
@Test fun parameterizedC() = Assert.assertTrue(1 == parameter)
@Test fun parameterizedPass() = Assert.assertEquals(1, 1)
@Test fun parameterizedFail() = Assert.assertEquals(1, parameter)

@Ignore
@Test
fun parameterizedD() = Assert.assertEquals(1, 1)
fun parameterizedIgnore() = Assert.assertEquals(1, 1)
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ class StandardTest {

@Ignore
@Test
fun standardC() = Assert.assertEquals(1, 1)
fun standardIgnore() = Assert.assertEquals(1, 1)
}
26 changes: 12 additions & 14 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.banno.android.gordontest">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:icon="@android:mipmap/sym_def_app_icon"
android:label="GordonTest"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">

<category android:name="android.intent.category.LAUNCHER" />
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>

</application>

</manifest>
</manifest>
27 changes: 0 additions & 27 deletions app/src/main/java/com/banno/android/gordontest/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,39 +1,12 @@
package com.banno.android.gordontest

import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.activity_main.fab
import kotlinx.android.synthetic.main.activity_main.toolbar

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()
}
}

override fun onCreateOptionsMenu(menu: Menu): Boolean {
// Inflate the menu; this adds items to the action bar if it is present.
menuInflater.inflate(R.menu.menu_main, menu)
return true
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
return when (item.itemId) {
R.id.action_settings -> true
else -> super.onOptionsItemSelected(item)
}
}
}
34 changes: 0 additions & 34 deletions app/src/main/res/drawable-v24/ic_launcher_foreground.xml

This file was deleted.

170 changes: 0 additions & 170 deletions app/src/main/res/drawable/ic_launcher_background.xml

This file was deleted.

Loading