From 31d77a7d8cecbfe07cf8402d0d314381a04ec05c Mon Sep 17 00:00:00 2001
From: Egorick <112876399+Vooidss@users.noreply.github.com>
Date: Mon, 5 May 2025 15:03:43 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=B5=D0=BB=20home=20act?=
 =?UTF-8?q?ivity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.name                                   |  1 +
 .idea/gradle.xml                              |  1 +
 .idea/material_theme_project_new.xml          | 12 ++++++
 .idea/misc.xml                                |  1 -
 app/src/main/AndroidManifest.xml              |  1 +
 .../Activity/BottomPanelActivity.kt           | 39 -----------------
 .../Activity/ForgetPasswordActivity.kt        |  3 +-
 .../projectfigma/Activity/HomeActivity.kt     | 19 ++++++++
 .../projectfigma/Activity/LogActivity.kt      |  9 +---
 .../projectfigma/Activity/RegActivity.kt      |  6 +--
 .../Fragments/BottomPanelActivity.kt          | 43 +++++++++++++++++++
 app/src/main/res/layout/activity_home.xml     |  9 +++-
 app/src/main/res/layout/activity_log.xml      |  1 -
 13 files changed, 90 insertions(+), 55 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 .idea/material_theme_project_new.xml
 delete mode 100644 app/src/main/java/com/example/projectfigma/Activity/BottomPanelActivity.kt
 create mode 100644 app/src/main/java/com/example/projectfigma/Activity/HomeActivity.kt
 create mode 100644 app/src/main/java/com/example/projectfigma/Fragments/BottomPanelActivity.kt

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..7768000
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+projectFigma
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97f0a8e..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
new file mode 100644
index 0000000..6c6b061
--- /dev/null
+++ b/.idea/material_theme_project_new.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="-30e50ac1:19591310c4f:-7ffe" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?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">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9c9b106..28f9a39 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
         <activity android:name=".Activity.WelcomeActivity"/>
         <activity android:name=".Activity.LogActivity"/>
         <activity android:name=".Activity.RegActivity"/>
+        <activity android:name=".Activity.HomeActivity"/>
         <activity android:name=".Activity.ForgetPasswordActivity"/>
 
         <meta-data
diff --git a/app/src/main/java/com/example/projectfigma/Activity/BottomPanelActivity.kt b/app/src/main/java/com/example/projectfigma/Activity/BottomPanelActivity.kt
deleted file mode 100644
index 8b663f9..0000000
--- a/app/src/main/java/com/example/projectfigma/Activity/BottomPanelActivity.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.example.projectfigma.Activity
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import androidx.fragment.app.Fragment
-import com.example.projectfigma.R
-
-class BottomPanelActivity : Fragment(){
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Надуваем макет фрагмента
-        return inflater.inflate(R.layout.activity_bottom_panel, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        // Получаем ссылки на элементы
-        val navHome = view.findViewById<ImageView>(R.id.nav_home)
-        val navFood = view.findViewById<ImageView>(R.id.nav_food)
-        val navFav = view.findViewById<ImageView>(R.id.nav_fav)
-        val navList = view.findViewById<ImageView>(R.id.nav_list)
-        val navSupport = view.findViewById<ImageView>(R.id.nav_support)
-
-        // Устанавливаем обработчики кликов
-        /*
-        navHome.setOnClickListener { switchFragment(HomeFragment()) }
-        navFood.setOnClickListener { switchFragment(FoodFragment()) }
-        navFav.setOnClickListener { switchFragment(FavoritesFragment()) }
-        navList.setOnClickListener { switchFragment(OrdersFragment()) }
-        navSupport.setOnClickListener { switchFragment(SupportFragment()) }
-         */
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projectfigma/Activity/ForgetPasswordActivity.kt b/app/src/main/java/com/example/projectfigma/Activity/ForgetPasswordActivity.kt
index c56f8b1..b07e693 100644
--- a/app/src/main/java/com/example/projectfigma/Activity/ForgetPasswordActivity.kt
+++ b/app/src/main/java/com/example/projectfigma/Activity/ForgetPasswordActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.projectfigma.DataBase.DataBase
+import com.example.projectfigma.Fragments.BottomPanelFragment
 import com.example.projectfigma.R
 import com.example.projectfigma.Util.Password
 import com.example.projectfigma.databinding.ActivityForgetPasswordBinding
@@ -22,7 +23,7 @@ class ForgetPasswordActivity : AppCompatActivity() {
         val dateBase = DataBase.getDb(this)
 
         supportFragmentManager.beginTransaction()
-            .replace(R.id.buttonPanel, BottomPanelActivity())
+            .replace(R.id.buttonPanel, BottomPanelFragment())
             .commit()
 
         Password.setIsVisable(binding.passwordEditText)
diff --git a/app/src/main/java/com/example/projectfigma/Activity/HomeActivity.kt b/app/src/main/java/com/example/projectfigma/Activity/HomeActivity.kt
new file mode 100644
index 0000000..801a8d5
--- /dev/null
+++ b/app/src/main/java/com/example/projectfigma/Activity/HomeActivity.kt
@@ -0,0 +1,19 @@
+package com.example.projectfigma.Activity
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.example.projectfigma.Fragments.BottomPanelFragment
+import com.example.projectfigma.R
+
+class HomeActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_home)
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.buttonPanel, BottomPanelFragment())
+            .commit()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projectfigma/Activity/LogActivity.kt b/app/src/main/java/com/example/projectfigma/Activity/LogActivity.kt
index b8053ed..20ab18f 100644
--- a/app/src/main/java/com/example/projectfigma/Activity/LogActivity.kt
+++ b/app/src/main/java/com/example/projectfigma/Activity/LogActivity.kt
@@ -1,19 +1,14 @@
 package com.example.projectfigma.Activity
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import android.provider.ContactsContract.Data
-import android.text.InputType
-import android.view.MotionEvent
-import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.projectfigma.DataBase.DataBase
+import com.example.projectfigma.Fragments.BottomPanelFragment
 import com.example.projectfigma.R
 import com.example.projectfigma.Util.Password
 import com.example.projectfigma.databinding.ActivityLogBinding
-import kotlin.concurrent.Volatile
 
 class LogActivity : AppCompatActivity() {
 
@@ -29,7 +24,7 @@ class LogActivity : AppCompatActivity() {
         val dataBase = DataBase.getDb(this)
 
         supportFragmentManager.beginTransaction()
-            .replace(R.id.buttonPanel, BottomPanelActivity())
+            .replace(R.id.buttonPanel, BottomPanelFragment())
             .commit()
 
         Password.setIsVisable(binding.passwordEditText)
diff --git a/app/src/main/java/com/example/projectfigma/Activity/RegActivity.kt b/app/src/main/java/com/example/projectfigma/Activity/RegActivity.kt
index 475d05b..f10d677 100644
--- a/app/src/main/java/com/example/projectfigma/Activity/RegActivity.kt
+++ b/app/src/main/java/com/example/projectfigma/Activity/RegActivity.kt
@@ -1,16 +1,14 @@
 package com.example.projectfigma.Activity
 
-import android.annotation.SuppressLint
 import android.app.DatePickerDialog
 import android.content.Intent
 import android.os.Bundle
-import android.text.InputType
-import android.view.MotionEvent
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.projectfigma.DataBase.DataBase
 import com.example.projectfigma.Entites.User
+import com.example.projectfigma.Fragments.BottomPanelFragment
 import com.example.projectfigma.R
 import com.example.projectfigma.Util.Password
 import com.example.projectfigma.databinding.ActivityRegBinding
@@ -37,7 +35,7 @@ class RegActivity() : AppCompatActivity(){
         Reg(binding, dateBase)
 
         supportFragmentManager.beginTransaction()
-            .replace(R.id.buttonPanel, BottomPanelActivity())
+            .replace(R.id.buttonPanel, BottomPanelFragment())
             .commit()
 
          passwordEditText = binding.passwordEditText
diff --git a/app/src/main/java/com/example/projectfigma/Fragments/BottomPanelActivity.kt b/app/src/main/java/com/example/projectfigma/Fragments/BottomPanelActivity.kt
new file mode 100644
index 0000000..342efb1
--- /dev/null
+++ b/app/src/main/java/com/example/projectfigma/Fragments/BottomPanelActivity.kt
@@ -0,0 +1,43 @@
+package com.example.projectfigma.Fragments
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.fragment.app.Fragment
+import com.example.projectfigma.Activity.HomeActivity
+import com.example.projectfigma.R
+
+class BottomPanelFragment : Fragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = inflater.inflate(R.layout.activity_bottom_panel, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val navHome     = view.findViewById<ImageView>(R.id.nav_home)
+        val navFood     = view.findViewById<ImageView>(R.id.nav_food)
+        val navFav      = view.findViewById<ImageView>(R.id.nav_fav)
+        val navList     = view.findViewById<ImageView>(R.id.nav_list)
+        val navSupport  = view.findViewById<ImageView>(R.id.nav_support)
+
+        navHome    .setOnClickListener { openActivity(HomeActivity::class.java) }
+      /**
+        navFood    .setOnClickListener { openActivity(FoodActivity::class.java) }
+        navFav     .setOnClickListener { openActivity(FavoritesActivity::class.java) }
+        navList    .setOnClickListener { openActivity(OrdersActivity::class.java) }
+        navSupport .setOnClickListener { openActivity(SupportActivity::class.java) }
+    **/
+        }
+
+    private fun <T> openActivity(activityClass: Class<T>) {
+        val ctx = requireContext()
+        val intent = Intent(ctx, activityClass)
+        startActivity(intent)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 62a5a62..483ec3e 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -28,8 +28,12 @@
             android:textColor="#3B1B0E"
             android:textColorHint="@color/shadow_black"
             android:textSize="16sp"
-            tools:layout_editor_absoluteX="38dp"
-            tools:layout_editor_absoluteY="38dp" />
+            app:layout_constraintBottom_toTopOf="@+id/textView"
+            app:layout_constraintEnd_toStartOf="@+id/linearLayout"
+            app:layout_constraintHorizontal_bias="0.322"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0" />
 
         <TextView
             android:id="@+id/textView"
@@ -60,6 +64,7 @@
 
 
         <LinearLayout
+            android:id="@+id/linearLayout"
             android:layout_width="100dp"
             android:layout_height="24dp"
             android:orientation="horizontal"
diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml
index 2f753b8..6f413c4 100644
--- a/app/src/main/res/layout/activity_log.xml
+++ b/app/src/main/res/layout/activity_log.xml
@@ -2,7 +2,6 @@
 <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/goToSignUp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/background"

From 46331f5c64b441f19ca97c668283ac636ee15bf2 Mon Sep 17 00:00:00 2001
From: Svyatoslav <forea.adoxid@gmail.com>
Date: Mon, 5 May 2025 15:05:33 +0300
Subject: [PATCH 2/2] Update .gitignore

---
 .gitignore | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa724b7..ad7edbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,10 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+.idea