stud179277/Timer
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: stud179277:main
Branches Tags
stud179277:main
stud179289:Novikov_feature
stud179289:Novikov-vetka
stud179289:main
..
compare: stud179289:Novikov-vetka
Branches Tags
stud179289:Novikov_feature
stud179289:Novikov-vetka
stud179289:main
stud179277:main

1 Commits
main ... Novikov-ve

Author SHA1 Message Date
Новиков Николай
c3cc5794a0 Созданы формы 1 и 6 2025-05-01 18:42:20 +03:00
60 changed files with 18 additions and 1130 deletions
Show Stats Expand all files Collapse all files

10
.idea/deploymentTargetSelector.xml generated
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetSelector">
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
</SelectionState>
</selectionStates>
</component>
</project>

1
.idea/gradle.xml generated
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>

1
.idea/misc.xml generated
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">

6
.idea/render.experimental.xml generated
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RenderSettings">
<option name="showDecorations" value="true" />
</component>
</project>

2
.idea/vcs.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="" vcs="Git" />
</component>
</project>

6
app/src/main/AndroidManifest.xml
View File

@ -15,12 +15,6 @@
<activity
android:name=".SettingsActivity"
android:exported="false" />
<activity
android:name=".CreatingTraining"
android:exported="false" />
<activity
android:name=".timer"
android:exported="false" />
<activity
android:name=".MainActivity"
android:exported="true">

BIN
app/src/main/ic_launcher-playstore.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 41 KiB

57
app/src/main/java/com/example/timert/AddWorkout.kt
View File

@ -1,57 +0,0 @@
package com.example.timert
import android.app.AlertDialog
import android.content.Intent
import android.os.Bundle
import android.widget.Button
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
class AddWorkout : AppCompatActivity() {
private var isSave = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_add_workout)
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 buttonSaveAll: Button = findViewById(R.id.btn_save_all)
buttonSaveAll.setOnClickListener {
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
isSave = true
}
val button_on_main_all: Button = findViewById(R.id.btn_on_main_all)
button_on_main_all.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)
}
}
val button_add: Button = findViewById(R.id.add_workoutadd)
button_add.setOnClickListener {
val intent = Intent(this, CreatingTraining::class.java)
startActivity(intent)
}
}
}

52
app/src/main/java/com/example/timert/AllTraining.kt
View File

@ -1,52 +0,0 @@
package com.example.timert
import android.app.AlertDialog
import android.content.Intent
import android.os.Bundle
import android.widget.Button
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
class AllTraining : AppCompatActivity() {
private var isSave = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_all_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 buttonSaveAll: Button = findViewById(R.id.btn_save_all_vse)
buttonSaveAll.setOnClickListener {
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
isSave = true
}
val button_on_main_all: Button = findViewById(R.id.btn_on_main_all_vse)
button_on_main_all.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)
}
}
}
}

53
app/src/main/java/com/example/timert/CreatingTraining.kt
View File

@ -1,53 +0,0 @@
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)
}
}
}
}

2
app/src/main/java/com/example/timert/MainActivity.kt
View File

@ -20,13 +20,13 @@ class MainActivity : AppCompatActivity() {
insets
}
// Кнопки главной формы:
val settingsButton: Button = findViewById(R.id.settingsButton)
settingsButton.setOnClickListener {
val intent = Intent(this, SettingsActivity::class.java)
startActivity(intent)
}
val startTrainingButton: Button = findViewById(R.id.startTrainingButton)
startTrainingButton.setOnClickListener {
Toast.makeText(this, "Запуск тренировки!", Toast.LENGTH_SHORT).show() // Заглушка

8
app/src/main/java/com/example/timert/SettingsActivity.kt
View File

@ -70,10 +70,10 @@ class SettingsActivity : AppCompatActivity() {
AlertDialog.Builder(this)
.setTitle("Разработчики")
.setMessage(HtmlCompat.fromHtml(
"<p style='margin-left: 2em;'><b>Вятский государственный университет</b></p><br>" +
"<p style='margin-left: 2em;'>Емцова Надежда Александровна</p>" +
"<p style='margin-left: 2em;'>Новиков Николай Алексеевич</p>" +
"<p style='margin-left: 2em;'>Пискун Алёна Викторовна</p>",
"<b>Вятский государственный университет</b><br><br>" + // Дополнительный перенос строки
"&nbsp;&nbsp;&nbsp;&nbsp;Иванов Иван Иванович<br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;Баркин Марк Анатольевич<br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;Крупницын Альбрехт Абрамов",
HtmlCompat.FROM_HTML_MODE_LEGACY
))
.setPositiveButton("ОК", null)

62
app/src/main/java/com/example/timert/timer.kt
View File

@ -1,62 +0,0 @@
package com.example.timert
import android.app.AlertDialog
import android.content.Intent
import android.media.Image
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 timer : AppCompatActivity() {
private var isPlay = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_timer)
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 button: ImageButton = findViewById(R.id.stop)
button.setOnClickListener {
AlertDialog.Builder(this)
.setTitle("Сброс таймера")
.setMessage("Закрыть таймер и перейти на главную страницу?")
.setPositiveButton("Да") { _, _ ->
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
}
.setNegativeButton("Нет") { dialog, _ ->
dialog.dismiss()
}
.show()
}
val pauseButton: ImageButton = findViewById(R.id.play)
pauseButton.setOnClickListener {
if (isPlay) {
pauseButton.setImageResource(R.drawable.icon_play)
// здесь ещё можно возобновить таймер
} else {
pauseButton.setImageResource(R.drawable.icon_pause)
// здесь можно остановить таймер
}
isPlay = !isPlay
}
}
}

BIN
app/src/main/res/drawable/background_image.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
app/src/main/res/drawable/background_image2.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
app/src/main/res/drawable/background_imagemain.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 MiB

9
app/src/main/res/drawable/blue_gradient.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/colorGradientBlueStart"
android:endColor="@color/colorGradientBlueStop"
android:angle="270" />
</shape>

9
app/src/main/res/drawable/gradient_pink.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/colorGradientPinkStart"
android:endColor="@color/colorGradientPinkStop"
android:angle="270" />
</shape>

9
app/src/main/res/drawable/gradient_purpure.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/colorGradientPurpureStart"
android:endColor="@color/colorGradientPurpureStop"
android:angle="180" />
</shape>

9
app/src/main/res/drawable/green_gradient.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/colorGradientGreenStart"
android:endColor="@color/colorGradientGreenStop"
android:angle="270" />
</shape>

14
app/src/main/res/drawable/green_rectangle.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:type="linear"
android:startColor="@color/colorGradientGreenStart"
android:endColor="@color/colorGradientGreenStop"
android:gradientRadius="90" />
<corners android:radius="10dp"/>
</shape>

10
app/src/main/res/drawable/ic_add_24px.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>

10
app/src/main/res/drawable/ic_remove_24px.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19,13H5v-2h14v2z"/>
</vector>

2
app/src/main/res/drawable/ic_settings.xml
View File

@ -1,4 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#3D6ADC" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>

10
app/src/main/res/drawable/icon_pause.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
</vector>

10
app/src/main/res/drawable/icon_play.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M8,5v14l11,-7z"/>
</vector>

10
app/src/main/res/drawable/icon_stop.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,6h12v12H6z"/>
</vector>

9
app/src/main/res/drawable/pink_gradient.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/colorGradientPinkStart"
android:endColor="@color/colorGradientPinkStop"
android:angle="270" />
</shape>

257
app/src/main/res/layout/activity_add_workout.xml
View File

@ -1,257 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/blue_gradient"
tools:context=".AddWorkout">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_marginTop="25dp"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Тренировка"
android:textAlignment="center"
android:textSize="34sp" />
<EditText
android:id="@+id/name_training"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:ems="10"
android:inputType="text"
android:text="Тренировка 1"
android:textAlignment="center"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/setting_training"
android:layout_width="match_parent"
android:layout_height="400dp"
android:layout_marginTop="10dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/linearLayout"
tools:layout_editor_absoluteX="16dp">
<TextView
android:id="@+id/textView6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Количество подходов"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/del_set3"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_remove_24px" />
<TextView
android:id="@+id/numbers_of_sets_all3"
android:layout_width="wrap_content"
android:layout_height="38dp"
android:layout_weight="1"
android:text="0"
android:textAlignment="center"
android:textSize="34sp" />
<ImageView
android:id="@+id/add_set3"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
<TextView
android:id="@+id/textView8_all2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Отдых между подходами"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/del_set2"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_remove_24px" />
<TextView
android:id="@+id/numbers_of_sets_all2"
android:layout_width="wrap_content"
android:layout_height="38dp"
android:layout_weight="1"
android:text="0"
android:textAlignment="center"
android:textSize="34sp" />
<ImageView
android:id="@+id/add_set2"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
<TextView
android:id="@+id/textView5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Время работы"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginBottom="20dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/del_set"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_remove_24px" />
<TextView
android:id="@+id/numbers_of_sets_allall"
android:layout_width="wrap_content"
android:layout_height="38dp"
android:layout_weight="1"
android:text="0"
android:textAlignment="center"
android:textSize="34sp" />
<ImageView
android:id="@+id/add_set"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
<TextView
android:id="@+id/textView8_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Отдых между упражнениями"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/del_res"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_remove_24px" />
<TextView
android:id="@+id/rest_sets_allall"
android:layout_width="wrap_content"
android:layout_height="39dp"
android:layout_weight="1"
android:text="0"
android:textAlignment="center"
android:textSize="34sp" />
<ImageView
android:id="@+id/add_res"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="10dp"
app:layout_constraintTop_toBottomOf="@+id/setting_training"
tools:layout_editor_absoluteX="0dp">
<Button
android:id="@+id/add_workoutadd"
android:layout_width="208dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:background="@drawable/green_rectangle"
android:gravity="center"
android:text="Выбор упражнений"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="16sp" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginBottom="35dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<Button
android:id="@+id/btn_on_main_all"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_weight="1"
android:background="@drawable/gradient_purpure"
android:text="на главную"
android:textAlignment="center"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_save_all"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_weight="1"
android:background="@drawable/gradient_purpure"
android:text="Сохранить"
android:textAlignment="center"
android:textColor="@color/white" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

164
app/src/main/res/layout/activity_all_training.xml
View File

@ -1,164 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/gradient_pink"
tools:context=".AllTraining">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_marginTop="25dp"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Тренировка"
android:textAlignment="center"
android:textSize="34sp" />
<EditText
android:id="@+id/name_training"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:ems="10"
android:inputType="text"
android:text="Упражнение 1"
android:textAlignment="center"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/setting_training"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginTop="37dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/linearLayout"
tools:layout_editor_absoluteX="16dp">
<TextView
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Время работы"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/del_set"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_remove_24px" />
<TextView
android:id="@+id/numbers_of_sets_allall"
android:layout_width="wrap_content"
android:layout_height="38dp"
android:layout_weight="1"
android:text="0"
android:textAlignment="center"
android:textSize="34sp" />
<ImageView
android:id="@+id/add_set"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
<TextView
android:id="@+id/textView8_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Отдых между подходами"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/del_res"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_remove_24px" />
<TextView
android:id="@+id/rest_sets_allall"
android:layout_width="wrap_content"
android:layout_height="39dp"
android:layout_weight="1"
android:text="0"
android:textAlignment="center"
android:textSize="34sp" />
<ImageView
android:id="@+id/add_res"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginBottom="35dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="7dp">
<Button
android:id="@+id/btn_save_all_vse"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_weight="1"
android:background="@drawable/gradient_purpure"
android:text="Сохранить"
android:textAlignment="center"
android:textColor="@color/white"
tools:layout_editor_absoluteX="245dp"
tools:layout_editor_absoluteY="653dp" />
<Button
android:id="@+id/btn_on_main_all_vse"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_weight="1"
android:background="@drawable/gradient_purpure"
android:text="на главную"
android:textAlignment="center"
android:textColor="@color/white"
tools:layout_editor_absoluteX="16dp"
tools:layout_editor_absoluteY="653dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

183
app/src/main/res/layout/activity_creating_training.xml
View File

@ -1,183 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/blue_gradient"
tools:context=".CreatingTraining">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_marginTop="25dp"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Тренировка"
android:textAlignment="center"
android:textSize="34sp" />
<EditText
android:id="@+id/name_training"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:ems="10"
android:inputType="text"
android:text="Тренировка 1"
android:textAlignment="center"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/setting_training"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginTop="37dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/linearLayout"
tools:layout_editor_absoluteX="16dp">
<TextView
android:id="@+id/textView5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Количество подходов"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/del_set"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_remove_24px" />
<TextView
android:id="@+id/numbers_of_sets"
android:layout_width="wrap_content"
android:layout_height="38dp"
android:layout_weight="1"
android:text="0"
android:textAlignment="center"
android:textSize="34sp" />
<ImageView
android:id="@+id/add_set"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
<TextView
android:id="@+id/textView8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Отдых между подходами"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/del_res"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_remove_24px" />
<TextView
android:id="@+id/rest_sets"
android:layout_width="wrap_content"
android:layout_height="39dp"
android:layout_weight="1"
android:text="0"
android:textAlignment="center"
android:textSize="34sp" />
<ImageView
android:id="@+id/add_res"
android:layout_width="wrap_content"
android:layout_height="37dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="19dp"
app:layout_constraintTop_toBottomOf="@+id/setting_training"
tools:layout_editor_absoluteX="0dp">
<Button
android:id="@+id/add_workout"
android:layout_width="176dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/green_rectangle"
android:gravity="center"
android:text="+ упражнение"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="16sp" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginBottom="35dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<Button
android:id="@+id/btn_on_main"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_weight="1"
android:background="@drawable/gradient_purpure"
android:text="на главную"
android:textAlignment="center"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_save"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_weight="1"
android:background="@drawable/gradient_purpure"
android:text="Сохранить"
android:textAlignment="center"
android:textColor="@color/white" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/activity_main.xml
View File

@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_imagemain"
android:src="@drawable/background_image"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -27,7 +27,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:contentDescription="Настройки"
android:backgroundTint="@color/black" />
android:backgroundTint="@android:color/transparent" />
<androidx.cardview.widget.CardView
android:id="@+id/startTrainingCardView"
@ -69,7 +69,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:text="Редактировать тренировку"
android:text="Шаблоны"
android:textColor="@android:color/white" />
</androidx.cardview.widget.CardView>
@ -91,7 +91,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:text="История тренировок"
android:text="Новый шаблон"
android:textColor="@android:color/white" />
</androidx.cardview.widget.CardView>

3
app/src/main/res/layout/activity_settings2.xml
View File

@ -3,8 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp"
android:background="@drawable/background_image2"> <!-- Добавили background -->
android:padding="16dp">
<TextView
android:layout_width="wrap_content"

137
app/src/main/res/layout/activity_timer.xml
View File

@ -1,137 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/gradient_pink"
tools:context=".timer">
<TextView
android:id="@+id/textView"
android:layout_width="409dp"
android:layout_height="57dp"
android:layout_marginTop="50dp"
android:gravity="center"
android:text="Тренировка"
android:textAlignment="center"
android:textColor="#040405"
android:textSize="34sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/actions"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginBottom="100dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="16dp">
<ImageButton
android:id="@+id/play"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="#00FFFFFF"
app:srcCompat="@drawable/icon_play" />
<ImageButton
android:id="@+id/stop"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="#00FFFFFF"
app:srcCompat="@drawable/icon_stop" />
</LinearLayout>
<LinearLayout
android:id="@+id/main_timer"
android:layout_width="match_parent"
android:layout_height="360dp"
android:layout_marginBottom="99dp"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/actions"
tools:layout_editor_absoluteX="0dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="54dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textView10"
android:layout_width="548dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="Подход №"
android:textAlignment="textEnd"
android:textColor="#D0CBCB"
android:textSize="34sp" />
<TextView
android:id="@+id/number_set"
android:layout_width="400dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text=" 1"
android:textAlignment="viewStart"
android:textColor="#D0CBCB"
android:textSize="34sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="71dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textView11"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="Упражнение"
android:textAlignment="textEnd"
android:textColor="#D0CBCB"
android:textSize="34sp" />
<TextView
android:id="@+id/num_exercise"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:text=" 1"
android:textAlignment="viewStart"
android:textColor="#D0CBCB"
android:textSize="34sp" />
</LinearLayout>
<TextView
android:id="@+id/time"
android:layout_width="163dp"
android:layout_height="153dp"
android:layout_gravity="center"
android:gravity="center"
android:text="00:00"
android:textColor="#FFFFFF"
android:textSize="60sp" />
<TextView
android:id="@+id/work"
android:layout_width="match_parent"
android:layout_height="70dp"
android:gravity="center"
android:text="Работа"
android:textAlignment="center"
android:textColor="#D0CBCB"
android:textSize="34sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<foreground android:drawable="@mipmap/ic_icon"/>
</adaptive-icon>

2
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<foreground android:drawable="@mipmap/ic_icon"/>
</adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_icon.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_icon.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_icon.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.8 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_icon.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_icon.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

13
app/src/main/res/values/colors.xml
View File

@ -2,17 +2,4 @@
<resources>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="colorGradientPinkStart">#F54EA2</color>
<color name="colorGradientPinkStop">#FF7676</color>
<color name="colorGradientGreenStart">#42E695</color>
<color name="colorGradientGreenStop">#3BB2B8</color>
<color name="colorGradientBlueStart">#17EAD9</color>
<color name="colorGradientBlueStop">#6078EA</color>
<color name="colorGradientPurpureStart">#7C37D3</color>
<color name="colorGradientPurpureStop">#916AD3</color>
</resources>

2
app/src/main/res/values/ic_launcher_background.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#943DDC</color>
<color name="ic_launcher_background">#853DDC</color>
</resources>

3
app/src/main/res/values/strings.xml
View File

@ -1,4 +1,3 @@
<resources>
<string name="app_name">Timer</string>
<string name="upper_start">START</string>
<string name="app_name">TimerT</string>
</resources>

3
app/src/main/res/values/themes.xml
View File

@ -5,6 +5,5 @@
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
</style>
<style name="Theme.TimerT" parent="Theme.AppCompat.Light.NoActionBar" />
<style name="Theme.TimerT" parent="Base.Theme.TimerT" />
</resources>