stud179289/Timer
1
0
Fork 0
forked from stud179277/Timer
Code Pull Requests Activity

добавление упражнений для тренировки, отображение на форме

Browse Source
This commit is contained in:
stud179277
2025-05-12 17:25:07 +03:00
parent 0745430fad
commit a00d3b34b0
15 changed files with 392 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_all_training.xml
+7 -7
View File
@@ -11,7 +11,7 @@
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent">
@@ -31,7 +31,7 @@
android:layout_marginTop="20dp"
android:ems="10"
android:inputType="text"
android:text="Упражнение 1"
android:text="Упражнение"
android:textAlignment="center"
android:textSize="20sp" />
@@ -40,8 +40,8 @@
<LinearLayout
android:id="@+id/setting_training"
android:layout_width="match_parent"
android:layout_height="250dp"
android:layout_marginTop="37dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/linearLayout"
tools:layout_editor_absoluteX="16dp">
@@ -50,7 +50,7 @@
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Время работы"
android:text="Время работы, сек"
android:textAlignment="center"
android:textSize="24sp" />
@@ -93,13 +93,13 @@
android:id="@+id/textView8_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Отдых между упражнениями"
android:text="Отдых между упражнениями, сек"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="95dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
app/src/main/res/layout/activity_creating_training.xml
+43 -19
View File
@@ -11,7 +11,7 @@
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent">
@@ -28,10 +28,9 @@
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:text="Моя тренировка"
android:textAlignment="center"
android:textSize="20sp" />
@@ -40,11 +39,12 @@
<LinearLayout
android:id="@+id/setting_training"
android:layout_width="match_parent"
android:layout_height="220dp"
android:layout_marginTop="37dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/linearLayout"
tools:layout_editor_absoluteX="16dp">
app:layout_constraintBottom_toTopOf="@+id/exercise"
app:layout_constraintTop_toBottomOf="@+id/linearLayout">
<TextView
android:id="@+id/textView5"
@@ -57,7 +57,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<ImageView
@@ -89,6 +89,7 @@
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
<TextView
android:id="@+id/textView8"
android:layout_width="match_parent"
@@ -100,6 +101,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<ImageView
@@ -131,20 +133,41 @@
app:srcCompat="@drawable/ic_add_24px" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="19dp"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/exercise"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/frameLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.373"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/setting_training"
tools:layout_editor_absoluteX="0dp">
app:layout_constraintVertical_bias="0.178" />
<FrameLayout
android:id="@+id/frameLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent">
<Button
android:id="@+id/add_workout"
android:layout_width="176dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/green_rectangle"
android:gravity="center"
android:text="+ упражнение"
@@ -154,12 +177,13 @@
</FrameLayout>
<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginBottom="35dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent">
<Button
@@ -167,8 +191,8 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_weight="1"
android:background="@drawable/gradient_purpure"
android:text="на главную"
@@ -180,8 +204,8 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_weight="1"
android:background="@drawable/gradient_purpure"
android:text="Сохранить"
app/src/main/res/layout/activity_main.xml
+1 -1
View File
@@ -72,7 +72,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>
app/src/main/res/layout/resyclerview_item.xml
+39
View File
@@ -0,0 +1,39 @@
<?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:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp">
<LinearLayout
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#410F3FED"
android:orientation="horizontal"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<TextView
android:id="@+id/textView13"
android:layout_width="353dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="Название упражнения"
android:textColor="#000000"
android:textSize="18sp" />
<ImageButton
android:id="@+id/deleteButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="#00FFFFFF"
app:srcCompat="@android:drawable/ic_menu_delete" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>