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/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..e23474b --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "com.example.movielist" + minSdkVersion 15 + 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..fdff3be --- /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/MovieDetail.java b/app/src/main/java/com/example/movielist/MovieDetail.java new file mode 100644 index 0000000..af3eb47 --- /dev/null +++ b/app/src/main/java/com/example/movielist/MovieDetail.java @@ -0,0 +1,103 @@ +package com.example.movielist; + +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.widget.Button; +import android.widget.EditText; + +import java.util.ArrayList; + +public class MovieDetail extends AppCompatActivity { + + public static final int ENTRY_REQUEST_CODE = 8; + private MovieModel entryMovieModel; + + private Context context = this; + private EditText movieEntryEditText; + private Button buttonSave, buttonDelete; + ArrayList movieList; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_movie_detail); + + Intent intent = getIntent(); + entryMovieModel = (MovieModel) intent.getSerializableExtra(MovieModel.TAG); + + movieEntryEditText = findViewById(R.id.movie_entry); + movieEntryEditText.setText(entryMovieModel.getMovieName()); + + buttonSave = findViewById(R.id.button_save); + buttonSave.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(); + entryMovieModel.setMovieName(movieEntryEditText.getText().toString()); + intent.putExtra(MovieModel.TAG, entryMovieModel); + setResult(RESULT_OK,intent); + finish(); + + } + }); + + buttonDelete = findViewById(R.id.button_delete); + buttonDelete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + setResult(RESULT_CANCELED); + finish(); + + } + }); + + movieList = new ArrayList<>(); + + } + + @Override + protected void onStart() { + super.onStart(); + } + + @Override + protected void onResume() { + super.onResume(); + + } + + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onStop() { + super.onStop(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + if(resultCode == RESULT_OK && requestCode == ENTRY_REQUEST_CODE){ + if (data != null){ + MovieModel entry = (MovieModel) data.getSerializableExtra(MovieModel.TAG); + movieList.add(entry); + } + + } + } + } + + + + diff --git a/app/src/main/java/com/example/movielist/MovieListActivity.java b/app/src/main/java/com/example/movielist/MovieListActivity.java new file mode 100644 index 0000000..b5fa381 --- /dev/null +++ b/app/src/main/java/com/example/movielist/MovieListActivity.java @@ -0,0 +1,146 @@ +package com.example.movielist; + +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.ScrollView; +import android.widget.TextView; + +import java.util.ArrayList; + +public class MovieListActivity extends AppCompatActivity { + + public static final int NEW_ENTRY_REQUEST_CODE = 4; + static int nextid = 0; + MovieModel entry; + Context context = this; + ScrollView movieListView; + LinearLayout interListView; + private ArrayList movieList; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_movielist); + + Intent intent = getIntent(); + entry = (MovieModel) intent.getSerializableExtra(MovieModel.TAG); + if(entry == null){ + entry = new MovieModel(MovieModel.INVALD_ID); + + } + + interListView = findViewById(R.id.inter_listView); + + movieListView = findViewById(R.id.movie_listView); + findViewById(R.id.add_movie_to_list).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(context,MovieDetail.class); + MovieModel entry = createMovieEntry(); + intent.putExtra(MovieModel.TAG,entry); + startActivityForResult(intent, NEW_ENTRY_REQUEST_CODE); + + + + } + }); + + movieList = new ArrayList<>(); + addFakeMovies(); + + } + + + @Override + protected void onStart() { + super.onStart(); + } + + @Override + protected void onResume() { + super.onResume(); + + interListView.removeAllViews(); + for(MovieModel entry :movieList ){ + interListView.addView(createEntryView(entry)); + } + } + + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onStop() { + super.onStop(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } + + private MovieModel createMovieEntry(){ + MovieModel entry = new MovieModel(nextid++); + + return entry; + + } + + private MovieModel createMovieEntry(String text){ + MovieModel entry = createMovieEntry(); + + + entry.setMovieName(text); + + + return entry; + + } + + private TextView createEntryView(final MovieModel entry){ + final TextView textView = new TextView(context); + + textView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,ViewGroup.LayoutParams.WRAP_CONTENT)); + textView.setText(entry.getMovieName() + "-" + entry.getId()); + textView.setPadding(15,15,15,15); + textView.setTextSize(25); + textView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + movieList.remove(entry); + Intent viewMovieEntry = new Intent(context,MovieDetail.class); + viewMovieEntry.putExtra(MovieModel.TAG,entry); + + startActivityForResult(viewMovieEntry,0); + + } + }); + + + return textView; + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + if( resultCode == RESULT_OK){ + MovieModel entry = (MovieModel) data.getSerializableExtra(MovieModel.TAG); + movieList.add(entry); + createEntryView(entry); + } + + } + + private void addFakeMovies(){ + + movieList.add(createMovieEntry("Jaws.")); + movieList.add(createMovieEntry(" Matrix")); + } +} diff --git a/app/src/main/java/com/example/movielist/MovieModel.java b/app/src/main/java/com/example/movielist/MovieModel.java new file mode 100644 index 0000000..f61400c --- /dev/null +++ b/app/src/main/java/com/example/movielist/MovieModel.java @@ -0,0 +1,37 @@ +package com.example.movielist; + +import java.io.Serializable; + +public class MovieModel implements Serializable { + + static final String TAG = "entry"; + public static final int INVALD_ID = -1; + + private int id; + private String movieName; + + public MovieModel(int id, String movieName) { + this.id = id; + this.movieName = movieName; + } + + public MovieModel(int id) { + this.id = id; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getMovieName() { + return movieName; + } + + public void setMovieName(String movieName) { + this.movieName = movieName; + } +} 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..c7bd21d --- /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..2408e30 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_movie_detail.xml b/app/src/main/res/layout/activity_movie_detail.xml new file mode 100644 index 0000000..41a3e08 --- /dev/null +++ b/app/src/main/res/layout/activity_movie_detail.xml @@ -0,0 +1,44 @@ + + + + + +