diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2b75303 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild 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 diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..2996d53 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..37a7509 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ 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/README.md b/README.md index f16e800..e02da09 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +Spencer Stock test + # Android_Sprint1_Challenge ## Introduction 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..c298c1b --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "com.example.movielist" + minSdkVersion 21 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.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/movielist/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/movielist/ExampleInstrumentedTest.java new file mode 100644 index 0000000..e8583f0 --- /dev/null +++ b/app/src/androidTest/java/com/example/movielist/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.example.movielist; + +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.movielist", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..384e0a9 --- /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/movielist/DetailsView.java b/app/src/main/java/com/example/movielist/DetailsView.java new file mode 100644 index 0000000..4307ab7 --- /dev/null +++ b/app/src/main/java/com/example/movielist/DetailsView.java @@ -0,0 +1,77 @@ +package com.example.movielist; + +import android.content.Context; +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Switch; + +import java.util.ArrayList; + +public class DetailsView extends AppCompatActivity { + ArrayList movieList; + Context context; + int index; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_details_view); + context = this; + + Button buttonSave = findViewById(R.id.button_save); + Button buttonDelete = findViewById(R.id.button_delete); + final Switch switchWatched = findViewById(R.id.switch_watched); + final EditText editTextTitle = findViewById(R.id.edit_text_title); + + Intent intent = getIntent(); + movieList = (ArrayList)intent.getSerializableExtra("movieList"); + //checks if you came here by way of the list, or the button + final int index = (int) intent.getSerializableExtra("index"); + if (index != -1) { + MovieData temp = movieList.get(index); + + //populating view if you came here via list + editTextTitle.setText(temp.getTitle()); + switchWatched.setChecked(temp.isWatched()); + } + + + + + buttonSave.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + MovieData temp; + temp = new MovieData( + editTextTitle.getText().toString(), + switchWatched.isChecked(), + movieList.size() + ); + if (index != -1) { //execute if it's a previously saved movie + movieList.set(index,temp); + } + else { //execute if it's a new movie + movieList.add(temp); + } + Intent intent = new Intent(context, MainActivity.class); + intent.putExtra("movieList", movieList); + startActivity(intent); + } + }); + buttonDelete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (index != -1){ + movieList.remove(index); + } + Intent intent = new Intent(context, MainActivity.class); + intent.putExtra("movieList", movieList); + startActivity(intent); + } + }); + } +} diff --git a/app/src/main/java/com/example/movielist/MainActivity.java b/app/src/main/java/com/example/movielist/MainActivity.java new file mode 100644 index 0000000..fede87f --- /dev/null +++ b/app/src/main/java/com/example/movielist/MainActivity.java @@ -0,0 +1,73 @@ +package com.example.movielist; + +import android.content.Context; +import android.content.Intent; +import android.graphics.Typeface; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.TextView; + +import java.util.ArrayList; + +public class MainActivity extends AppCompatActivity { + + ArrayList movieList = new ArrayList<>(); + Context context; + int index = -1; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + context = this; + + Intent intent = getIntent(); + if ((intent.getSerializableExtra("movieList") != null)) { + movieList = (ArrayList) intent.getSerializableExtra("movieList"); + } + + //TextView Generation + for (int i = 0; i < movieList.size(); ++i){ + MovieData temp = movieList.get(i); + LinearLayout linearLayout = findViewById(R.id.linear_layout_parent); + linearLayout.addView(textViewGenerator(temp.getTitle(),temp.isWatched(), i)); + } + + Button addMovie = findViewById(R.id.button_add_movie); + //Add Movie's Onclick Listener + addMovie.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(context, DetailsView.class); + intent.putExtra("movieList", movieList); + intent.putExtra("index", index); + startActivity(intent); + } + }); + + + } + + private TextView textViewGenerator(String title, boolean watched, final int index) { + TextView tv = new TextView(context); + tv.setText(title); + if (!watched) { + tv.setTypeface(Typeface.DEFAULT_BOLD); + } + + //Each Listed Item's onClick Listener + tv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(context, DetailsView.class); + intent.putExtra("movieList", movieList); + intent.putExtra("index", index); + startActivity(intent); + } + }); + return tv; + } +} diff --git a/app/src/main/java/com/example/movielist/MovieData.java b/app/src/main/java/com/example/movielist/MovieData.java new file mode 100644 index 0000000..7bebf41 --- /dev/null +++ b/app/src/main/java/com/example/movielist/MovieData.java @@ -0,0 +1,38 @@ +package com.example.movielist; + +import java.io.Serializable; + + +//Didn't utilize in this class, since it is just the index when the object is created, so 2 objects can have matching indices +public class MovieData implements Serializable { + private String title; + private boolean watched; + private int index; + + public MovieData(String title, boolean watched, int index) { + this.title = title; + this.watched = watched; + this.index = index; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public boolean isWatched() { + return watched; + } + + public void setWatched(boolean watched) { + this.watched = watched; + } + + public int getIndex() { + return index; + } + +} 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_details_view.xml b/app/src/main/res/layout/activity_details_view.xml new file mode 100644 index 0000000..3d5f6ad --- /dev/null +++ b/app/src/main/res/layout/activity_details_view.xml @@ -0,0 +1,34 @@ + + + + + +