diff --git a/app/src/main/java/com/futo/circles/base/BaseRecycleViewDecoration.kt b/app/src/main/java/com/futo/circles/base/BaseRecycleViewDecoration.kt
new file mode 100644
index 0000000000000000000000000000000000000000..bba55d22d759e28664b420b8f5567118ae5af665
--- /dev/null
+++ b/app/src/main/java/com/futo/circles/base/BaseRecycleViewDecoration.kt
@@ -0,0 +1,4 @@
+package com.futo.circles.base
+
+class BaseRecycleViewDecoration {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt b/app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt
new file mode 100644
index 0000000000000000000000000000000000000000..53b4b0c7493b083d4dadef65f34ff2de3b4de7d3
--- /dev/null
+++ b/app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt
@@ -0,0 +1,6 @@
+package com.futo.circles.extensions
+
+import android.content.Context
+import android.support.annotation.DimenRes
+
+fun Context.dimen(@DimenRes resource: Int): Int = resources.getDimensionPixelSize(resource)
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineFragment.kt b/app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineFragment.kt
index 5e0fbbd7d750fef53c44372e4352090f4daf6f43..01d8111c65e147e9fe202ed36f782e347b3e3b61 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineFragment.kt
+++ b/app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineFragment.kt
@@ -6,11 +6,14 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
import by.kirich1409.viewbindingdelegate.viewBinding
import com.futo.circles.R
+import com.futo.circles.base.BaseRvDecoration
import com.futo.circles.databinding.GroupTimelineFragmentBinding
import com.futo.circles.extensions.bindToFab
+import com.futo.circles.extensions.dimen
import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.setToolbarTitle
import com.futo.circles.ui.groups.timeline.list.GroupTimelineAdapter
+import com.futo.circles.ui.groups.timeline.list.GroupTimelineViewHolder
import com.futo.circles.ui.groups.timeline.model.GroupMessage
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
@@ -30,6 +33,12 @@ class GroupTimelineFragment : Fragment(R.layout.group_timeline_fragment) {
binding.tvGroupTimeline.apply {
adapter = listAdapter
+ addItemDecoration(
+ BaseRvDecoration.OffsetDecoration<GroupTimelineViewHolder>(
+ verticalOffset = context.dimen(R.dimen.group_post_item_offset),
+ horizontalOffset = context.dimen(R.dimen.group_post_item_offset)
+ )
+ )
bindToFab(binding.fbCreatePost)
}
setupObservers()
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineAdapter.kt b/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineAdapter.kt
index fa0144ac1e83125b2221aeb9bdfb70357907cd4a..1eaf13a86281fc61484b791ba70588c9a608592a 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineAdapter.kt
+++ b/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineAdapter.kt
@@ -22,7 +22,7 @@ class GroupTimelineAdapter(
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupTimelineViewHolder {
return when (GroupMessageType.values()[viewType]) {
- GroupMessageType.TEXT_MESSAGE -> TextMessageViewHolder(parent)
+ GroupMessageType.TEXT_MESSAGE -> TextMessageViewHolder(parent,urlResolver)
GroupMessageType.IMAGE_MESSAGE -> ImageMessageViewHolder(parent, urlResolver)
}
}
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineViewHolder.kt b/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineViewHolder.kt
index 61e5e7f7b49bbfb270a374376f4ec485d802d7c4..c98eabfbc1565a52df7d1b06929f5d8c86f1c68e 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineViewHolder.kt
@@ -7,13 +7,16 @@ import com.futo.circles.base.ViewBindingHolder
import com.futo.circles.databinding.GroupImageMessageListItemBinding
import com.futo.circles.databinding.GroupTextMessageListItemBinding
import com.futo.circles.extensions.loadMatrixThumbnail
+import com.futo.circles.extensions.setIsEncryptedIcon
import com.futo.circles.ui.groups.timeline.model.GroupImageMessage
import com.futo.circles.ui.groups.timeline.model.GroupTextMessage
import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import java.text.DateFormat
+import java.util.*
sealed class GroupTimelineViewHolder(view: View) : RecyclerView.ViewHolder(view)
-class TextMessageViewHolder(parent: ViewGroup) :
+class TextMessageViewHolder(parent: ViewGroup, private val urlResolver: ContentUrlResolver?) :
GroupTimelineViewHolder(
inflate(parent, GroupTextMessageListItemBinding::inflate)
) {
@@ -21,7 +24,16 @@ class TextMessageViewHolder(parent: ViewGroup) :
private companion object : ViewBindingHolder<GroupTextMessageListItemBinding>
fun bind(data: GroupTextMessage) {
+ binding.ivSenderImage.loadMatrixThumbnail(
+ data.sender.avatarUrl,
+ urlResolver,
+ binding.ivSenderImage.height
+ )
+ binding.tvUserName.text = data.sender.disambiguatedDisplayName
+ binding.tvUserId.text = data.sender.userId
binding.tvMessage.text = data.message
+ binding.ivEncrypted.setIsEncryptedIcon(data.isEncrypted)
+ binding.tvMessageTime.text = DateFormat.getDateTimeInstance().format(Date(data.timestamp))
}
}
diff --git a/app/src/main/res/drawable/ic_like.xml b/app/src/main/res/drawable/ic_like.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2d9d13cfbf28628607689fa8f62ec7ef3fc4b2c5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_like.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8bb3fc306f2440057586e0f419521985059b4186
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reply.xml b/app/src/main/res/drawable/ic_reply.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f79c9c8ef6610ccbe731db4d28b101bfbed344a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reply.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L6,16l-2,2L4,4h16v12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9300daf6fa5c4aabd1316fdd6493267456bb41bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unlike.xml b/app/src/main/res/drawable/ic_unlike.xml
new file mode 100644
index 0000000000000000000000000000000000000000..996e16d0f381e05453e40db5bc53f391c1b5b63e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unlike.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
+</vector>
diff --git a/app/src/main/res/layout/bottom_navigation_fragment.xml b/app/src/main/res/layout/bottom_navigation_fragment.xml
index 6d1f9e5a8cc62e1b367bcf093cf70526d7b649e9..73c37dab729b2586c3986a95e277b348f6246073 100644
--- a/app/src/main/res/layout/bottom_navigation_fragment.xml
+++ b/app/src/main/res/layout/bottom_navigation_fragment.xml
@@ -48,6 +48,7 @@
android:id="@+id/bottomNavigationView"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ app:itemBackground="?selectableItemBackgroundBorderless"
app:labelVisibilityMode="labeled"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/group_text_message_list_item.xml b/app/src/main/res/layout/group_text_message_list_item.xml
index 7d80a2f83bc4af046bd4324e780efcf30c413564..5826dbd758166583f68d48c6c99fafd28a2b08d7 100644
--- a/app/src/main/res/layout/group_text_message_list_item.xml
+++ b/app/src/main/res/layout/group_text_message_list_item.xml
@@ -1,11 +1,167 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView 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:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ app:cardCornerRadius="4dp">
- <TextView
- android:id="@+id/tvMessage"
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content">
-</FrameLayout>
\ No newline at end of file
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guidelineStart"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintGuide_begin="8dp" />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guidelineEnd"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintGuide_end="8dp" />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guidelineTop"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintGuide_begin="8dp" />
+
+ <com.google.android.material.imageview.ShapeableImageView
+ android:id="@+id/ivSenderImage"
+ android:layout_width="40dp"
+ android:layout_height="0dp"
+ app:layout_constraintDimensionRatio="w,1:1"
+ app:layout_constraintStart_toStartOf="@id/guidelineStart"
+ app:layout_constraintTop_toTopOf="@id/guidelineTop"
+ app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize50Percent"
+ tools:background="@color/blue" />
+
+ <TextView
+ android:id="@+id/tvUserName"
+ style="@style/body"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
+ android:ellipsize="end"
+ android:lines="1"
+ app:layout_constraintBottom_toTopOf="@id/tvUserId"
+ app:layout_constraintEnd_toStartOf="@id/btnMore"
+ app:layout_constraintStart_toEndOf="@id/ivSenderImage"
+ app:layout_constraintTop_toTopOf="@id/ivSenderImage"
+ app:layout_constraintVertical_chainStyle="packed"
+ tools:text="Android01" />
+
+ <TextView
+ android:id="@+id/tvUserId"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:lines="1"
+ android:textSize="13sp"
+ app:layout_constraintBottom_toBottomOf="@id/ivSenderImage"
+ app:layout_constraintEnd_toEndOf="@id/tvUserName"
+ app:layout_constraintStart_toStartOf="@id/tvUserName"
+ app:layout_constraintTop_toBottomOf="@id/tvUserName"
+ tools:text="Android01@domain" />
+
+ <ImageButton
+ android:id="@+id/btnMore"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="?selectableItemBackgroundBorderless"
+ android:padding="4dp"
+ android:src="@drawable/ic_more"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="@color/blue" />
+
+ <TextView
+ android:id="@+id/tvMessage"
+ style="@style/body"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="16dp"
+ app:layout_constraintEnd_toEndOf="@id/guidelineEnd"
+ app:layout_constraintStart_toStartOf="@id/guidelineStart"
+ app:layout_constraintTop_toBottomOf="@id/ivSenderImage"
+ tools:text="messsage" />
+
+ <ImageView
+ android:id="@+id/ivEncrypted"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="@id/tvMessageTime"
+ app:layout_constraintDimensionRatio="h,1:1"
+ app:layout_constraintStart_toStartOf="@id/ivSenderImage"
+ app:layout_constraintTop_toTopOf="@id/tvMessageTime"
+ tools:src="@drawable/ic_lock" />
+
+ <TextView
+ android:id="@+id/tvMessageTime"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:ellipsize="end"
+ android:lines="1"
+ android:textSize="12sp"
+ app:layout_constraintEnd_toEndOf="@id/guidelineEnd"
+ app:layout_constraintStart_toEndOf="@id/ivEncrypted"
+ app:layout_constraintTop_toBottomOf="@id/tvMessage"
+ tools:text="some date" />
+
+ <View
+ android:id="@+id/divider"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/divider_height"
+ android:layout_marginTop="8dp"
+ android:background="@color/divider_color"
+ app:layout_constraintEnd_toEndOf="@id/guidelineEnd"
+ app:layout_constraintStart_toStartOf="@id/guidelineStart"
+ app:layout_constraintTop_toBottomOf="@id/tvMessageTime" />
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/btnLike"
+ style="@style/PostButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/like"
+ app:icon="@drawable/ic_unlike"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/btnReply"
+ app:layout_constraintStart_toStartOf="@id/guidelineStart"
+ app:layout_constraintTop_toBottomOf="@id/divider" />
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/btnReply"
+ style="@style/PostButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/reply"
+ app:icon="@drawable/ic_reply"
+ app:layout_constraintBottom_toBottomOf="@id/btnLike"
+ app:layout_constraintEnd_toStartOf="@id/btnShare"
+ app:layout_constraintStart_toEndOf="@id/btnLike"
+ app:layout_constraintTop_toTopOf="@id/btnLike" />
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/btnShare"
+ style="@style/PostButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/share"
+ app:icon="@drawable/ic_share"
+ app:layout_constraintBottom_toBottomOf="@id/btnLike"
+ app:layout_constraintEnd_toEndOf="@id/guidelineEnd"
+ app:layout_constraintStart_toEndOf="@id/btnReply"
+ app:layout_constraintTop_toTopOf="@id/btnLike" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/group_timeline_fragment.xml b/app/src/main/res/layout/group_timeline_fragment.xml
index 0d4ea06e7f363e09658f8dedb2b8a1f4059d0162..2c7a7b69e8529bb88c8ceba0cdbf633ac6a6ebfc 100644
--- a/app/src/main/res/layout/group_timeline_fragment.xml
+++ b/app/src/main/res/layout/group_timeline_fragment.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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:layout_width="match_parent"
android:layout_height="match_parent">
@@ -8,6 +9,7 @@
android:id="@+id/tvGroupTimeline"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:clipToPadding="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
@@ -20,5 +22,6 @@
app:fabSize="normal"
app:layout_anchor="@id/tvGroupTimeline"
app:srcCompat="@drawable/ic_create"
- app:tint="@color/white" />
+ app:tint="@color/white"
+ tools:ignore="ContentDescription" />
</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e6d1263553903a59150ae19519a5b8552d8d880c..545a9e3521db4d7bd2b50d828ae328f35a0b33a7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="divider_height">1dp</dimen>
+ <dimen name="group_post_item_offset">4dp</dimen>
</resources>
\ 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 15c582bd0822632fa73486bf6b128b7cc1983d4f..c07a793f0c783cc415edf407d254baaf29ef77b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,6 +22,9 @@
<string name="my_circles">My Circles</string>
<string name="photo_galleries">Photo Galleries</string>
<string name="initial_device_name">%s (Android)</string>
+ <string name="like">Like</string>
+ <string name="reply">Reply</string>
+ <string name="share">Share</string>
<plurals name="member_plurals">
<item quantity="one">%d member</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f2feacee049c94f0227eb8099d580bc5b872e5d7..fdc19c79587083be35a5ba8ab360bdf6094f5eac 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,6 +8,16 @@
<item name="android:textSize">17sp</item>
</style>
+ <style name="PostButtonStyle" parent="@style/Widget.MaterialComponents.Button.TextButton.Icon">
+ <item name="textAllCaps">false</item>
+ <item name="cornerRadius">8dp</item>
+ <item name="android:textSize">15sp</item>
+ <item name="iconPadding">4dp</item>
+ <item name="iconSize">24dp</item>
+ <item name="android:padding">4dp</item>
+ <item name="android:minHeight">0dp</item>
+ </style>
+
<style name="headline" parent="TextAppearance.MaterialComponents.Headline6">
<item name="android:textStyle">bold</item>
<item name="android:textSize">17sp</item>
@@ -38,4 +48,8 @@
<item name="android:textColor">@color/gray</item>
<item name="android:textSize">15sp</item>
</style>
+
+ <style name="ShapeAppearanceOverlay.App.CornerSize50Percent" parent="">
+ <item name="cornerSize">50%</item>
+ </style>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 87bc38aaecf03d94dd6b5bb9d0463771dba2aa9d..d7bf13054ddff5ce94281bea2d6eb72d00cf9041 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,6 +10,7 @@
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
+ <item name="colorControlHighlight">#330E7AFE</item>
<item name="android:statusBarColor">@color/status_bar_color</item>
</style>