From 683679737a57d4d5b4c59e100fc7d23d6fc5962d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Tue, 14 Nov 2023 22:00:48 +0300 Subject: [PATCH] lab 3 --- app/src/main/AndroidManifest.xml | 29 +++++ app/src/main/java/com/example/pizza/Auth.kt | 44 ++++++- .../main/java/com/example/pizza/ListPizza.kt | 42 ++++++- .../java/com/example/pizza/MainActivity.kt | 11 +- .../com/example/pizza/Model/Basket/Basket.kt | 54 +++++++++ .../example/pizza/Model/Basket/BasketDao.kt | 27 +++++ .../example/pizza/Model/Basket/PizzaBasket.kt | 4 + .../com/example/pizza/Model/HistoryAdapter.kt | 5 +- .../com/example/pizza/Model/Order/Order.kt | 65 ++++++++-- .../com/example/pizza/Model/Order/OrderDao.kt | 30 +++++ .../example/pizza/Model/Order/PizzaOrder.kt | 4 + .../com/example/pizza/Model/OrderAdapter.kt | 36 ++++-- .../pizza/Model/Pizza/ImageConverter.kt | 25 ++++ .../com/example/pizza/Model/Pizza/Pizza.kt | 45 +++++-- .../com/example/pizza/Model/Pizza/PizzaDao.kt | 26 ++++ .../example/pizza/Model/Pizza/Singleton.kt | 11 ++ .../com/example/pizza/Model/PizzaAdapter.kt | 34 ++++-- .../java/com/example/pizza/Model/User/User.kt | 38 +++++- .../com/example/pizza/Model/User/UserDao.kt | 31 +++++ app/src/main/java/com/example/pizza/Reg.kt | 53 ++++++++- app/src/main/java/com/example/pizza/crate.kt | 78 ++++++++++-- .../java/com/example/pizza/create_pizza.kt | 48 +++++++- .../com/example/pizza/database/AppDatabase.kt | 112 ++++++++++++++++++ .../java/com/example/pizza/myViewModel.kt | 20 ++++ app/src/main/java/com/example/pizza/user.kt | 52 ++++++-- app/src/main/res/drawable/pizza2.jpg | Bin 0 -> 300320 bytes app/src/main/res/drawable/trash.png | Bin 0 -> 535 bytes app/src/main/res/layout/fragment_auth.xml | 5 +- app/src/main/res/layout/fragment_crate.xml | 1 + .../main/res/layout/fragment_list_pizza.xml | 3 +- app/src/main/res/layout/fragment_reg.xml | 7 +- app/src/main/res/layout/fragment_user.xml | 4 +- app/src/main/res/layout/history_list.xml | 13 +- app/src/main/res/layout/table_order.xml | 18 ++- app/src/main/res/navigation/nav_graph.xml | 32 ++++- 35 files changed, 901 insertions(+), 106 deletions(-) create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/example/pizza/Model/Basket/Basket.kt create mode 100644 app/src/main/java/com/example/pizza/Model/Basket/BasketDao.kt create mode 100644 app/src/main/java/com/example/pizza/Model/Basket/PizzaBasket.kt create mode 100644 app/src/main/java/com/example/pizza/Model/Order/OrderDao.kt create mode 100644 app/src/main/java/com/example/pizza/Model/Order/PizzaOrder.kt create mode 100644 app/src/main/java/com/example/pizza/Model/Pizza/ImageConverter.kt create mode 100644 app/src/main/java/com/example/pizza/Model/Pizza/PizzaDao.kt create mode 100644 app/src/main/java/com/example/pizza/Model/Pizza/Singleton.kt create mode 100644 app/src/main/java/com/example/pizza/Model/User/UserDao.kt create mode 100644 app/src/main/java/com/example/pizza/database/AppDatabase.kt create mode 100644 app/src/main/java/com/example/pizza/myViewModel.kt create mode 100644 app/src/main/res/drawable/pizza2.jpg create mode 100644 app/src/main/res/drawable/trash.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..2d5d92b --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/pizza/Auth.kt b/app/src/main/java/com/example/pizza/Auth.kt index 93bfe23..ad4cfd8 100644 --- a/app/src/main/java/com/example/pizza/Auth.kt +++ b/app/src/main/java/com/example/pizza/Auth.kt @@ -1,33 +1,67 @@ package com.example.pizza +import android.annotation.SuppressLint import android.os.Bundle -import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Button import android.widget.TextView +import android.widget.Toast +import androidx.fragment.app.Fragment +import androidx.fragment.app.activityViewModels +import androidx.fragment.app.viewModels +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelStore +import androidx.lifecycle.ViewModelStoreOwner import androidx.navigation.Navigation +import com.example.pizza.Model.User.UserDao +import com.example.pizza.database.AppDatabase +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.schedulers.Schedulers class Auth : Fragment() { - + private var userDao: UserDao? = null override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { + // Inflate the layout for this fragment + userDao = context?.let { AppDatabase.getInstance(it).userDao() } val view = inflater.inflate(R.layout.fragment_auth, container, false) view.findViewById