From ebcb278d5c14a647a5456f6307c951fdc96809bb Mon Sep 17 00:00:00 2001 From: iamwhoiam0 Date: Sun, 20 Apr 2025 17:21:13 +0300 Subject: [PATCH 1/3] designed the auth panel --- app/build.gradle | 1 - .../main/res/drawable/show_password_icon.xml | 9 ++ app/src/main/res/layout/dialog_signin.xml | 104 +++++++++++++++++- app/src/main/res/values-night/colors.xml | 12 ++ app/src/main/res/values/colors.xml | 10 ++ app/src/main/res/values/strings.xml | 4 + 6 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/show_password_icon.xml create mode 100644 app/src/main/res/values-night/colors.xml diff --git a/app/build.gradle b/app/build.gradle index debcfaf..de9032f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,6 @@ android { targetSdk 35 versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/res/drawable/show_password_icon.xml b/app/src/main/res/drawable/show_password_icon.xml new file mode 100644 index 0000000..0e92704 --- /dev/null +++ b/app/src/main/res/drawable/show_password_icon.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/dialog_signin.xml b/app/src/main/res/layout/dialog_signin.xml index 77d9ef6..51b51ee 100644 --- a/app/src/main/res/layout/dialog_signin.xml +++ b/app/src/main/res/layout/dialog_signin.xml @@ -1,6 +1,108 @@ + android:layout_height="match_parent" + android:background="@color/surface_container_high" + android:padding="16dp" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..a8a90fd --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,12 @@ + + + #C4C6CF + #E1E2E9 + #8E9199 + #A7C8FF + #33353A + #111318 + #BDC7DC + #111318 + #282A2F + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..2203d54 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,14 @@ #FF018786 #FF000000 #FFFFFFFF + + #43474E + #191C20 + #74777F + #3E5F90 + #E1E2E9 + #F9F9FF + #555F71 + #F9F9FF + #E7E8EE \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a7036ac..d5c49dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,7 @@ View & Resources + Login + Password + Reset my password + Cancel \ No newline at end of file From b78de6fbc81e6c67a05db22168be3cd5fb601b3e Mon Sep 17 00:00:00 2001 From: iamwhoiam0 Date: Sun, 4 May 2025 12:34:37 +0300 Subject: [PATCH 2/3] designed the cart activity --- app/build.gradle | 8 +- .../homework/viewandresources/CartActivity.kt | 62 ++++++- .../viewandresources/CartItemViewHolder.kt | 31 ++++ .../gpb/homework/viewandresources/ItemCart.kt | 9 + .../viewandresources/ItemCartAdapter.kt | 25 +++ app/src/main/res/drawable/back_button.xml | 9 + app/src/main/res/drawable/cancel_button.xml | 9 + .../res/drawable/close_circle_outline.xml | 9 + app/src/main/res/drawable/item_img.png | Bin 0 -> 3082 bytes app/src/main/res/drawable/smile.xml | 9 + app/src/main/res/layout/activity_cart.xml | 157 ++++++++++++++++++ app/src/main/res/layout/item_layout_cart.xml | 60 +++++++ app/src/main/res/values-night/colors.xml | 4 + app/src/main/res/values/colors.xml | 4 + app/src/main/res/values/strings.xml | 8 + 15 files changed, 400 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/otus/gpb/homework/viewandresources/CartItemViewHolder.kt create mode 100644 app/src/main/java/otus/gpb/homework/viewandresources/ItemCart.kt create mode 100644 app/src/main/java/otus/gpb/homework/viewandresources/ItemCartAdapter.kt create mode 100644 app/src/main/res/drawable/back_button.xml create mode 100644 app/src/main/res/drawable/cancel_button.xml create mode 100644 app/src/main/res/drawable/close_circle_outline.xml create mode 100644 app/src/main/res/drawable/item_img.png create mode 100644 app/src/main/res/drawable/smile.xml create mode 100644 app/src/main/res/layout/item_layout_cart.xml diff --git a/app/build.gradle b/app/build.gradle index de9032f..a4ea930 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,11 +28,15 @@ android { kotlinOptions { jvmTarget = '17' } + buildFeatures{ + viewBinding = true + } } dependencies { - implementation 'androidx.core:core-ktx:1.15.0' + implementation 'androidx.core:core-ktx:1.16.0' implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'com.google.android.material:material:1.12.0' - implementation 'androidx.constraintlayout:constraintlayout:2.2.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' + implementation 'androidx.recyclerview:recyclerview:1.4.0' } \ No newline at end of file diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt index b6cbf73..ca0891a 100644 --- a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt +++ b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt @@ -1,11 +1,69 @@ package otus.gpb.homework.viewandresources -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.ContextCompat +import com.google.android.material.divider.MaterialDividerItemDecoration +import otus.gpb.homework.viewandresources.databinding.ActivityCartBinding class CartActivity : AppCompatActivity() { + + private val listItem = mutableListOf() + private val binding by lazy { + ActivityCartBinding.inflate(layoutInflater) + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_cart) + setContentView(binding.root) + + binding.backBtn.setOnClickListener { + finish() + } + + createListCartItem() + val adapter = ItemCartAdapter() + adapter.items = listItem + binding.counterLabel.text = String.format( + this.resources.getString(R.string.counterLabel), + adapter.items.size + ) + val dividerItemDecoration = MaterialDividerItemDecoration(binding.recyclerViewCartList.context, MaterialDividerItemDecoration.VERTICAL) + dividerItemDecoration.setDividerColor(ContextCompat.getColor(applicationContext, R.color.outline_variant)) + dividerItemDecoration.dividerThickness = 2 + dividerItemDecoration.isLastItemDecorated = true + + binding.recyclerViewCartList.addItemDecoration(dividerItemDecoration) + binding.recyclerViewCartList.adapter = adapter + + val pricePair = calculateOrderPrice(listItem) + binding.taxPrice.text = String.format(this.resources.getString(R.string.price), TAX_PRICE) + binding.shippingPrice.text = String.format(this.resources.getString(R.string.price), SHIPPING_PRICE) + binding.subtotalPrice.text = String.format(this.resources.getString(R.string.price), pricePair.second) + binding.totalPrice.text = String.format(this.resources.getString(R.string.price), pricePair.first) + } + + private fun createListCartItem() { + for(i in 1..5){ + val cartItem = ItemCart(i, 35, CATEGORY, DESCRIPTION, IMAGE) + listItem.add(cartItem) + } + } + + private fun calculateOrderPrice(listItem: MutableList):Pair{ + var totalPrice = TAX_PRICE + SHIPPING_PRICE + var subtotalPrice = 0.0 + listItem.forEach { subtotalPrice += it.price } + totalPrice +=subtotalPrice + return Pair(totalPrice,subtotalPrice) + } + + companion object{ + private const val DESCRIPTION = "Supporting line text lorem ipsum dolor sit amet, consectetur." + private const val CATEGORY = "Category" + private const val IMAGE = "drawable/food_steak" + + private const val TAX_PRICE = 10.5 + private const val SHIPPING_PRICE = 25.0 } } \ No newline at end of file diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/CartItemViewHolder.kt b/app/src/main/java/otus/gpb/homework/viewandresources/CartItemViewHolder.kt new file mode 100644 index 0000000..b292650 --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/viewandresources/CartItemViewHolder.kt @@ -0,0 +1,31 @@ +package otus.gpb.homework.viewandresources + +import android.view.View +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView + +class CartItemViewHolder(view: View): RecyclerView.ViewHolder(view){ + + private val categoryText:TextView by lazy { view.findViewById(R.id.categoryText) } + private val supportingText:TextView by lazy { view.findViewById(R.id.supportingText) } + private val priceText:TextView by lazy { view.findViewById(R.id.priceText) } + private val nameItemText:TextView by lazy { view.findViewById(R.id.nameItemText) } + private val itemImage:ImageView by lazy { view.findViewById(R.id.itemImage) } + + private val maxLength = 32 + + fun bind(itemCart: ItemCart){ + nameItemText.text = String.format(itemView.context.resources.getString(R.string.nameItemText), itemCart.id) + categoryText.text = String.format(itemView.context.resources.getString(R.string.categoryText), itemCart.category) + supportingText.text = + if (itemCart.supportingText.length > maxLength) { + itemCart.supportingText.substring(0, maxLength) + "..." + }else{ + itemCart.supportingText + } + priceText.text = String.format(itemView.context.resources.getString(R.string.priceText), itemCart.price) + } + + +} \ No newline at end of file diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/ItemCart.kt b/app/src/main/java/otus/gpb/homework/viewandresources/ItemCart.kt new file mode 100644 index 0000000..8800cb0 --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/viewandresources/ItemCart.kt @@ -0,0 +1,9 @@ +package otus.gpb.homework.viewandresources + +data class ItemCart( + val id: Int, + val price: Int, + val category: String, + val supportingText: String, + val logo: String +) \ No newline at end of file diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/ItemCartAdapter.kt b/app/src/main/java/otus/gpb/homework/viewandresources/ItemCartAdapter.kt new file mode 100644 index 0000000..0fdba7f --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/viewandresources/ItemCartAdapter.kt @@ -0,0 +1,25 @@ +package otus.gpb.homework.viewandresources + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView + +class ItemCartAdapter: RecyclerView.Adapter() { + + var items = listOf() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CartItemViewHolder { + val view = LayoutInflater.from(parent.context).inflate(R.layout.item_layout_cart, parent, false) + return CartItemViewHolder(view) + } + + override fun onBindViewHolder(holder: CartItemViewHolder, position: Int) { + val cartItem: ItemCart = items[position] + holder.bind(cartItem) + } + + override fun getItemCount(): Int { + return items.size + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/back_button.xml b/app/src/main/res/drawable/back_button.xml new file mode 100644 index 0000000..af9a59b --- /dev/null +++ b/app/src/main/res/drawable/back_button.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/cancel_button.xml b/app/src/main/res/drawable/cancel_button.xml new file mode 100644 index 0000000..b6fed4f --- /dev/null +++ b/app/src/main/res/drawable/cancel_button.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/close_circle_outline.xml b/app/src/main/res/drawable/close_circle_outline.xml new file mode 100644 index 0000000..1a51e0a --- /dev/null +++ b/app/src/main/res/drawable/close_circle_outline.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/item_img.png b/app/src/main/res/drawable/item_img.png new file mode 100644 index 0000000000000000000000000000000000000000..4203cbdebd9fd9ed95e5a908235e9b82998dd420 GIT binary patch literal 3082 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 + + diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml index 57dc4d4..fa67c2b 100644 --- a/app/src/main/res/layout/activity_cart.xml +++ b/app/src/main/res/layout/activity_cart.xml @@ -4,6 +4,163 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/background" tools:context=".CartActivity"> + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_layout_cart.xml b/app/src/main/res/layout/item_layout_cart.xml new file mode 100644 index 0000000..f7c3158 --- /dev/null +++ b/app/src/main/res/layout/item_layout_cart.xml @@ -0,0 +1,60 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index a8a90fd..0922528 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -9,4 +9,8 @@ #BDC7DC #111318 #282A2F + + #DBBCE1 + #43474E + #04305F \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2203d54..3e50977 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,4 +17,8 @@ #555F71 #F9F9FF #E7E8EE + + #6E5676 + #C4C6CF + #FFFFFF \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d5c49dd..c67d519 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,4 +4,12 @@ Password Reset my password Cancel + + Cart + Cart №%1$d + Category: %1$s + Supporting line text lorem ipsum dolor sit amet, consectetur. + %1$d$ + %1$d Items in your cart + $%1$.2f \ No newline at end of file From 7b514d32f5dbf1f4f4f254d3daa6783df27a7686 Mon Sep 17 00:00:00 2001 From: iamwhoiam0 Date: Sat, 10 May 2025 13:19:06 +0300 Subject: [PATCH 3/3] designed the contacts activity --- .../viewandresources/ContactsActivity.kt | 11 +- app/src/main/res/drawable/address_save.xml | 9 + app/src/main/res/drawable/attach.xml | 9 + app/src/main/res/drawable/back_button.xml | 2 +- app/src/main/res/drawable/cancel_button.xml | 2 +- app/src/main/res/drawable/date.xml | 9 + app/src/main/res/drawable/down.xml | 9 + app/src/main/res/drawable/microphone.xml | 9 + app/src/main/res/drawable/person.xml | 9 + app/src/main/res/drawable/phone.xml | 9 + app/src/main/res/drawable/points.xml | 9 + app/src/main/res/layout/activity_contacts.xml | 231 ++++++++++++++++++ 12 files changed, 315 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable/address_save.xml create mode 100644 app/src/main/res/drawable/attach.xml create mode 100644 app/src/main/res/drawable/date.xml create mode 100644 app/src/main/res/drawable/down.xml create mode 100644 app/src/main/res/drawable/microphone.xml create mode 100644 app/src/main/res/drawable/person.xml create mode 100644 app/src/main/res/drawable/phone.xml create mode 100644 app/src/main/res/drawable/points.xml diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt b/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt index 25f1ffb..cd2d1f0 100644 --- a/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt +++ b/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt @@ -2,10 +2,19 @@ package otus.gpb.homework.viewandresources import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import otus.gpb.homework.viewandresources.databinding.ActivityContactsBinding class ContactsActivity : AppCompatActivity() { + + private val binding by lazy { + ActivityContactsBinding.inflate(layoutInflater) + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_contacts) + setContentView(binding.root) + + binding.backBtn.setOnClickListener { + finish() + } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/address_save.xml b/app/src/main/res/drawable/address_save.xml new file mode 100644 index 0000000..702cd6b --- /dev/null +++ b/app/src/main/res/drawable/address_save.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/attach.xml b/app/src/main/res/drawable/attach.xml new file mode 100644 index 0000000..a1a7f58 --- /dev/null +++ b/app/src/main/res/drawable/attach.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/back_button.xml b/app/src/main/res/drawable/back_button.xml index af9a59b..61802da 100644 --- a/app/src/main/res/drawable/back_button.xml +++ b/app/src/main/res/drawable/back_button.xml @@ -5,5 +5,5 @@ android:viewportHeight="16"> + android:fillColor="@color/on_surface"/> diff --git a/app/src/main/res/drawable/cancel_button.xml b/app/src/main/res/drawable/cancel_button.xml index b6fed4f..c4d2575 100644 --- a/app/src/main/res/drawable/cancel_button.xml +++ b/app/src/main/res/drawable/cancel_button.xml @@ -5,5 +5,5 @@ android:viewportHeight="20"> + android:fillColor="@color/on_surface_variant"/> diff --git a/app/src/main/res/drawable/date.xml b/app/src/main/res/drawable/date.xml new file mode 100644 index 0000000..313674d --- /dev/null +++ b/app/src/main/res/drawable/date.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/down.xml b/app/src/main/res/drawable/down.xml new file mode 100644 index 0000000..01e56f2 --- /dev/null +++ b/app/src/main/res/drawable/down.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/microphone.xml b/app/src/main/res/drawable/microphone.xml new file mode 100644 index 0000000..07059a0 --- /dev/null +++ b/app/src/main/res/drawable/microphone.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/person.xml b/app/src/main/res/drawable/person.xml new file mode 100644 index 0000000..bcdb5f4 --- /dev/null +++ b/app/src/main/res/drawable/person.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/phone.xml b/app/src/main/res/drawable/phone.xml new file mode 100644 index 0000000..e3ec167 --- /dev/null +++ b/app/src/main/res/drawable/phone.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/points.xml b/app/src/main/res/drawable/points.xml new file mode 100644 index 0000000..f5369d1 --- /dev/null +++ b/app/src/main/res/drawable/points.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml index 6ef087b..41ae1b1 100644 --- a/app/src/main/res/layout/activity_contacts.xml +++ b/app/src/main/res/layout/activity_contacts.xml @@ -5,5 +5,236 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".ContactsActivity"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file