From 7ce95066a295d1b8d1dc195a35990b8e5770a689 Mon Sep 17 00:00:00 2001 From: annaksenova Date: Sun, 21 Sep 2025 12:48:08 +0300 Subject: [PATCH] Homework --- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- receiver/src/main/AndroidManifest.xml | 13 ++++- .../activities/receiver/ReceiverActivity.kt | 28 ++++++++++ sender/build.gradle | 8 +-- sender/src/main/AndroidManifest.xml | 6 ++- sender/{ => src/main/assets}/payload.txt | 0 .../gpb/homework/activities/sender/Payload.kt | 1 - .../activities/sender/SenderActivity.kt | 52 +++++++++++++++++++ sender/src/main/res/values/strings.xml | 3 ++ 10 files changed, 107 insertions(+), 10 deletions(-) rename sender/{ => src/main/assets}/payload.txt (100%) create mode 100644 sender/src/main/java/otus/gpb/homework/activities/sender/SenderActivity.kt diff --git a/build.gradle b/build.gradle index 8ec48d7a..b5228273 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false + id 'com.android.application' version '8.13.0' apply false + id 'com.android.library' version '8.13.0' apply false id 'org.jetbrains.kotlin.android' version '1.9.23' apply false id "io.gitlab.arturbosch.detekt" version "1.21.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb9e5b80..7c7cf9f5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Aug 27 13:57:30 MSK 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/receiver/src/main/AndroidManifest.xml b/receiver/src/main/AndroidManifest.xml index e2f6ea6c..d3ffef61 100644 --- a/receiver/src/main/AndroidManifest.xml +++ b/receiver/src/main/AndroidManifest.xml @@ -8,6 +8,15 @@ 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/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..176985a2 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 @@ -2,11 +2,39 @@ package otus.gpb.homework.activities.receiver import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import android.widget.TextView +import android.widget.ImageView + class ReceiverActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_receiver) + + val title = intent.getStringExtra("title") + val year = intent.getStringExtra("year") + val description = intent.getStringExtra("description") + + val titleTextView = findViewById(R.id.titleTextView) + val yearTextView = findViewById(R.id.yearTextView) + val descriptionTextView = findViewById(R.id.descriptionTextView) + val posterImageView = findViewById(R.id.posterImageView) + + titleTextView.text = title + yearTextView.text = year + descriptionTextView.text = description + + when (title) { + "Славные парни" -> { + posterImageView.setImageDrawable(getDrawable(R.drawable.niceguys)) + } + "Интерстеллар" -> { + posterImageView.setImageDrawable(getDrawable(R.drawable.interstellar)) + } + else -> { + posterImageView.setImageDrawable(null) + } + } } } diff --git a/sender/build.gradle b/sender/build.gradle index 9854ad15..77a8aa15 100644 --- a/sender/build.gradle +++ b/sender/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "otus.gpb.homework.activities.sender" - minSdk 23 - targetSdk 34 + minSdk 25 + targetSdk 35 versionCode 1 versionName "1.0" @@ -40,4 +40,6 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.compose.material3:material3:1.3.2' + implementation 'androidx.wear.compose:compose-material:1.5.1' } \ No newline at end of file diff --git a/sender/src/main/AndroidManifest.xml b/sender/src/main/AndroidManifest.xml index 1bddc002..deeb302f 100644 --- a/sender/src/main/AndroidManifest.xml +++ b/sender/src/main/AndroidManifest.xml @@ -7,6 +7,10 @@ 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/payload.txt b/sender/src/main/assets/payload.txt similarity index 100% rename from sender/payload.txt rename to sender/src/main/assets/payload.txt 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 index 5a0b139e..fb778b77 100644 --- a/sender/src/main/java/otus/gpb/homework/activities/sender/Payload.kt +++ b/sender/src/main/java/otus/gpb/homework/activities/sender/Payload.kt @@ -1,5 +1,4 @@ package otus.gpb.homework.activities.sender - data class Payload( val title: String, val year: String, 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..f8ef14fd --- /dev/null +++ b/sender/src/main/java/otus/gpb/homework/activities/sender/SenderActivity.kt @@ -0,0 +1,52 @@ +package otus.gpb.homework.activities.sender + +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.widget.Button +import androidx.appcompat.app.AppCompatActivity +import otus.gpb.homework.activities.receiver.R +import androidx.core.net.toUri + +class SenderActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_sender) + val buttonMaps = findViewById