From a2709d0813c718d976da65266a00bb1cc6f4a1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BC=D1=86=D0=BE=D0=B2=D0=B0=20=D0=9D=D0=B0=D0=B4?= =?UTF-8?q?=D0=B5=D0=B6=D0=B4=D0=B0?= Date: Thu, 1 May 2025 17:06:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=82=D1=80=D0=B5=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 3 + .../com/example/timert/CreatingTraining.kt | 53 +++++ .../java/com/example/timert/MainActivity.kt | 8 +- .../main/res/drawable/gradient_purpure.xml | 9 + app/src/main/res/drawable/green_rectangle.xml | 14 ++ app/src/main/res/drawable/ic_add_24px.xml | 10 + app/src/main/res/drawable/ic_remove_24px.xml | 10 + .../res/layout/activity_creating_training.xml | 183 ++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 11 +- app/src/main/res/values/colors.xml | 3 + app/src/main/res/values/strings.xml | 3 +- app/src/main/res/values/themes.xml | 3 +- 12 files changed, 305 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/example/timert/CreatingTraining.kt create mode 100644 app/src/main/res/drawable/gradient_purpure.xml create mode 100644 app/src/main/res/drawable/green_rectangle.xml create mode 100644 app/src/main/res/drawable/ic_add_24px.xml create mode 100644 app/src/main/res/drawable/ic_remove_24px.xml create mode 100644 app/src/main/res/layout/activity_creating_training.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 94a7c18..ec4d186 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,9 @@ android:supportsRtl="true" android:theme="@style/Theme.TimerT" tools:targetApi="31"> + diff --git a/app/src/main/java/com/example/timert/CreatingTraining.kt b/app/src/main/java/com/example/timert/CreatingTraining.kt new file mode 100644 index 0000000..1f6cdaa --- /dev/null +++ b/app/src/main/java/com/example/timert/CreatingTraining.kt @@ -0,0 +1,53 @@ +package com.example.timert + +import android.app.AlertDialog +import android.content.Intent +import android.os.Bundle +import android.widget.Button +import android.widget.ImageButton +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class CreatingTraining : AppCompatActivity() { + private var isSave = false + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_creating_training) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + val buttonSave: Button = findViewById(R.id.btn_save) + buttonSave.setOnClickListener { + + isSave=true + + } + val button_on_main: Button = findViewById(R.id.btn_on_main) + button_on_main.setOnClickListener { + if(isSave==false){ + AlertDialog.Builder(this) + .setTitle("Изменения не сохранены") + .setMessage("Продолжить без сохранения?") + .setPositiveButton("Да") { _, _ -> + + val intent = Intent(this, MainActivity::class.java) + startActivity(intent) + } + .setNegativeButton("Нет") { dialog, _ -> + dialog.dismiss() + } + .show() + }else{ + val intent = Intent(this, MainActivity::class.java) + startActivity(intent) + + } + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/timert/MainActivity.kt b/app/src/main/java/com/example/timert/MainActivity.kt index 64aa7df..0466d31 100644 --- a/app/src/main/java/com/example/timert/MainActivity.kt +++ b/app/src/main/java/com/example/timert/MainActivity.kt @@ -18,12 +18,18 @@ class MainActivity : AppCompatActivity() { v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) insets } - var button: Button = findViewById(R.id.button2) + var button: Button = findViewById(R.id.button1) button.setOnClickListener{ val intent = Intent(this,timer::class.java) startActivity(intent) } + var button2: Button = findViewById(R.id.button2) + + button2.setOnClickListener{ + val intent = Intent(this,CreatingTraining::class.java) + startActivity(intent) + } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/gradient_purpure.xml b/app/src/main/res/drawable/gradient_purpure.xml new file mode 100644 index 0000000..46dd1dd --- /dev/null +++ b/app/src/main/res/drawable/gradient_purpure.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/green_rectangle.xml b/app/src/main/res/drawable/green_rectangle.xml new file mode 100644 index 0000000..a968fee --- /dev/null +++ b/app/src/main/res/drawable/green_rectangle.xml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_24px.xml b/app/src/main/res/drawable/ic_add_24px.xml new file mode 100644 index 0000000..eb23254 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_remove_24px.xml b/app/src/main/res/drawable/ic_remove_24px.xml new file mode 100644 index 0000000..791a2f8 --- /dev/null +++ b/app/src/main/res/drawable/ic_remove_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_creating_training.xml b/app/src/main/res/layout/activity_creating_training.xml new file mode 100644 index 0000000..cc1c7df --- /dev/null +++ b/app/src/main/res/layout/activity_creating_training.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +