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
5 changes: 4 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ android {
targetSdk 35
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildFeatures {
viewBinding true
}

buildTypes {
release {
minifyEnabled false
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
android:name=".ContactsActivity"
android:label="Contacts"
android:exported="false" />
<activity
android:name=".LoginActivity"
android:theme="@style/Theme.ViewAndResources"/>
<activity
android:name=".MainActivity"
android:exported="true">
Expand Down
Binary file added app/src/main/cart_placeholder-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/ic_cart_placeholder-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,11 +1,47 @@
package otus.gpb.homework.viewandresources

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import otus.gpb.homework.viewandresources.model.CartItem
import otus.gpb.homework.viewandresources.cart.CartAdapter

class CartActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_cart)
val root = findViewById<ConstraintLayout>(R.id.rootCartLayout)
val startPadding = resources.getDimensionPixelSize(R.dimen.contact_screen_padding_start)
val endPadding = resources.getDimensionPixelSize(R.dimen.contact_screen_padding_end)

ViewCompat.setOnApplyWindowInsetsListener(root) { view, insets ->
val statusInsets = insets.getInsets(WindowInsetsCompat.Type.statusBars())
view.setPaddingRelative(
startPadding,
statusInsets.top,
endPadding,
view.paddingBottom
)
WindowInsetsCompat.CONSUMED
}
ViewCompat.requestApplyInsets(root)
val items = listOf(
CartItem("List item 1", "Category", "Supporting line lorem ipsum…", "$35", R.drawable.ic_cart_placeholder),
CartItem("List item 2", "Category", "Supporting line lorem ipsum…", "$35", R.drawable.ic_cart_placeholder),
CartItem("List item 3", "Category", "Supporting line lorem ipsum…", "$35", R.drawable.ic_cart_placeholder),
CartItem("List item 4", "Category", "Supporting line lorem ipsum…", "$35", R.drawable.ic_cart_placeholder)
)

val recycler = findViewById<RecyclerView>(R.id.recyclerCart)
recycler.layoutManager = LinearLayoutManager(this)
recycler.adapter = CartAdapter(items)

val itemsCountText = findViewById<TextView>(R.id.textItemsCount)
itemsCountText.text = getString(R.string.cart_items_count, items.size)
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,35 @@
package otus.gpb.homework.viewandresources

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.constraintlayout.widget.ConstraintLayout

class ContactsActivity : AppCompatActivity() {

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

val root = findViewById<ConstraintLayout>(R.id.rootLayout)

val startPadding = resources.getDimensionPixelSize(
R.dimen.contact_screen_padding_start
)
val endPadding = resources.getDimensionPixelSize(
R.dimen.contact_screen_padding_end
)

ViewCompat.setOnApplyWindowInsetsListener(root) { view, insets ->
val statusInsets = insets.getInsets(WindowInsetsCompat.Type.statusBars())

view.setPaddingRelative(
startPadding, statusInsets.top, endPadding, view.paddingBottom
)

WindowInsetsCompat.CONSUMED
}

ViewCompat.requestApplyInsets(root)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package otus.gpb.homework.viewandresources

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity

class LoginActivity : AppCompatActivity() {

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

setSupportActionBar(findViewById(R.id.topAppBar))
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package otus.gpb.homework.viewandresources.cart
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import otus.gpb.homework.viewandresources.databinding.ItemCartBinding
import otus.gpb.homework.viewandresources.model.CartItem

data class CartItem(

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Дублируется data class CartItem, хотя он уже определен в model/CartItem.kt и импортирован

val title: String,
val category: String,
val subtitle: String,
val price: String,
val imageResId: Int
)

class CartAdapter(
private val items: List<CartItem>
) : RecyclerView.Adapter<CartAdapter.VH>() {

class VH(val binding: ItemCartBinding) : RecyclerView.ViewHolder(binding.root)

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
val inflater = LayoutInflater.from(parent.context)
val binding = ItemCartBinding.inflate(inflater, parent, false)
return VH(binding)
}

override fun onBindViewHolder(holder: VH, position: Int) {
val item = items[position]
with(holder.binding) {
cartTitle.text = item.title
cartCategory.text = item.category
cartSubtitle.text = item.subtitle
cartPrice.text = item.price
cartImage.setImageResource(item.imageResId)
}
}

override fun getItemCount(): Int = items.size
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package otus.gpb.homework.viewandresources.model

data class CartItem(
val title: String,
val category: String,
val subtitle: String,
val price: String,
val imageResId: Int
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package otus.gpb.homework.viewandresources.model

data class Contact(
val name: String,
val phone: String
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package otus.gpb.homework.viewandresources.ui.contacts

class ContactsAdapter {
}
23 changes: 23 additions & 0 deletions app/src/main/res/drawable/contact_field_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item>
<shape android:shape="rectangle">
<solid android:color="@color/contact_field_background" />

<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="@dimen/contact_field_radius"
android:topRightRadius="@dimen/contact_field_radius" />
</shape>
</item>

<item android:gravity="bottom">
<shape android:shape="rectangle">
<size android:height="1dp" />
<solid android:color="@color/contact_field_divider" />
</shape>
</item>

</layer-list>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/ic_arrow_back_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportHeight="24">
<path
android:fillColor="?attr/colorOnSurface"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_arrow_drop_down_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,15L7,10H17L12,15Z"
android:fillColor="#43474E"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_attach_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M11.5,22C9.967,22 8.667,21.467 7.6,20.4C6.533,19.333 6,18.033 6,16.5V6C6,4.9 6.392,3.958 7.175,3.175C7.958,2.392 8.9,2 10,2C11.1,2 12.042,2.392 12.825,3.175C13.608,3.958 14,4.9 14,6V15.5C14,16.2 13.758,16.792 13.275,17.275C12.792,17.758 12.2,18 11.5,18C10.8,18 10.208,17.758 9.725,17.275C9.242,16.792 9,16.2 9,15.5V6H10.5V15.5C10.5,15.783 10.596,16.021 10.788,16.212C10.979,16.404 11.217,16.5 11.5,16.5C11.783,16.5 12.021,16.404 12.212,16.212C12.404,16.021 12.5,15.783 12.5,15.5V6C12.5,5.3 12.258,4.708 11.775,4.225C11.292,3.742 10.7,3.5 10,3.5C9.3,3.5 8.708,3.742 8.225,4.225C7.742,4.708 7.5,5.3 7.5,6V16.5C7.5,17.6 7.892,18.542 8.675,19.325C9.458,20.108 10.4,20.5 11.5,20.5C12.6,20.5 13.542,20.108 14.325,19.325C15.108,18.542 15.5,17.6 15.5,16.5V6H17V16.5C17,18.033 16.467,19.333 15.4,20.4C14.333,21.467 13.033,22 11.5,22Z"
android:fillColor="#43474E"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_bookmark_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M5,21V5C5,4.45 5.196,3.979 5.588,3.588C5.979,3.196 6.45,3 7,3H17C17.55,3 18.021,3.196 18.413,3.588C18.804,3.979 19,4.45 19,5V21L12,18L5,21ZM7,17.95L12,15.8L17,17.95V5H7V17.95Z"
android:fillColor="#43474E"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_calendar_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M9,16.5C8.3,16.5 7.708,16.258 7.225,15.775C6.742,15.292 6.5,14.7 6.5,14C6.5,13.3 6.742,12.708 7.225,12.225C7.708,11.742 8.3,11.5 9,11.5C9.7,11.5 10.292,11.742 10.775,12.225C11.258,12.708 11.5,13.3 11.5,14C11.5,14.7 11.258,15.292 10.775,15.775C10.292,16.258 9.7,16.5 9,16.5ZM5,22C4.45,22 3.979,21.804 3.588,21.413C3.196,21.021 3,20.55 3,20V6C3,5.45 3.196,4.979 3.588,4.588C3.979,4.196 4.45,4 5,4H6V2H8V4H16V2H18V4H19C19.55,4 20.021,4.196 20.413,4.588C20.804,4.979 21,5.45 21,6V20C21,20.55 20.804,21.021 20.413,21.413C20.021,21.804 19.55,22 19,22H5ZM5,20H19V10H5V20Z"
android:fillColor="#43474E"/>
</vector>
Binary file added app/src/main/res/drawable/ic_cart_placeholder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_cart_smile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<path
android:pathData="M11.625,8.25C11.938,8.25 12.203,8.141 12.422,7.922C12.641,7.703 12.75,7.438 12.75,7.125C12.75,6.813 12.641,6.547 12.422,6.328C12.203,6.109 11.938,6 11.625,6C11.313,6 11.047,6.109 10.828,6.328C10.609,6.547 10.5,6.813 10.5,7.125C10.5,7.438 10.609,7.703 10.828,7.922C11.047,8.141 11.313,8.25 11.625,8.25ZM6.375,8.25C6.688,8.25 6.953,8.141 7.172,7.922C7.391,7.703 7.5,7.438 7.5,7.125C7.5,6.813 7.391,6.547 7.172,6.328C6.953,6.109 6.688,6 6.375,6C6.063,6 5.797,6.109 5.578,6.328C5.359,6.547 5.25,6.813 5.25,7.125C5.25,7.438 5.359,7.703 5.578,7.922C5.797,8.141 6.063,8.25 6.375,8.25ZM9,13.125C9.85,13.125 10.622,12.884 11.316,12.403C12.009,11.922 12.512,11.288 12.825,10.5H5.175C5.488,11.288 5.991,11.922 6.684,12.403C7.378,12.884 8.15,13.125 9,13.125ZM9,16.5C7.963,16.5 6.988,16.303 6.075,15.909C5.162,15.516 4.369,14.981 3.694,14.306C3.019,13.631 2.484,12.837 2.091,11.925C1.697,11.012 1.5,10.038 1.5,9C1.5,7.963 1.697,6.988 2.091,6.075C2.484,5.162 3.019,4.369 3.694,3.694C4.369,3.019 5.162,2.484 6.075,2.091C6.988,1.697 7.963,1.5 9,1.5C10.038,1.5 11.012,1.697 11.925,2.091C12.837,2.484 13.631,3.019 14.306,3.694C14.981,4.369 15.516,5.162 15.909,6.075C16.303,6.988 16.5,7.963 16.5,9C16.5,10.038 16.303,11.012 15.909,11.925C15.516,12.837 14.981,13.631 14.306,14.306C13.631,14.981 12.837,15.516 11.925,15.909C11.012,16.303 10.038,16.5 9,16.5ZM9,15C10.675,15 12.094,14.419 13.256,13.256C14.419,12.094 15,10.675 15,9C15,7.325 14.419,5.906 13.256,4.744C12.094,3.581 10.675,3 9,3C7.325,3 5.906,3.581 4.744,4.744C3.581,5.906 3,7.325 3,9C3,10.675 3.581,12.094 4.744,13.256C5.906,14.419 7.325,15 9,15Z"
android:fillColor="#FFFFFF"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_close_20.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M6.4,15L10,11.4L13.6,15L15,13.6L11.4,10L15,6.4L13.6,5L10,8.6L6.4,5L5,6.4L8.6,10L5,13.6L6.4,15ZM10,20C8.617,20 7.317,19.737 6.1,19.212C4.883,18.688 3.825,17.975 2.925,17.075C2.025,16.175 1.313,15.117 0.788,13.9C0.262,12.683 0,11.383 0,10C0,8.617 0.262,7.317 0.788,6.1C1.313,4.883 2.025,3.825 2.925,2.925C3.825,2.025 4.883,1.313 6.1,0.788C7.317,0.262 8.617,0 10,0C11.383,0 12.683,0.262 13.9,0.788C15.117,1.313 16.175,2.025 17.075,2.925C17.975,3.825 18.688,4.883 19.212,6.1C19.737,7.317 20,8.617 20,10C20,11.383 19.737,12.683 19.212,13.9C18.688,15.117 17.975,16.175 17.075,17.075C16.175,17.975 15.117,18.688 13.9,19.212C12.683,19.737 11.383,20 10,20ZM10,18C12.233,18 14.125,17.225 15.675,15.675C17.225,14.125 18,12.233 18,10C18,7.767 17.225,5.875 15.675,4.325C14.125,2.775 12.233,2 10,2C7.767,2 5.875,2.775 4.325,4.325C2.775,5.875 2,7.767 2,10C2,12.233 2.775,14.125 4.325,15.675C5.875,17.225 7.767,18 10,18Z"
android:fillColor="#43474E"/>
</vector>
13 changes: 13 additions & 0 deletions app/src/main/res/drawable/ic_menu_48.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<group>
<clip-path
android:pathData="M24,4L24,4A20,20 0,0 1,44 24L44,24A20,20 0,0 1,24 44L24,44A20,20 0,0 1,4 24L4,24A20,20 0,0 1,24 4z"/>
<path
android:pathData="M15,30V28H33V30H15ZM15,25V23H33V25H15ZM15,20V18H33V20H15Z"
android:fillColor="#191C20"/>
</group>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_mic_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,14C11.167,14 10.458,13.708 9.875,13.125C9.292,12.542 9,11.833 9,11V5C9,4.167 9.292,3.458 9.875,2.875C10.458,2.292 11.167,2 12,2C12.833,2 13.542,2.292 14.125,2.875C14.708,3.458 15,4.167 15,5V11C15,11.833 14.708,12.542 14.125,13.125C13.542,13.708 12.833,14 12,14ZM11,21V17.925C9.267,17.692 7.833,16.917 6.7,15.6C5.567,14.283 5,12.75 5,11H7C7,12.383 7.488,13.563 8.462,14.538C9.438,15.512 10.617,16 12,16C13.383,16 14.563,15.512 15.538,14.538C16.513,13.563 17,12.383 17,11H19C19,12.75 18.433,14.283 17.3,15.6C16.167,16.917 14.733,17.692 13,17.925V21H11Z"
android:fillColor="#43474E"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_more_vert_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,20C11.45,20 10.979,19.804 10.587,19.413C10.196,19.021 10,18.55 10,18C10,17.45 10.196,16.979 10.587,16.587C10.979,16.196 11.45,16 12,16C12.55,16 13.021,16.196 13.413,16.587C13.804,16.979 14,17.45 14,18C14,18.55 13.804,19.021 13.413,19.413C13.021,19.804 12.55,20 12,20ZM12,14C11.45,14 10.979,13.804 10.587,13.413C10.196,13.021 10,12.55 10,12C10,11.45 10.196,10.979 10.587,10.587C10.979,10.196 11.45,10 12,10C12.55,10 13.021,10.196 13.413,10.587C13.804,10.979 14,11.45 14,12C14,12.55 13.804,13.021 13.413,13.413C13.021,13.804 12.55,14 12,14ZM12,8C11.45,8 10.979,7.804 10.587,7.412C10.196,7.021 10,6.55 10,6C10,5.45 10.196,4.979 10.587,4.588C10.979,4.196 11.45,4 12,4C12.55,4 13.021,4.196 13.413,4.588C13.804,4.979 14,5.45 14,6C14,6.55 13.804,7.021 13.413,7.412C13.021,7.804 12.55,8 12,8Z"
android:fillColor="#43474E"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_person.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M5.85,17.1C6.7,16.45 7.65,15.938 8.7,15.563C9.75,15.188 10.85,15 12,15C13.15,15 14.25,15.188 15.3,15.563C16.35,15.938 17.3,16.45 18.15,17.1C18.733,16.417 19.188,15.642 19.513,14.775C19.837,13.908 20,12.983 20,12C20,9.783 19.221,7.896 17.663,6.338C16.104,4.779 14.217,4 12,4C9.783,4 7.896,4.779 6.338,6.338C4.779,7.896 4,9.783 4,12C4,12.983 4.162,13.908 4.488,14.775C4.813,15.642 5.267,16.417 5.85,17.1ZM12,13C11.017,13 10.188,12.663 9.512,11.988C8.837,11.313 8.5,10.483 8.5,9.5C8.5,8.517 8.837,7.688 9.512,7.012C10.188,6.338 11.017,6 12,6C12.983,6 13.813,6.338 14.488,7.012C15.163,7.688 15.5,8.517 15.5,9.5C15.5,10.483 15.163,11.313 14.488,11.988C13.813,12.663 12.983,13 12,13ZM12,22C10.617,22 9.317,21.737 8.1,21.212C6.883,20.688 5.825,19.975 4.925,19.075C4.025,18.175 3.313,17.117 2.787,15.9C2.263,14.683 2,13.383 2,12C2,10.617 2.263,9.317 2.787,8.1C3.313,6.883 4.025,5.825 4.925,4.925C5.825,4.025 6.883,3.313 8.1,2.787C9.317,2.263 10.617,2 12,2C13.383,2 14.683,2.263 15.9,2.787C17.117,3.313 18.175,4.025 19.075,4.925C19.975,5.825 20.688,6.883 21.212,8.1C21.737,9.317 22,10.617 22,12C22,13.383 21.737,14.683 21.212,15.9C20.688,17.117 19.975,18.175 19.075,19.075C18.175,19.975 17.117,20.688 15.9,21.212C14.683,21.737 13.383,22 12,22Z"
android:fillColor="#43474E"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_person_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,12C10.9,12 9.958,11.608 9.175,10.825C8.392,10.042 8,9.1 8,8C8,6.9 8.392,5.958 9.175,5.175C9.958,4.392 10.9,4 12,4C13.1,4 14.042,4.392 14.825,5.175C15.608,5.958 16,6.9 16,8C16,9.1 15.608,10.042 14.825,10.825C14.042,11.608 13.1,12 12,12ZM4,20V17.2C4,16.633 4.146,16.112 4.438,15.637C4.729,15.163 5.117,14.8 5.6,14.55C6.633,14.033 7.683,13.646 8.75,13.387C9.817,13.129 10.9,13 12,13C13.1,13 14.183,13.129 15.25,13.387C16.317,13.646 17.367,14.033 18.4,14.55C18.883,14.8 19.271,15.163 19.563,15.637C19.854,16.112 20,16.633 20,17.2V20H4ZM6,18H18V17.2C18,17.017 17.954,16.85 17.862,16.7C17.771,16.55 17.65,16.433 17.5,16.35C16.6,15.9 15.692,15.563 14.775,15.337C13.858,15.113 12.933,15 12,15C11.067,15 10.142,15.113 9.225,15.337C8.308,15.563 7.4,15.9 6.5,16.35C6.35,16.433 6.229,16.55 6.137,16.7C6.046,16.85 6,17.017 6,17.2V18ZM12,10C12.55,10 13.021,9.804 13.413,9.413C13.804,9.021 14,8.55 14,8C14,7.45 13.804,6.979 13.413,6.588C13.021,6.196 12.55,6 12,6C11.45,6 10.979,6.196 10.587,6.588C10.196,6.979 10,7.45 10,8C10,8.55 10.196,9.021 10.587,9.413C10.979,9.804 11.45,10 12,10Z"
android:fillColor="?attr/colorOnSurface" />
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_sun_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,15C12.833,15 13.542,14.708 14.125,14.125C14.708,13.542 15,12.833 15,12C15,11.167 14.708,10.458 14.125,9.875C13.542,9.292 12.833,9 12,9C11.167,9 10.458,9.292 9.875,9.875C9.292,10.458 9,11.167 9,12C9,12.833 9.292,13.542 9.875,14.125C10.458,14.708 11.167,15 12,15ZM12,17C10.617,17 9.438,16.513 8.462,15.538C7.488,14.563 7,13.383 7,12C7,10.617 7.488,9.438 8.462,8.462C9.438,7.488 10.617,7 12,7C13.383,7 14.563,7.488 15.538,8.462C16.513,9.438 17,10.617 17,12C17,13.383 16.513,14.563 15.538,15.538C14.563,16.513 13.383,17 12,17ZM5,13H1V11H5V13ZM23,13H19V11H23V13ZM11,5V1H13V5H11ZM11,23V19H13V23H11ZM6.4,7.75L3.875,5.325L5.3,3.85L7.7,6.35L6.4,7.75ZM18.7,20.15L16.275,17.625L17.6,16.25L20.125,18.675L18.7,20.15ZM16.25,6.4L18.675,3.875L20.15,5.3L17.65,7.7L16.25,6.4ZM3.85,18.7L6.375,16.275L7.75,17.6L5.325,20.125L3.85,18.7Z"
android:fillColor="#43474E"/>
</vector>
Loading