From 9dcad984b12c50a1160cea1d05a99a4f92ed76ad Mon Sep 17 00:00:00 2001 From: Carlos Martinez Date: Tue, 15 Jun 2021 19:51:44 -0400 Subject: [PATCH 1/3] Remove: unused files and ignore idea settings --- .gitignore | 2 ++ .idea/.gitignore | 3 -- .idea/compiler.xml | 6 ---- .idea/gradle.xml | 19 ------------ .idea/jarRepositories.xml | 30 ------------------- .idea/misc.xml | 9 ------ .idea/runConfigurations.xml | 10 ------- .../acronyms/ExampleInstrumentedTest.kt | 24 --------------- .../dev/carlos/acronyms/ExampleUnitTest.kt | 17 ----------- 9 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 app/src/androidTest/java/dev/carlos/acronyms/ExampleInstrumentedTest.kt delete mode 100644 app/src/test/java/dev/carlos/acronyms/ExampleUnitTest.kt diff --git a/.gitignore b/.gitignore index aa724b7..f1463f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ *.iml .gradle /local.properties +.idea +/.idea/* /.idea/caches /.idea/libraries /.idea/modules.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 440480e..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 0380d8d..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 860da66..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/androidTest/java/dev/carlos/acronyms/ExampleInstrumentedTest.kt b/app/src/androidTest/java/dev/carlos/acronyms/ExampleInstrumentedTest.kt deleted file mode 100644 index b73d727..0000000 --- a/app/src/androidTest/java/dev/carlos/acronyms/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package dev.carlos.acronyms - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("dev.carlos.acronyms", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/test/java/dev/carlos/acronyms/ExampleUnitTest.kt b/app/src/test/java/dev/carlos/acronyms/ExampleUnitTest.kt deleted file mode 100644 index f8091ea..0000000 --- a/app/src/test/java/dev/carlos/acronyms/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package dev.carlos.acronyms - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file From 35defd1eef166aed530bd0292878d5b576aae951 Mon Sep 17 00:00:00 2001 From: Carlos Martinez Date: Tue, 15 Jun 2021 19:55:31 -0400 Subject: [PATCH 2/3] Add: PR template and missing EOF new lines --- .github/pull_request_template.md | 5 +++++ app/src/main/AndroidManifest.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 2 +- build.gradle | 2 +- gradle.properties | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..deb1316 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,5 @@ +## Summary + +## Changes + +## Screenshots diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7fd5b30..c8fbed8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,4 +12,4 @@ android:theme="@style/Theme.Acronyms" /> - \ No newline at end of file + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 09837df..758655a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,4 @@ #FF018786 #FF000000 #FFFFFFFF - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 63f7d24..4474212 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ Acronyms - \ No newline at end of file + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index a6cea39..95915a6 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/build.gradle b/build.gradle index 360bf37..41df201 100644 --- a/build.gradle +++ b/build.gradle @@ -24,4 +24,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 2521752..f20a521 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official From 619e2ea7c67557c3edeef60f2acab0678a533ee8 Mon Sep 17 00:00:00 2001 From: Carlos Martinez Date: Tue, 15 Jun 2021 19:59:59 -0400 Subject: [PATCH 3/3] Change: PR template --- .github/pull_request_template.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index deb1316..2393013 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,11 @@ ## Summary +As a developer I want to ## Changes +- +- ## Screenshots +|Screenshot| +|---| +||