Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
tools:targetApi="31">
<activity
android:name=".CartActivity"
android:label="Cart"
android:label="@string/cart_title"
android:exported="false" />
<activity
android:name=".ContactsActivity"
android:label="Contacts"
android:label="@string/contacts_title"
android:exported="false" />
<activity
android:name=".MainActivity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,23 @@ package otus.gpb.homework.viewandresources

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import android.widget.TextView

class CartActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_cart)

listOf(
R.id.cart_item_1 to 1,
R.id.cart_item_2 to 2,
R.id.cart_item_3 to 3,
R.id.cart_item_4 to 4,
).forEach { (itemId, number) ->
findViewById<View>(itemId)
.findViewById<TextView>(R.id.item_title)
.text = getString(R.string.cart_item_title, number)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,51 @@
package otus.gpb.homework.viewandresources

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.ArrayAdapter
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.datepicker.MaterialDatePicker
import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout
import com.google.android.material.textfield.MaterialAutoCompleteTextView
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale

class ContactsActivity : AppCompatActivity() {
private val dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault())

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_contacts)

val contactTypes = resources.getStringArray(R.array.contact_type_options)
findViewById<MaterialAutoCompleteTextView>(R.id.contact_type_dropdown).apply {
setAdapter(
ArrayAdapter(
this@ContactsActivity,
android.R.layout.simple_list_item_1,
contactTypes,
),
)
setText(getString(R.string.contact_type), false)
setOnClickListener { showDropDown() }
}

val dateInput = findViewById<TextInputEditText>(R.id.date_input)
val dateLayout = findViewById<TextInputLayout>(R.id.date_layout)
val showDatePicker = {
val picker = MaterialDatePicker.Builder.datePicker()
.setTitleText(getString(R.string.field_date))
.setSelection(MaterialDatePicker.todayInUtcMilliseconds())
.build()

picker.addOnPositiveButtonClickListener { selection ->
dateInput.setText(dateFormat.format(Date(selection)))
}
picker.show(supportFragmentManager, "contact_date_picker")
}

dateInput.setOnClickListener { showDatePicker() }
dateLayout.setEndIconOnClickListener { showDatePicker() }
}
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
package otus.gpb.homework.viewandresources

import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.content.Intent
import android.os.Bundle
import android.view.ViewGroup
import android.widget.Button
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlin.math.min

class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -19,9 +25,27 @@ class MainActivity : AppCompatActivity() {
}

findViewById<Button>(R.id.signin_button).setOnClickListener {
MaterialAlertDialogBuilder(this)
val dialog = MaterialAlertDialogBuilder(this)
.setView(R.layout.dialog_signin)
.show()
dialog.window?.apply {
setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
val horizontalInset = (48 * resources.displayMetrics.density).toInt()
val dialogWidth = min(
resources.getDimensionPixelSize(R.dimen.signin_dialog_width),
resources.displayMetrics.widthPixels - horizontalInset,
)
setLayout(dialogWidth, ViewGroup.LayoutParams.WRAP_CONTENT)
}
dialog.findViewById<TextView>(R.id.reset_password)?.setOnClickListener {
Toast.makeText(this, R.string.reset_password_clicked, Toast.LENGTH_SHORT).show()
}
dialog.findViewById<Button>(R.id.login_button)?.setOnClickListener {
Toast.makeText(this, R.string.login_clicked, Toast.LENGTH_SHORT).show()
}
dialog.findViewById<Button>(R.id.cancel_button)?.setOnClickListener {
dialog.dismiss()
}
}
}
}
}
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/bg_dialog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/dialog_surface" />
<corners android:radius="32dp" />
</shape>
30 changes: 30 additions & 0 deletions app/src/main/res/drawable/cart_product_image.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="?attr/colorSurfaceVariant" />
<corners android:radius="12dp" />
</shape>
</item>

<item
android:width="76dp"
android:height="76dp"
android:gravity="center">
<vector
android:width="76dp"
android:height="76dp"
android:viewportWidth="80"
android:viewportHeight="80">
<path
android:fillColor="@color/cart_image_tint"
android:pathData="M40,14L54,38H26z" />
<path
android:fillColor="@color/cart_image_tint"
android:pathData="M18,48h20v16H18z" />
<path
android:fillColor="@color/cart_image_tint"
android:pathData="M54,48a11,11 0,1 0,0.1 0z" />
</vector>
</item>
</layer-list>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_account_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/account_circle.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_arrow_back.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/arrow_left.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_assignment.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/cellphone_information.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M13 7H11V9H13V7M13 11H11V17H13V11M17 1H7C5.9 1 5 1.9 5 3V21C5 22.1 5.9 23 7 23H17C18.1 23 19 22.1 19 21V3C19 1.9 18.1 1 17 1M17 19H7V5H17V19Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_attach_file.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/paperclip.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M16.5,6V17.5A4,4 0 0,1 12.5,21.5A4,4 0 0,1 8.5,17.5V5A2.5,2.5 0 0,1 11,2.5A2.5,2.5 0 0,1 13.5,5V15.5A1,1 0 0,1 12.5,16.5A1,1 0 0,1 11.5,15.5V6H10V15.5A2.5,2.5 0 0,0 12.5,18A2.5,2.5 0 0,0 15,15.5V5A4,4 0 0,0 11,1A4,4 0 0,0 7,5V17.5A5.5,5.5 0 0,0 12.5,23A5.5,5.5 0 0,0 18,17.5V6H16.5Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_bookmark.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/bookmark_outline.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M17,18L12,15.82L7,18V5H17M17,3H7A2,2 0 0,0 5,5V21L12,18L19,21V5C19,3.89 18.1,3 17,3Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_calendar.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/calendar_today.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M7,10H12V15H7M19,19H5V8H19M19,3H18V1H16V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_close_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/close_circle_outline.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59,8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_menu.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/menu.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_mic.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/microphone.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M12,2A3,3 0 0,1 15,5V11A3,3 0 0,1 12,14A3,3 0 0,1 9,11V5A3,3 0 0,1 12,2M19,11C19,14.53 16.39,17.44 13,17.93V21H11V17.93C7.61,17.44 5,14.53 5,11H7A5,5 0 0,0 12,16A5,5 0 0,0 17,11H19Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_mood.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/emoticon_outline.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M12,17.5C14.33,17.5 16.3,16.04 17.11,14H6.89C7.69,16.04 9.67,17.5 12,17.5M8.5,11A1.5,1.5 0 0,0 10,9.5A1.5,1.5 0 0,0 8.5,8A1.5,1.5 0 0,0 7,9.5A1.5,1.5 0 0,0 8.5,11M15.5,11A1.5,1.5 0 0,0 17,9.5A1.5,1.5 0 0,0 15.5,8A1.5,1.5 0 0,0 14,9.5A1.5,1.5 0 0,0 15.5,11M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_more_vert.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/dots_vertical.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_person.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/account_outline.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,6A2,2 0 0,0 10,8A2,2 0 0,0 12,10A2,2 0 0,0 14,8A2,2 0 0,0 12,6M12,13C14.67,13 20,14.33 20,17V20H4V17C4,14.33 9.33,13 12,13M12,14.9C9.03,14.9 5.9,16.36 5.9,17V18.1H18.1V17C18.1,16.36 14.97,14.9 12,14.9Z" /></vector>
Loading