From 88c61ded49d2dc6139c24a61dcfa25f53905c237 Mon Sep 17 00:00:00 2001 From: Hells Hound Date: Wed, 11 Oct 2023 11:58:06 +0400 Subject: [PATCH] dd --- AppMobile/app/src/main/AndroidManifest.xml | 3 + .../example/appmobile/NavigationFragment.java | 7 +++ .../com/example/appmobile/TasksActivity.java | 3 +- .../com/example/appmobile/TicksActivity.java | 14 +++++ AppMobile/app/src/main/res/drawable/add_b.png | Bin 0 -> 21637 bytes .../src/main/res/drawable/back_add_btn.xml | 13 +++++ .../src/main/res/drawable/rounded_corner.xml | 16 ++++++ .../src/main/res/layout/activity_tasks.xml | 16 +++++- .../src/main/res/layout/activity_ticks.xml | 52 ++++++++++++++++++ AppMobile/app/src/main/res/values/strings.xml | 4 ++ 10 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 AppMobile/app/src/main/java/com/example/appmobile/TicksActivity.java create mode 100644 AppMobile/app/src/main/res/drawable/add_b.png create mode 100644 AppMobile/app/src/main/res/drawable/back_add_btn.xml create mode 100644 AppMobile/app/src/main/res/drawable/rounded_corner.xml create mode 100644 AppMobile/app/src/main/res/layout/activity_ticks.xml diff --git a/AppMobile/app/src/main/AndroidManifest.xml b/AppMobile/app/src/main/AndroidManifest.xml index 63b7028..b80b598 100644 --- a/AppMobile/app/src/main/AndroidManifest.xml +++ b/AppMobile/app/src/main/AndroidManifest.xml @@ -12,6 +12,9 @@ android:supportsRtl="true" android:theme="@style/Theme.AppMobile" tools:targetApi="31"> + diff --git a/AppMobile/app/src/main/java/com/example/appmobile/NavigationFragment.java b/AppMobile/app/src/main/java/com/example/appmobile/NavigationFragment.java index f239df2..27396f7 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/NavigationFragment.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/NavigationFragment.java @@ -30,6 +30,13 @@ public class NavigationFragment extends Fragment { Intent intent = new Intent(getActivity(), ProfileActivity.class); startActivity(intent); }); + + ImageButton ticks = v.findViewById(R.id.btn_idea); + ticks.setOnClickListener(view -> { + Intent intent = new Intent(getActivity(), TicksActivity.class); + startActivity(intent); + }); + return v; } } \ No newline at end of file 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 996af59..9a18074 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java @@ -1,7 +1,6 @@ package com.example.appmobile; import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import android.content.Intent; @@ -22,7 +21,7 @@ public class TasksActivity extends AppCompatActivity { btn_open = findViewById(R.id.btn_open); btn_closed = findViewById(R.id.btn_closed); - navBarFrameLayout = findViewById(R.id.nav_bar); + navBarFrameLayout = findViewById(R.id.nav_bar_ticks); NavigationFragment navBar = new NavigationFragment(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); diff --git a/AppMobile/app/src/main/java/com/example/appmobile/TicksActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/TicksActivity.java new file mode 100644 index 0000000..71be073 --- /dev/null +++ b/AppMobile/app/src/main/java/com/example/appmobile/TicksActivity.java @@ -0,0 +1,14 @@ +package com.example.appmobile; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class TicksActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_ticks); + } +} \ No newline at end of file diff --git a/AppMobile/app/src/main/res/drawable/add_b.png b/AppMobile/app/src/main/res/drawable/add_b.png new file mode 100644 index 0000000000000000000000000000000000000000..a91f612d34992ec6b33ebe464c21effa0eeb5a4c GIT binary patch literal 21637 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 literal 0 HcmV?d00001 diff --git a/AppMobile/app/src/main/res/drawable/back_add_btn.xml b/AppMobile/app/src/main/res/drawable/back_add_btn.xml new file mode 100644 index 0000000..47a074c --- /dev/null +++ b/AppMobile/app/src/main/res/drawable/back_add_btn.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/AppMobile/app/src/main/res/drawable/rounded_corner.xml b/AppMobile/app/src/main/res/drawable/rounded_corner.xml new file mode 100644 index 0000000..3809381 --- /dev/null +++ b/AppMobile/app/src/main/res/drawable/rounded_corner.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 454efcb..6999d89 100644 --- a/AppMobile/app/src/main/res/layout/activity_tasks.xml +++ b/AppMobile/app/src/main/res/layout/activity_tasks.xml @@ -31,7 +31,7 @@ app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/AppMobile/app/src/main/res/layout/activity_ticks.xml b/AppMobile/app/src/main/res/layout/activity_ticks.xml new file mode 100644 index 0000000..799b64a --- /dev/null +++ b/AppMobile/app/src/main/res/layout/activity_ticks.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + \ 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 e76d4cb..ae77678 100644 --- a/AppMobile/app/src/main/res/values/strings.xml +++ b/AppMobile/app/src/main/res/values/strings.xml @@ -37,4 +37,8 @@ PROFILE DELETE PROFILE + + TICKS + + \ No newline at end of file