Stephen Paul Weber created
Why have two things that do the same job? And Shapeable is better, works for
animations etcbuild.gradle | 1 -
src/cheogram/res/values/styles.xml | 13 +++++++++++++
src/main/res/layout/account_row.xml | 6 +++---
src/main/res/layout/activity_edit_account.xml | 4 ++--
src/main/res/layout/activity_manage_accounts.xml | 8 ++++----
src/main/res/layout/activity_muc_details.xml | 4 ++--
src/main/res/layout/activity_rtp_session.xml | 4 ++--
src/main/res/layout/contact.xml | 6 +++---
src/main/res/layout/conversation_list_row.xml | 4 ++--
src/main/res/layout/message_received.xml | 4 ++--
src/main/res/layout/message_sent.xml | 4 ++--
src/main/res/layout/message_status.xml | 6 +++---
src/main/res/layout/search_result_item.xml | 6 +++---
src/main/res/values/about.xml | 1 -
14 files changed, 41 insertions(+), 30 deletions(-)
@@ -75,7 +75,6 @@ dependencies {
implementation 'de.measite.minidns:minidns-hla:0.2.4'
implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
implementation 'org.whispersystems:signal-protocol-android:2.6.2'
- implementation 'com.makeramen:roundedimageview:2.3.0'
implementation "com.wefika:flowlayout:0.4.1"
//noinspection GradleDependency
implementation 'com.otaliastudios:transcoder:0.9.1'
@@ -0,0 +1,13 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+<style name="ShapeAppearanceOverlay.Photo" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+ <item name="cornerFamily">rounded</item>
+ <item name="cornerSize">2dp</item>
+</style>
+
+<style name="ShapeAppearanceOverlay.IncomingCall" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+ <item name="cornerFamily">rounded</item>
+ <item name="cornerSize">@dimen/incoming_call_radius</item>
+</style>
+
+</resources>
@@ -10,13 +10,13 @@
android:paddingBottom="8dp"
android:paddingTop="8dp">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/account_image"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:contentDescription="@string/account_image_description"
- app:riv_corner_radius="2dp" />
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<LinearLayout
android:layout_width="fill_parent"
@@ -55,4 +55,4 @@
android:focusable="false" />
</RelativeLayout>
-</layout>
+</layout>
@@ -38,14 +38,14 @@
android:layout_height="wrap_content"
android:padding="@dimen/card_padding_regular">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/avater"
android:layout_width="@dimen/avatar_on_details_screen_size"
android:layout_height="@dimen/avatar_on_details_screen_size"
android:layout_alignParentTop="true"
android:layout_marginRight="@dimen/avatar_item_distance"
android:contentDescription="@string/account_image_description"
- app:riv_corner_radius="2dp"/>
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<LinearLayout
android:layout_width="fill_parent"
@@ -26,14 +26,14 @@
android:paddingBottom="8dp"
android:paddingTop="8dp">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/phone_accounts_image"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:src="@drawable/ic_call_white_48dp"
android:background="@color/yeller"
- app:riv_corner_radius="2dp" />
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<LinearLayout
android:layout_width="fill_parent"
@@ -58,7 +58,7 @@
android:textAppearance="@style/TextAppearance.Conversations.Body2" />
</LinearLayout>
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/phone_accounts_settings"
android:layout_width="48dp"
android:layout_height="48dp"
@@ -66,7 +66,7 @@
android:layout_centerVertical="true"
android:paddingRight="16dp"
android:src="?attr/icon_settings"
- app:riv_corner_radius="2dp" />
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
</RelativeLayout>
</LinearLayout>
@@ -42,12 +42,12 @@
android:layout_height="wrap_content"
android:layout_marginBottom="32dp">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/your_photo"
android:layout_width="@dimen/avatar_on_details_screen_size"
android:layout_height="@dimen/avatar_on_details_screen_size"
android:layout_alignParentStart="true"
- app:riv_corner_radius="2dp"
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo"
android:layout_marginEnd="@dimen/avatar_item_distance"
android:layout_alignParentLeft="true"
android:layout_marginRight="@dimen/avatar_item_distance" />
@@ -99,12 +99,12 @@
android:layout_alignParentBottom="true"
android:visibility="gone" />
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/contact_photo"
android:layout_width="@dimen/publish_avatar_size"
android:layout_height="@dimen/publish_avatar_size"
android:layout_centerInParent="true"
- app:riv_corner_radius="@dimen/incoming_call_radius" />
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.IncomingCall" />
</RelativeLayout>
@@ -8,13 +8,13 @@
android:background="?selectableItemBackground"
android:padding="@dimen/list_padding">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/contact_photo"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
- app:riv_corner_radius="2dp"/>
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<LinearLayout
android:layout_width="wrap_content"
@@ -55,4 +55,4 @@
</LinearLayout>
</RelativeLayout>
-</layout>
+</layout>
@@ -19,13 +19,13 @@
android:orientation="horizontal"
android:padding="8dp">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/conversation_image"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
- app:riv_corner_radius="2dp" />
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<RelativeLayout
android:layout_width="fill_parent"
@@ -10,14 +10,14 @@
android:paddingRight="8dp"
android:paddingTop="3dp">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:scaleType="fitXY"
- app:riv_corner_radius="2dp" />
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<LinearLayout
android:id="@+id/message_box"
@@ -23,12 +23,12 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
- app:riv_corner_radius="2dp" />
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<View
android:id="@+id/placeholder"
@@ -19,7 +19,7 @@
android:text="@string/load_more_messages"
android:textColor="?colorAccent"/>
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo"
android:layout_width="32dp"
android:layout_height="32dp"
@@ -28,7 +28,7 @@
android:layout_marginRight="-1.5dp"
android:padding="0dp"
android:scaleType="fitXY"
- app:riv_corner_radius="1dp"/>
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<TextView
android:id="@+id/status_message"
@@ -43,4 +43,4 @@
android:text="@string/contact_has_read_up_to_this_point"
android:textAppearance="@style/TextAppearance.Conversations.Status"/>
-</RelativeLayout>
+</RelativeLayout>
@@ -9,13 +9,13 @@
android:background="?selectableItemBackground"
android:padding="@dimen/list_padding">
- <com.makeramen.roundedimageview.RoundedImageView
+ <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/avatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
- app:riv_corner_radius="2dp" />
+ app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
<RelativeLayout
android:layout_width="wrap_content"
@@ -60,4 +60,4 @@
</RelativeLayout>
</RelativeLayout>
-</layout>
+</layout>
@@ -55,7 +55,6 @@
\n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
\n\nhttps://github.com/leolin310148/ShortcutBadger\n(Apache License, Version 2.0)
\n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3)
- \n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0)
\n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0)
\n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
\n\nhttps://github.com/osmdroid/osmdroid\n(Apache License, Version 2.0)