diff --git a/gradle.properties b/gradle.properties index 022338b7..5d13ccd6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,4 +22,5 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true android.defaults.buildfeatures.buildconfig=true -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false +android.overridePathCheck=true \ No newline at end of file diff --git a/receiver/src/main/AndroidManifest.xml b/receiver/src/main/AndroidManifest.xml index e2f6ea6c..8b20ee3b 100644 --- a/receiver/src/main/AndroidManifest.xml +++ b/receiver/src/main/AndroidManifest.xml @@ -1,13 +1,20 @@ - - + - + android:theme="@style/Theme.Activities"> + + + + + + + + \ No newline at end of file diff --git a/receiver/src/main/java/otus/gpb/homework/activities/receiver/ReceiverActivity.kt b/receiver/src/main/java/otus/gpb/homework/activities/receiver/ReceiverActivity.kt index b3fe360c..eb16b65d 100644 --- a/receiver/src/main/java/otus/gpb/homework/activities/receiver/ReceiverActivity.kt +++ b/receiver/src/main/java/otus/gpb/homework/activities/receiver/ReceiverActivity.kt @@ -1,6 +1,9 @@ package otus.gpb.homework.activities.receiver +import android.graphics.drawable.Drawable import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView import androidx.appcompat.app.AppCompatActivity class ReceiverActivity : AppCompatActivity() { @@ -8,5 +11,28 @@ class ReceiverActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_receiver) + + val titleView: TextView = findViewById(R.id.titleTextView) + val yearView: TextView = findViewById(R.id.yearTextView) + val descriptionView: TextView = findViewById(R.id.descriptionTextView) + val posterView: ImageView = findViewById(R.id.posterImageView) + + val movieTitle = intent.getStringExtra("title") ?: "" + val movieYear = intent.getStringExtra("year") ?: "" + val movieDescription = intent.getStringExtra("description") ?: "" + + titleView.text = movieTitle + yearView.text = movieYear + descriptionView.text = movieDescription + + val posterDrawable: Drawable? = when (movieTitle) { + "niceguys" -> getDrawable(R.drawable.niceguys) + "interstellar" -> getDrawable(R.drawable.interstellar) + else -> null + } + + posterDrawable?.let { + posterView.setImageDrawable(it) + } } } diff --git a/sender/src/main/AndroidManifest.xml b/sender/src/main/AndroidManifest.xml index 1bddc002..c8e85b63 100644 --- a/sender/src/main/AndroidManifest.xml +++ b/sender/src/main/AndroidManifest.xml @@ -7,6 +7,14 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.Activities" /> - + android:theme="@style/Theme.Activities"> + + + + + + + \ No newline at end of file diff --git a/sender/src/main/java/otus/gpb/homework/activities/sender/Payload.kt b/sender/src/main/java/otus/gpb/homework/activities/sender/Payload.kt deleted file mode 100644 index 5a0b139e..00000000 --- a/sender/src/main/java/otus/gpb/homework/activities/sender/Payload.kt +++ /dev/null @@ -1,7 +0,0 @@ -package otus.gpb.homework.activities.sender - -data class Payload( - val title: String, - val year: String, - val description: String -) \ No newline at end of file diff --git a/sender/src/main/java/otus/gpb/homework/activities/sender/SenderActivity.kt b/sender/src/main/java/otus/gpb/homework/activities/sender/SenderActivity.kt new file mode 100644 index 00000000..c4c1757a --- /dev/null +++ b/sender/src/main/java/otus/gpb/homework/activities/sender/SenderActivity.kt @@ -0,0 +1,75 @@ +package otus.gpb.homework.activities.receiver + +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.widget.Button +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity + +class SenderActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_sender) + + findViewById