-
Notifications
You must be signed in to change notification settings - Fork 40
app structure #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from 9 commits
7554a48
8dc6c09
43adcaa
8f53a78
df151f4
1b895fd
b22aca6
46bc5b3
4204ce8
99de585
4674e80
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /build |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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' | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <a href="http://d.android.com/tools/testing">Testing documentation</a> | ||
| */ | ||
| @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()); | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="com.thadocizn.sprintchallenge"> | ||
|
|
||
| <application | ||
| android:allowBackup="true" | ||
| android:icon="@mipmap/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:roundIcon="@mipmap/ic_launcher_round" | ||
| android:supportsRtl="true" | ||
| android:theme="@style/AppTheme"> | ||
| <activity android:name=".ListActivity"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| <activity android:name=".EditActivity"></activity> | ||
| </application> | ||
|
|
||
| </manifest> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| 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 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; | ||
| private static Boolean chkBox ; | ||
|
|
||
|
|
||
|
|
||
| @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; | ||
| final CheckBox checkBox = findViewById(R.id.checkBoxWatchedMovie); | ||
|
|
||
| findViewById(R.id.buttonDelete).setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| Movie deleteMovie = (Movie)getIntent().getSerializableExtra(EDIT_MOVIE_KEY); | ||
| Log.i(TAG, "movie" + viewModel); | ||
|
|
||
| //viewModel.deleteMovie(deleteMovie); | ||
| } | ||
| }); | ||
|
|
||
| findViewById(R.id.buttonSave).setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| Boolean watched; | ||
| if (checkBox.isChecked()){ | ||
| watched = true; | ||
|
|
||
| }else { | ||
| watched = false; | ||
|
|
||
| } | ||
| chkBox = watched; | ||
| onBackPressed(); | ||
| } | ||
| }); | ||
|
|
||
|
|
||
| if (movie == null){ | ||
| movie = new Movie(Movie.NO_ID); | ||
| } | ||
| editMovie.setText(movie.getMovieName()); | ||
| } | ||
|
|
||
| public static Boolean getData(){ | ||
| return chkBox; | ||
| } | ||
| private void prepResult() { | ||
| movie.setMovieName(editMovie.getText().toString()); | ||
| Intent resultIntent = new Intent(); | ||
| resultIntent.putExtra(EDIT_MOVIE_KEY, movie); | ||
| setResult(Activity.RESULT_OK, resultIntent); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected void onPause() { | ||
| super.onPause(); | ||
| prepResult(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onBackPressed() { | ||
| prepResult(); | ||
| super.onBackPressed(); | ||
|
|
||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You fixed a thing. Great job fixing it as effectively as you did.