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/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..2946221 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "com.jakeesveld.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-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/jakeesveld/android_sprint1_challenge/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/jakeesveld/android_sprint1_challenge/ExampleInstrumentedTest.java new file mode 100644 index 0000000..17ec2de --- /dev/null +++ b/app/src/androidTest/java/com/jakeesveld/android_sprint1_challenge/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.jakeesveld.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.jakeesveld.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..eb3ed57 --- /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/jakeesveld/android_sprint1_challenge/EditActivity.java b/app/src/main/java/com/jakeesveld/android_sprint1_challenge/EditActivity.java new file mode 100644 index 0000000..979aa71 --- /dev/null +++ b/app/src/main/java/com/jakeesveld/android_sprint1_challenge/EditActivity.java @@ -0,0 +1,112 @@ +package com.jakeesveld.android_sprint1_challenge; + +import android.content.Context; +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.widget.Button; +import android.widget.CompoundButton; +import android.widget.EditText; +import android.widget.Switch; + +public class EditActivity extends AppCompatActivity { + + Button buttonDelete; + Button buttonAdd; + EditText textEditTitle; + Switch switchWatched; + Boolean isWatched; + Context context; + public final int MOVIE_REQUEST_CODE = 1; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_edit); + final Intent intent = getIntent(); + final Movies newMovie = (Movies) intent.getSerializableExtra("movie"); + + buttonAdd = findViewById(R.id.button_add); + buttonDelete = findViewById(R.id.button_delete); + textEditTitle = findViewById(R.id.text_edit_title); + switchWatched = findViewById(R.id.switch_watched); + context = this; + isWatched = false; + + + + if (newMovie.getTitle() != ""){ + textEditTitle.setText(newMovie.getTitle()); + } + + textEditTitle.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + newMovie.setTitle(textEditTitle.getText().toString()); + } + }); + + switchWatched.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (isChecked){ + newMovie.setWatched(true); + }else{ + newMovie.setWatched(false); + } + } + }); + + if (newMovie.getWatched()){ + switchWatched.setChecked(true); + } + + + + buttonAdd.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + intent.putExtra("movie", newMovie); + intent.putExtra("add", true); + setResult(RESULT_OK, intent); + finish(); + } + }); + + buttonDelete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + intent.putExtra("movie", newMovie); + intent.putExtra("add", false); + setResult(RESULT_OK, intent); + finish(); + + } + }); + } + + + @Override + protected void onStart() { + super.onStart(); + } + + @Override + protected void onStop() { + super.onStop(); + + } +} diff --git a/app/src/main/java/com/jakeesveld/android_sprint1_challenge/ListActivity.java b/app/src/main/java/com/jakeesveld/android_sprint1_challenge/ListActivity.java new file mode 100644 index 0000000..62a4521 --- /dev/null +++ b/app/src/main/java/com/jakeesveld/android_sprint1_challenge/ListActivity.java @@ -0,0 +1,92 @@ +package com.jakeesveld.android_sprint1_challenge; + +import android.content.Context; +import android.content.Intent; +import android.graphics.Movie; +import android.graphics.Paint; +import android.support.annotation.Nullable; +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 ListActivity extends AppCompatActivity { + + public static final int EDIT_MOVIE_REQUEST_CODE = 2; + LinearLayout layoutList; + Button buttonAdd; + Context context; + public final int MOVIE_REQUEST_CODE = 1; + static int id = 0; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + layoutList = findViewById(R.id.layout_list); + buttonAdd = findViewById(R.id.button_add); + context = this; + + buttonAdd.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(context, EditActivity.class); + Movies movie = new Movies(id++); + intent.putExtra("movie", movie); + startActivityForResult(intent, MOVIE_REQUEST_CODE); + } + }); + } + + @Override + protected void onResume() { + super.onResume(); + layoutList.removeAllViews(); + ArrayList moviesList = MoviesRepository.getMoviesList(); + if(moviesList != null) { + for (Movies allmovies : moviesList) { + layoutList.addView(createMovieView(allmovies)); + } + } + + } + + private TextView createMovieView(final Movies movieView) { + final TextView movieTextView = new TextView(context); + movieTextView.setText(movieView.getTitle()); + movieTextView.setTextSize(22); + movieTextView.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); + if (movieView.getWatched()){ + movieTextView.setPaintFlags(Paint.STRIKE_THRU_TEXT_FLAG); + } + movieTextView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(context, EditActivity.class); + intent.putExtra("movie", movieView); + startActivityForResult(intent, MOVIE_REQUEST_CODE); + } + }); + return movieTextView; + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK && requestCode == MOVIE_REQUEST_CODE) { + if (data != null) { + Movies movie = (Movies) data.getSerializableExtra("movie"); + if ((Boolean) data.getSerializableExtra("add")) { + MoviesRepository.addMovieToList(movie); + + }else{ + MoviesRepository.removeMovieFromList(movie.getId()); + } + } + } + } + } diff --git a/app/src/main/java/com/jakeesveld/android_sprint1_challenge/Movies.java b/app/src/main/java/com/jakeesveld/android_sprint1_challenge/Movies.java new file mode 100644 index 0000000..6247e43 --- /dev/null +++ b/app/src/main/java/com/jakeesveld/android_sprint1_challenge/Movies.java @@ -0,0 +1,40 @@ +package com.jakeesveld.android_sprint1_challenge; + +import java.io.Serializable; +import java.util.ArrayList; + +public class Movies implements Serializable { + + private String title; + private Boolean isWatched; + private int id; + + public Movies(String title, Boolean isWatched) { + this.title = title; + this.isWatched = isWatched; + } + + public Movies(int id){ + this.title = ""; + this.isWatched = false; + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Boolean getWatched() { + return isWatched; + } + + public void setWatched(Boolean watched) { + isWatched = watched; + } + + public int getId(){ return id; } +} diff --git a/app/src/main/java/com/jakeesveld/android_sprint1_challenge/MoviesRepository.java b/app/src/main/java/com/jakeesveld/android_sprint1_challenge/MoviesRepository.java new file mode 100644 index 0000000..a2e8fb4 --- /dev/null +++ b/app/src/main/java/com/jakeesveld/android_sprint1_challenge/MoviesRepository.java @@ -0,0 +1,26 @@ +package com.jakeesveld.android_sprint1_challenge; + +import java.util.ArrayList; + +public class MoviesRepository { + + static ArrayList moviesList; + + public static ArrayListgetMoviesList(){ + if(moviesList == null){ + moviesList = new ArrayList<>(); + } + return moviesList; + } + + public static void addMovieToList(Movies movie){ + if(moviesList == null){ + moviesList = new ArrayList<>(); + } + moviesList.add(movie); + } + + public static void removeMovieFromList(int id){ + moviesList.remove(id); + } +} 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_edit.xml b/app/src/main/res/layout/activity_edit.xml new file mode 100644 index 0000000..397938f --- /dev/null +++ b/app/src/main/res/layout/activity_edit.xml @@ -0,0 +1,49 @@ + + + + + + + + + +