From 35997268be9facc33c6068bb7d5db275e264c79a Mon Sep 17 00:00:00 2001 From: YifeiYang20 Date: Wed, 9 Mar 2022 20:42:37 -0500 Subject: [PATCH 1/8] 3.9 --- app/src/main/res/layout/activity_main.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index afdc095..8e5ed88 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,7 +8,7 @@ tools:ignore="ExtraText"> @@ -72,7 +72,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/txt_MovieYear" + app:layout_constraintTop_toBottomOf="@+id/txt_Year" android:importantForAutofill="no" tools:ignore="LabelFor" /> From 969680c0d90fc6c7cbfc97dc926da586fa752e11 Mon Sep 17 00:00:00 2001 From: YifeiYang20 Date: Tue, 29 Mar 2022 15:42:33 -0400 Subject: [PATCH 2/8] 3.29.1 --- .../java/com/example/mymovieinfo/MainActivity.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/main/java/com/example/mymovieinfo/MainActivity.kt b/app/src/main/java/com/example/mymovieinfo/MainActivity.kt index e96a964..82bd74f 100644 --- a/app/src/main/java/com/example/mymovieinfo/MainActivity.kt +++ b/app/src/main/java/com/example/mymovieinfo/MainActivity.kt @@ -4,12 +4,24 @@ import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import java.io.IOException import java.io.InputStream +import android.content.Context; +import android.view.View; +import android.widget.Button; +import android.widget.Toast; class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + + val btn_FindMyMovie = findViewById(R.id.btn_FindMyMovie) as Button + btn_FindMyMovie.setOnClickListener { + // your code to perform when the user clicks on the button + Toast.makeText(this@MainActivity, "You clicked me.", Toast.LENGTH_SHORT).show() + } } + + } \ No newline at end of file From 5f30a8efd0906ca639cf25a5aa8ccbfd7ffe3a16 Mon Sep 17 00:00:00 2001 From: YifeiYang20 Date: Tue, 29 Mar 2022 19:50:45 -0400 Subject: [PATCH 3/8] 3.29.2 --- .idea/misc.xml | 1 + .../com/example/mymovieinfo/MainActivity.kt | 10 ++-------- .../com/example/mymovieinfo/dto/Specimen.kt | 7 +++++++ app/src/main/res/xml/searchable.xml | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt create mode 100644 app/src/main/res/xml/searchable.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 479f562..a9f4eab 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,6 +4,7 @@ diff --git a/app/src/main/java/com/example/mymovieinfo/MainActivity.kt b/app/src/main/java/com/example/mymovieinfo/MainActivity.kt index 82bd74f..9883a10 100644 --- a/app/src/main/java/com/example/mymovieinfo/MainActivity.kt +++ b/app/src/main/java/com/example/mymovieinfo/MainActivity.kt @@ -1,10 +1,11 @@ package com.example.mymovieinfo - +import android.app.SearchManager import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import java.io.IOException import java.io.InputStream import android.content.Context; +import android.content.Intent import android.view.View; import android.widget.Button; import android.widget.Toast; @@ -13,15 +14,8 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - - val btn_FindMyMovie = findViewById(R.id.btn_FindMyMovie) as Button - btn_FindMyMovie.setOnClickListener { - // your code to perform when the user clicks on the button - Toast.makeText(this@MainActivity, "You clicked me.", Toast.LENGTH_SHORT).show() - } } - } \ No newline at end of file diff --git a/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt b/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt new file mode 100644 index 0000000..780db13 --- /dev/null +++ b/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt @@ -0,0 +1,7 @@ +package com.example.mymovieinfo.dto + +class Specimen(var MovieTitle: String = "", var MovieRank: Int = 0, var MovieCountry : String = "", var MovieBoxOfficeGross: String = "", var MovieOpeningWeekendGross : String = "", var MovieDistributor : String = "") { + override fun toString(): String { + return "$MovieTitle" + } +} \ No newline at end of file diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml new file mode 100644 index 0000000..667ac98 --- /dev/null +++ b/app/src/main/res/xml/searchable.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file From d864836e41da5ee4ddefb26f7946d38e0a4aba80 Mon Sep 17 00:00:00 2001 From: JMaz-15 <65188299+JMaz-15@users.noreply.github.com> Date: Tue, 5 Apr 2022 15:22:10 -0400 Subject: [PATCH 4/8] Tweaked Class Structure based on Kotling Coding Standards: https://kotlinlang.org/docs/coding-conventions.html#class-headers --- .../main/java/com/example/mymovieinfo/dto/Specimen.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt b/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt index 780db13..6f6c7cd 100644 --- a/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt +++ b/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt @@ -1,7 +1,13 @@ package com.example.mymovieinfo.dto -class Specimen(var MovieTitle: String = "", var MovieRank: Int = 0, var MovieCountry : String = "", var MovieBoxOfficeGross: String = "", var MovieOpeningWeekendGross : String = "", var MovieDistributor : String = "") { +class Specimen(var movieTitle: String = "", + var movieRank: Int = 0, + var movieCountry : String = "", + var movieBoxOfficeGross: String = "", + var movieOpeningWeekendGross : String = "", + var movieDistributor : String = "") +{ override fun toString(): String { - return "$MovieTitle" + return movieTitle } } \ No newline at end of file From 321d7b005f3ee5109669b59e8bd7b19a2f11ccc1 Mon Sep 17 00:00:00 2001 From: JMaz-15 <65188299+JMaz-15@users.noreply.github.com> Date: Tue, 5 Apr 2022 15:52:01 -0400 Subject: [PATCH 5/8] Tweaked Class Structure based on Kotling Coding Standards: https://kotlinlang.org/docs/coding-conventions.html#class-headers --- app/src/main/java/com/example/mymovieinfo/dto/Movie.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/example/mymovieinfo/dto/Movie.kt b/app/src/main/java/com/example/mymovieinfo/dto/Movie.kt index 2843a4a..b409ed3 100644 --- a/app/src/main/java/com/example/mymovieinfo/dto/Movie.kt +++ b/app/src/main/java/com/example/mymovieinfo/dto/Movie.kt @@ -2,9 +2,12 @@ package com.example.mymovieinfo.dto import com.google.gson.annotations.SerializedName -data class Movie(@SerializedName("rank")var rank: Int, @SerializedName("title")var title: String, - @SerializedName("country") var country: String, @SerializedName("boxOfficeGross")var boxOfficeGross: Double, - @SerializedName("openingWeekendGross")var openingWeekendGross: Double, @SerializedName("distributor")var distributor: String){ +data class Movie(@SerializedName("rank")var rank: Int, + @SerializedName("title")var title: String, + @SerializedName("country") var country: String, + @SerializedName("boxOfficeGross")var boxOfficeGross: Double, + @SerializedName("openingWeekendGross")var openingWeekendGross: Double, + @SerializedName("distributor")var distributor: String){ override fun toString(): String { return title From 9433939c8babc1b7e3138a10d0cc636ed8a5330e Mon Sep 17 00:00:00 2001 From: JMaz-15 <65188299+JMaz-15@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:17:06 -0400 Subject: [PATCH 6/8] made Specimen a data class --- app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt b/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt index 6f6c7cd..3ca18b7 100644 --- a/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt +++ b/app/src/main/java/com/example/mymovieinfo/dto/Specimen.kt @@ -1,6 +1,6 @@ package com.example.mymovieinfo.dto -class Specimen(var movieTitle: String = "", +data class Specimen(var movieTitle: String = "", var movieRank: Int = 0, var movieCountry : String = "", var movieBoxOfficeGross: String = "", From 77b09615ca3050bfaf7d5093c8bce899d53db932 Mon Sep 17 00:00:00 2001 From: JMaz-15 <65188299+JMaz-15@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:21:45 -0400 Subject: [PATCH 7/8] Removed underscores from variable names per Kotlin coding standards --- app/src/main/res/layout/activity_main.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8e5ed88..3909c31 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,7 +8,7 @@ tools:ignore="ExtraText">