From 5f3e35ae00bee26f63d466af0936f0259ae87877 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 11 Oct 2023 16:37:09 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D1=88=D1=82?= =?UTF-8?q?=D1=83=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/appmobile/TasksActivity.java | 20 +++++- .../com/example/appmobile/TicksActivity.java | 33 ++++++++++ .../app/src/main/res/drawable/active_back.xml | 6 ++ .../app/src/main/res/drawable/arrow_left.png | Bin 0 -> 3046 bytes .../app/src/main/res/drawable/arrow_right.png | Bin 0 -> 2556 bytes .../src/main/res/drawable/not_active_back.xml | 16 +++++ .../src/main/res/layout/activity_tasks.xml | 9 +-- .../src/main/res/layout/activity_ticks.xml | 61 +++++++++++++++--- .../app/src/main/res/values-night/themes.xml | 2 +- AppMobile/app/src/main/res/values/colors.xml | 1 + AppMobile/app/src/main/res/values/strings.xml | 3 + AppMobile/app/src/main/res/values/themes.xml | 4 +- 12 files changed, 138 insertions(+), 17 deletions(-) create mode 100644 AppMobile/app/src/main/res/drawable/active_back.xml create mode 100644 AppMobile/app/src/main/res/drawable/arrow_left.png create mode 100644 AppMobile/app/src/main/res/drawable/arrow_right.png create mode 100644 AppMobile/app/src/main/res/drawable/not_active_back.xml diff --git a/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java index 9a18074..3ec8a00 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java @@ -3,6 +3,7 @@ package com.example.appmobile; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentTransaction; +import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.view.View; @@ -29,12 +30,27 @@ public class TasksActivity extends AppCompatActivity { ft.commit(); } + @SuppressLint("UseCompatLoadingForDrawables") public void showOpen(View v){ - Intent intent = new Intent(this, RegistrationActivity.class); - startActivity(intent); + btn_open.setBackground(getDrawable(R.drawable.active_back)); + btn_open.setTextColor(getColorStateList(R.color.white)); + + btn_closed.setBackground(getDrawable(R.drawable.not_active_back)); + btn_closed.setTextColor(getColorStateList(R.color.main_grey)); + + + Intent intent = new Intent(this, RegistrationActivity.class); + startActivity(intent); } + @SuppressLint("UseCompatLoadingForDrawables") public void showClosed(View v){ + btn_closed.setBackground(getDrawable(R.drawable.active_back)); + btn_closed.setTextColor(getColorStateList(R.color.white)); + + btn_open.setBackground(getDrawable(R.drawable.not_active_back)); + btn_open.setTextColor(getColorStateList(R.color.main_grey)); + Intent intent = new Intent(this, RegistrationActivity.class); startActivity(intent); } diff --git a/AppMobile/app/src/main/java/com/example/appmobile/TicksActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/TicksActivity.java index 71be073..0545698 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/TicksActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/TicksActivity.java @@ -2,13 +2,46 @@ package com.example.appmobile; import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.TextView; public class TicksActivity extends AppCompatActivity { + private TextView tick; + private int temp = -1; + private String[] ticks = new String[]{"hfsehg sehgkjdhgkj sdhg kjdfhgjkdfhg jkdhf gkj dfhgkjdfhgkjhkr hgrug hdfghfkjghkjdfg hkd fjhgskjdfhgkjdshfg k jhdrk jghkdrjghk djfhg dfbgfdbghgdrg", + "dfhsdhf shfeuihfush fhskjfeh ieufh sdhfhsefsghfegh fh sodfheh fkshfuisegts egh;a rhega;gh eraugh ghehgsojdhgejhgkejgh kdghdfkjghdkrgh drdh gshelosehf sie toisyotisdgsdg s", + "elfhs ;;oeihftehtughshs fls heuf dkh gsdgjfgnvdfjk vbv seyfg dhgfhdf sdxdfjbfhbvryglauerheufhsofhekhf shfehfkjshf ksdhfghjkfhgkrtjhgkrdjhg djfghslkhef kdj fhskefush turghsdurg"}; + @Override protected void onCreate(Bundle savedInstanceState) { + tick = findViewById(R.id.text_ticks); + temp = 0; + tick.setText(ticks[temp++]); + super.onCreate(savedInstanceState); setContentView(R.layout.activity_ticks); } + + public void onRight(View v){ + if(temp < ticks.length) + tick.setText(ticks[temp++]); + + else{ + temp = 0; + tick.setText(ticks[temp++]); + } + } + + public void onLeft(View v){ + if(temp >= 0) + tick.setText(ticks[temp--]); + + else{ + temp = ticks.length - 1; + tick.setText(ticks[temp--]); + } + } } \ No newline at end of file diff --git a/AppMobile/app/src/main/res/drawable/active_back.xml b/AppMobile/app/src/main/res/drawable/active_back.xml new file mode 100644 index 0000000..4d9618a --- /dev/null +++ b/AppMobile/app/src/main/res/drawable/active_back.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/AppMobile/app/src/main/res/drawable/arrow_left.png b/AppMobile/app/src/main/res/drawable/arrow_left.png new file mode 100644 index 0000000000000000000000000000000000000000..bf23319aa77f583586b7c6c7c224a6430fb73831 GIT binary patch literal 3046 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 literal 0 HcmV?d00001 diff --git a/AppMobile/app/src/main/res/drawable/not_active_back.xml b/AppMobile/app/src/main/res/drawable/not_active_back.xml new file mode 100644 index 0000000..852cd8a --- /dev/null +++ b/AppMobile/app/src/main/res/drawable/not_active_back.xml @@ -0,0 +1,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/AppMobile/app/src/main/res/layout/activity_tasks.xml b/AppMobile/app/src/main/res/layout/activity_tasks.xml index 6999d89..2df1cab 100644 --- a/AppMobile/app/src/main/res/layout/activity_tasks.xml +++ b/AppMobile/app/src/main/res/layout/activity_tasks.xml @@ -50,24 +50,25 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/line"> - - - + app:layout_constraintTop_toBottomOf="@+id/line_ticks" + app:layout_constraintVertical_bias="0.094" + app:srcCompat="@drawable/rounded_corner" + android:contentDescription="@string/ticks_back" /> + + + + + + \ No newline at end of file diff --git a/AppMobile/app/src/main/res/values-night/themes.xml b/AppMobile/app/src/main/res/values-night/themes.xml index deb69c8..ec5f481 100644 --- a/AppMobile/app/src/main/res/values-night/themes.xml +++ b/AppMobile/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ - diff --git a/AppMobile/app/src/main/res/values/colors.xml b/AppMobile/app/src/main/res/values/colors.xml index 3635c94..196e4cf 100644 --- a/AppMobile/app/src/main/res/values/colors.xml +++ b/AppMobile/app/src/main/res/values/colors.xml @@ -8,4 +8,5 @@ #bbf39b #949494 + #00000000 \ No newline at end of file diff --git a/AppMobile/app/src/main/res/values/strings.xml b/AppMobile/app/src/main/res/values/strings.xml index ae77678..53fc12c 100644 --- a/AppMobile/app/src/main/res/values/strings.xml +++ b/AppMobile/app/src/main/res/values/strings.xml @@ -40,5 +40,8 @@ TICKS + ticks_back + arrow_right + arrow_left \ No newline at end of file diff --git a/AppMobile/app/src/main/res/values/themes.xml b/AppMobile/app/src/main/res/values/themes.xml index 6c11d92..cad03f1 100644 --- a/AppMobile/app/src/main/res/values/themes.xml +++ b/AppMobile/app/src/main/res/values/themes.xml @@ -1,9 +1,9 @@ - -