diff --git a/SprintChallenge/.gitignore b/SprintChallenge/.gitignore new file mode 100644 index 0000000..fd45b12 --- /dev/null +++ b/SprintChallenge/.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/SprintChallenge/.idea/codeStyles/Project.xml b/SprintChallenge/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/SprintChallenge/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SprintChallenge/.idea/dictionaries/charles.xml b/SprintChallenge/.idea/dictionaries/charles.xml new file mode 100644 index 0000000..90bc1c1 --- /dev/null +++ b/SprintChallenge/.idea/dictionaries/charles.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/SprintChallenge/.idea/externalDependencies.xml b/SprintChallenge/.idea/externalDependencies.xml new file mode 100644 index 0000000..180eacb --- /dev/null +++ b/SprintChallenge/.idea/externalDependencies.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SprintChallenge/.idea/gradle.xml b/SprintChallenge/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/SprintChallenge/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/SprintChallenge/.idea/misc.xml b/SprintChallenge/.idea/misc.xml new file mode 100644 index 0000000..e0d5b93 --- /dev/null +++ b/SprintChallenge/.idea/misc.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/SprintChallenge/.idea/runConfigurations.xml b/SprintChallenge/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/SprintChallenge/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/SprintChallenge/.idea/vcs.xml b/SprintChallenge/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/SprintChallenge/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SprintChallenge/app/.gitignore b/SprintChallenge/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/SprintChallenge/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/SprintChallenge/app/build.gradle b/SprintChallenge/app/build.gradle new file mode 100644 index 0000000..e05046a --- /dev/null +++ b/SprintChallenge/app/build.gradle @@ -0,0 +1,30 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "com.thadocizn.sprintchallenge" + minSdkVersion 15 + 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' + implementation 'android.arch.lifecycle:extensions:1.1.1' + implementation 'android.arch.lifecycle:viewmodel:1.1.1' +} diff --git a/SprintChallenge/app/proguard-rules.pro b/SprintChallenge/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/SprintChallenge/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/SprintChallenge/app/src/androidTest/java/com/thadocizn/sprintchallenge/ExampleInstrumentedTest.java b/SprintChallenge/app/src/androidTest/java/com/thadocizn/sprintchallenge/ExampleInstrumentedTest.java new file mode 100644 index 0000000..21397a7 --- /dev/null +++ b/SprintChallenge/app/src/androidTest/java/com/thadocizn/sprintchallenge/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.thadocizn.sprintchallenge; + +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.thadocizn.sprintchallenge", appContext.getPackageName()); + } +} diff --git a/SprintChallenge/app/src/main/AndroidManifest.xml b/SprintChallenge/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f360ae9 --- /dev/null +++ b/SprintChallenge/app/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/EditActivity.java b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/EditActivity.java new file mode 100644 index 0000000..5a4d1c4 --- /dev/null +++ b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/EditActivity.java @@ -0,0 +1,90 @@ +package com.thadocizn.sprintchallenge; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.EditText; +import android.widget.ToggleButton; + +import com.thadocizn.sprintchallenge.viewModel.MovieViewModel; + +public class EditActivity extends AppCompatActivity { + public static final String TAG = EditActivity.class.getSimpleName(); + public static final String EDIT_MOVIE_KEY = "edit_movie"; + public static final String WATCHED_MOVIE = "watched_movie"; + + private MovieViewModel viewModel; + + + EditText editMovie; + Movie movie; + Context context; + ToggleButton toggleButton; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_edit); + + movie = (Movie)getIntent().getSerializableExtra(EDIT_MOVIE_KEY); + + editMovie = findViewById(R.id.editMovie); + context = this; + toggleButton = findViewById(R.id.checkBoxWatchedMovie); + + findViewById(R.id.buttonDelete).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent resultIntent = new Intent(); + resultIntent.putExtra(EDIT_MOVIE_KEY, movie); + setResult(Activity.RESULT_CANCELED, resultIntent); + finish(); + } + }); + + findViewById(R.id.buttonSave).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + prepResult(); + } + }); + + + if (movie == null){ + movie = new Movie(Movie.NO_ID); + } + editMovie.setText(movie.getMovieName()); + toggleButton.setChecked(movie.isWatched()); + + } + + private void prepResult() { + movie.setMovieName(editMovie.getText().toString()); + movie.setWatched(toggleButton.isChecked()); + Intent resultIntent = new Intent(); + resultIntent.putExtra(EDIT_MOVIE_KEY, movie); + setResult(Activity.RESULT_OK, resultIntent); + finish(); + + } + + @Override + protected void onPause() { + super.onPause(); + prepResult(); + } + + @Override + public void onBackPressed() { + prepResult(); + super.onBackPressed(); + + } +} diff --git a/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/ListActivity.java b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/ListActivity.java new file mode 100644 index 0000000..b0a0d37 --- /dev/null +++ b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/ListActivity.java @@ -0,0 +1,115 @@ +package com.thadocizn.sprintchallenge; + +import android.app.Activity; +import android.arch.lifecycle.Observer; +import android.arch.lifecycle.ViewModelProviders; +import android.content.Context; +import android.content.Intent; +import android.graphics.Color; +import android.graphics.Paint; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.thadocizn.sprintchallenge.viewModel.MovieViewModel; + +import java.util.ArrayList; + +public class ListActivity extends AppCompatActivity { + + private Context context; + private LinearLayout listLayout; + private MovieViewModel viewModel; + Movie movie; + Boolean bool = false; + TextView textView; + + public static final int EDIT_REQUEST_CODE = 1; + public static final int DELETE_RESULT_CODE = 2; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_list); + + context = this; + listLayout = findViewById(R.id.listItem); + viewModel = ViewModelProviders.of(this).get(MovieViewModel.class); + + final Observer> observer = new Observer>() { + @Override + public void onChanged(@Nullable ArrayList movies) { + if (movies != null) { + refreshListView(movies); + } + } + }; + viewModel.getMovieList().observe(this, observer); + + findViewById(R.id.buttonAddMovie).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(context, EditActivity.class); + Movie newMovie = new Movie(Movie.NO_ID); + intent.putExtra(EditActivity.EDIT_MOVIE_KEY, newMovie); + startActivityForResult(intent, EDIT_REQUEST_CODE); + + } + }); + + } + private void refreshListView(ArrayList movies) { + listLayout.removeAllViews(); + for (Movie movie : movies) { + listLayout.addView(getDefaultTextView(movie)); + } + } + private TextView getDefaultTextView(final Movie movie) { + + + textView = new TextView(context); + textView.setText(movie.getMovieName()); + if (movie.isWatched()){ + textView.setTextColor(Color.BLUE); + textView.setPaintFlags(textView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); + } + textView.setTextSize(24); + textView.setPadding(10, 10, 10, 10); + textView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + Intent intent = new Intent(context, EditActivity.class); + intent.putExtra(EditActivity.EDIT_MOVIE_KEY, movie); + startActivityForResult(intent, EDIT_REQUEST_CODE); + } + }); + + return textView; + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + + if (resultCode == Activity.RESULT_OK) { + if (requestCode == EDIT_REQUEST_CODE) { + if (data != null) { + Movie returnedMovie = (Movie) data.getSerializableExtra(EditActivity.EDIT_MOVIE_KEY); + + viewModel.addMovie(returnedMovie); + } + } + } + else { + if (data != null) { + Movie returnMovie = (Movie) data.getSerializableExtra(EditActivity.EDIT_MOVIE_KEY); + viewModel.deleteMovie(returnMovie); + } + } +}} diff --git a/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/Movie.java b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/Movie.java new file mode 100644 index 0000000..cc3493d --- /dev/null +++ b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/Movie.java @@ -0,0 +1,47 @@ +package com.thadocizn.sprintchallenge; + +import java.io.Serializable; + +public class Movie implements Serializable { + + public static final int NO_ID = -1; + + private boolean watched; + private String movieName; + private int id; + + public Movie(int id) { + this.id = id; + } + + public Movie(String movieName, int id, boolean watched) { + + this.movieName = movieName; + this.id = id; + this.watched = watched; + } + + public boolean isWatched() { + return watched; + } + + public void setWatched(boolean watched) { + this.watched = watched; + } + + public String getMovieName() { + return movieName; + } + + public void setMovieName(String movieName) { + this.movieName = movieName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } +} diff --git a/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/repo/MovieViewRepository.java b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/repo/MovieViewRepository.java new file mode 100644 index 0000000..0769548 --- /dev/null +++ b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/repo/MovieViewRepository.java @@ -0,0 +1,42 @@ +package com.thadocizn.sprintchallenge.repo; + +import android.arch.lifecycle.MutableLiveData; + +import com.thadocizn.sprintchallenge.Movie; + +import java.util.ArrayList; + +public class MovieViewRepository { + private ArrayList movies; + + public MovieViewRepository() { + this.movies = new ArrayList<>(); + } + public MutableLiveData> getMovies(){ + MutableLiveData> liveDataList = new MutableLiveData<>(); + liveDataList.setValue(movies); + return liveDataList; + } + public ArrayList addMovie(Movie movie){ + + if (movie.getId() == Movie.NO_ID){ + int index = movies.size(); + movie.setId(index); + movies.add(movie); + + }else { + movies.set(movie.getId(), movie); + } + return movies; + } + public ArrayList deleteMovie(Movie movie){ + + for (int i = 0; i < movies.size(); i++) { + if (movies.get(i).getId() == movie.getId()) { + movies.remove(i); + } + } + return movies; + } + +} diff --git a/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/viewModel/MovieViewModel.java b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/viewModel/MovieViewModel.java new file mode 100644 index 0000000..205a99e --- /dev/null +++ b/SprintChallenge/app/src/main/java/com/thadocizn/sprintchallenge/viewModel/MovieViewModel.java @@ -0,0 +1,42 @@ +package com.thadocizn.sprintchallenge.viewModel; + +import android.arch.lifecycle.LiveData; +import android.arch.lifecycle.MutableLiveData; +import android.arch.lifecycle.ViewModel; + +import com.thadocizn.sprintchallenge.Movie; +import com.thadocizn.sprintchallenge.repo.MovieViewRepository; + +import java.util.ArrayList; + + +public class MovieViewModel extends ViewModel { + + private MutableLiveData> movieList; + private MovieViewRepository repo; + public LiveData> getMovieList(){ + if (movieList == null){ + + loadList(); + } + return movieList; + } + + private void loadList(){ + repo = new MovieViewRepository(); + movieList = repo.getMovies(); + } + + public void addMovie(Movie movie){ + if (movieList != null){ + movieList.setValue(repo.addMovie(movie)); + } + } + + public void deleteMovie(Movie movie){ + if (movieList != null){ + movieList.setValue(repo.deleteMovie(movie)); + } + } + +} diff --git a/SprintChallenge/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/SprintChallenge/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/SprintChallenge/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/SprintChallenge/app/src/main/res/drawable/ic_launcher_background.xml b/SprintChallenge/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/SprintChallenge/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SprintChallenge/app/src/main/res/layout/activity_edit.xml b/SprintChallenge/app/src/main/res/layout/activity_edit.xml new file mode 100644 index 0000000..d7767bf --- /dev/null +++ b/SprintChallenge/app/src/main/res/layout/activity_edit.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + +