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 0000000..bf23319 Binary files /dev/null and b/AppMobile/app/src/main/res/drawable/arrow_left.png differ diff --git a/AppMobile/app/src/main/res/drawable/arrow_right.png b/AppMobile/app/src/main/res/drawable/arrow_right.png new file mode 100644 index 0000000..1f7d441 Binary files /dev/null and b/AppMobile/app/src/main/res/drawable/arrow_right.png differ 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 @@ - -