From 14e473cc9942c392afe9d62341acf785d67263c8 Mon Sep 17 00:00:00 2001 From: Patrick Martin Date: Fri, 9 Nov 2018 11:04:18 -0800 Subject: [PATCH 01/10] first run of spring challenge --- .idea/codeStyles/Project.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file From 8784d0f7a3449545745375e5bacf631c8dea8240 Mon Sep 17 00:00:00 2001 From: Patrick Martin Date: Fri, 9 Nov 2018 11:05:35 -0800 Subject: [PATCH 02/10] first run of spring challenge --- .gitignore | 11 ++ .idea/gradle.xml | 18 ++ .idea/misc.xml | 38 ++++ .idea/runConfigurations.xml | 12 ++ .idea/vcs.xml | 6 + app/.gitignore | 1 + app/build.gradle | 28 +++ app/proguard-rules.pro | 21 +++ .../ExampleInstrumentedTest.java | 26 +++ app/src/main/AndroidManifest.xml | 22 +++ .../android_sprint1_challenge/AddDetails.java | 27 +++ .../MainActivity.java | 41 +++++ .../android_sprint1_challenge/Movie.java | 4 + .../android_sprint1_challenge/MovieRepo.java | 4 + .../MoviesViewModel.java | 4 + .../drawable-v24/ic_launcher_foreground.xml | 34 ++++ .../res/drawable/ic_launcher_background.xml | 170 +++++++++++++++++ .../main/res/layout/activity_add_details.xml | 57 ++++++ app/src/main/res/layout/activity_main.xml | 34 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2963 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4905 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2060 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2783 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4490 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6895 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 6387 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10413 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 9128 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 15132 bytes app/src/main/res/values/colors.xml | 6 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/styles.xml | 11 ++ .../ExampleUnitTest.java | 17 ++ build.gradle | 27 +++ gradle.properties | 15 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 ++++++++++++++++++ gradlew.bat | 84 +++++++++ settings.gradle | 1 + 42 files changed, 909 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 app/.gitignore create mode 100644 app/build.gradle create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/com/example/patrickjmartin/android_sprint1_challenge/ExampleInstrumentedTest.java create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/AddDetails.java create mode 100644 app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MainActivity.java create mode 100644 app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/Movie.java create mode 100644 app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MovieRepo.java create mode 100644 app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MoviesViewModel.java create mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/layout/activity_add_details.xml create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/styles.xml create mode 100644 app/src/test/java/com/example/patrickjmartin/android_sprint1_challenge/ExampleUnitTest.java create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fd45b12 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.iml +.gradle +/local.properties +/.idea/caches/build_file_checksums.ser +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e0d5b93 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..cbc3d91 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "com.example.patrickjmartin.android_sprint1_challenge" + minSdkVersion 25 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/com/example/patrickjmartin/android_sprint1_challenge/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/patrickjmartin/android_sprint1_challenge/ExampleInstrumentedTest.java new file mode 100644 index 0000000..8ca6d7a --- /dev/null +++ b/app/src/androidTest/java/com/example/patrickjmartin/android_sprint1_challenge/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.example.patrickjmartin.android_sprint1_challenge; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.example.patrickjmartin.android_sprint1_challenge", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..9076999 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/AddDetails.java b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/AddDetails.java new file mode 100644 index 0000000..cb34142 --- /dev/null +++ b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/AddDetails.java @@ -0,0 +1,27 @@ +package com.example.patrickjmartin.android_sprint1_challenge; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.widget.EditText; + +public class AddDetails extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_add_details); + + EditText movieName = (EditText) findViewById(R.id.editText); + + + } + + @Override + protected void onResume() { + super.onResume(); + + Intent intent = getIntent(); + + } +} diff --git a/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MainActivity.java b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MainActivity.java new file mode 100644 index 0000000..dc6a958 --- /dev/null +++ b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MainActivity.java @@ -0,0 +1,41 @@ +package com.example.patrickjmartin.android_sprint1_challenge; + +import android.app.ActionBar; +import android.content.Context; +import android.content.Intent; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.TextView; + +public class MainActivity extends AppCompatActivity { + + Context context; + LinearLayout listLayout; + public static final int DETAILS_INSERT_CODE = 666; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + context = this; + listLayout = findViewById(R.id.linear_layout); + + findViewById(R.id.add_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent addDetailsActivityIntent = new Intent(context, AddDetails.class); + startActivityForResult(addDetailsActivityIntent, DETAILS_INSERT_CODE); + } + }); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + } +} diff --git a/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/Movie.java b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/Movie.java new file mode 100644 index 0000000..a51cb4c --- /dev/null +++ b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/Movie.java @@ -0,0 +1,4 @@ +package com.example.patrickjmartin.android_sprint1_challenge; + +public class Movie { +} diff --git a/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MovieRepo.java b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MovieRepo.java new file mode 100644 index 0000000..47822c7 --- /dev/null +++ b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MovieRepo.java @@ -0,0 +1,4 @@ +package com.example.patrickjmartin.android_sprint1_challenge; + +public class MovieRepo { +} diff --git a/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MoviesViewModel.java b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MoviesViewModel.java new file mode 100644 index 0000000..9837faf --- /dev/null +++ b/app/src/main/java/com/example/patrickjmartin/android_sprint1_challenge/MoviesViewModel.java @@ -0,0 +1,4 @@ +package com.example.patrickjmartin.android_sprint1_challenge; + +public class MoviesViewModel { +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_add_details.xml b/app/src/main/res/layout/activity_add_details.xml new file mode 100644 index 0000000..6783c4c --- /dev/null +++ b/app/src/main/res/layout/activity_add_details.xml @@ -0,0 +1,57 @@ + + + +