thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 10 Pull requests 1 Wiki Activity Actions 1

Change round square avatar resource + Allow animated avatar

Browse source
This commit is contained in:
12aw 2023-11-27 09:57:13 +01:00
parent ef097c4d0f
commit c9c407cf5c
21 changed files with 87 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -73,7 +73,6 @@ dependencies {
implementation 'org.minidns:minidns-hla:1.0.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 'jetty:javax.servlet:5.1.12'
implementation 'com.google.code.gson:gson:2.10'
implementation 'androidx.multidex:multidex:2.0.1'

8
src/main/res/layout/ab_title.xml
View file

@ -14,7 +14,7 @@
android:onClick="onClick"
android:layout_centerVertical="true">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/toolbar_avatar"
android:layout_width="38dp"
android:layout_height="38dp"
@ -22,10 +22,10 @@
android:layout_marginRight="8dp"
android:padding="1dp"
android:scaleType="centerCrop"
app:riv_corner_radius="30dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound"
android:visibility="gone"/>
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/toolbar_avatar_square"
android:layout_width="38dp"
android:layout_height="38dp"
@ -33,7 +33,7 @@
android:layout_marginRight="8dp"
android:padding="1dp"
android:scaleType="centerCrop"
app:riv_corner_radius="5dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare"
android:visibility="gone"/>
</RelativeLayout>
<TextView

8
src/main/res/layout/account_row.xml
View file

@ -18,7 +18,7 @@
android:paddingTop="8dp"
android:paddingBottom="8dp">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/account_image"
android:layout_width="48dp"
android:layout_height="48dp"
@ -26,9 +26,9 @@
android:layout_alignParentLeft="true"
android:contentDescription="@string/account_image_description"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="30dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/account_image_square"
android:layout_width="48dp"
android:layout_height="48dp"
@ -36,7 +36,7 @@
android:layout_alignParentLeft="true"
android:contentDescription="@string/account_image_description"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<LinearLayout
android:layout_width="match_parent"

8
src/main/res/layout/activity_contact_details.xml
View file

@ -52,24 +52,24 @@
android:orientation="horizontal"
android:layout_gravity="center_horizontal" >
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/details_contact_badge"
android:layout_width="80dp"
android:layout_height="80dp"
android:adjustViewBounds="true"
android:padding="1dp"
android:scaleType="centerCrop"
app:riv_corner_radius="50dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRoundBig"
android:visibility="gone" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/details_contact_badge_square"
android:layout_width="80dp"
android:layout_height="80dp"
android:adjustViewBounds="true"
android:padding="1dp"
android:scaleType="centerCrop"
app:riv_corner_radius="5dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare"
android:visibility="gone" />
</LinearLayout>

8
src/main/res/layout/activity_edit_account.xml
View file

@ -414,7 +414,7 @@ android:fontFamily="notosansregular"
</RelativeLayout>
</RelativeLayout>
<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"
@ -428,9 +428,9 @@ android:fontFamily="notosansregular"
android:maxWidth="@dimen/avatar_on_details_screen_size"
android:maxHeight="@dimen/avatar_on_details_screen_size"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="90dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRoundBig" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/avater_square"
android:layout_width="@dimen/avatar_on_details_screen_size"
android:layout_height="@dimen/avatar_on_details_screen_size"
@ -444,7 +444,7 @@ android:fontFamily="notosansregular"
android:maxWidth="@dimen/avatar_on_details_screen_size"
android:maxHeight="@dimen/avatar_on_details_screen_size"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
</RelativeLayout>
<com.google.android.material.materialswitch.MaterialSwitch

10
src/main/res/layout/activity_manage_accounts.xml
View file

@ -25,7 +25,7 @@
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"
@ -33,7 +33,7 @@
android:src="@drawable/ic_call_white_48dp"
android:background="@color/accent_monocles"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="2dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<LinearLayout
android:layout_width="fill_parent"
@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:scrollHorizontally="false"
android:singleLine="true"
android:text="Manage Phone Accounts"
android:text="@string/manage_phone_accounts"
android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
<TextView
@ -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"
@ -67,7 +67,7 @@
android:paddingRight="16dp"
android:src="?attr/icon_settings"
app:strokeColor="@null"
app:riv_corner_radius="2dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
</RelativeLayout>
</LinearLayout>

8
src/main/res/layout/activity_muc_contact_details.xml
View file

@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/details_contact_badge"
android:layout_width="@dimen/avatar_on_details_screen_size"
android:layout_height="@dimen/avatar_on_details_screen_size"
@ -71,9 +71,9 @@
android:layout_marginRight="@dimen/avatar_item_distance"
android:padding="1dp"
android:scaleType="centerCrop"
app:riv_corner_radius="80dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRoundBig" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/details_contact_badge_square"
android:layout_width="@dimen/avatar_on_details_screen_size"
android:layout_height="@dimen/avatar_on_details_screen_size"
@ -81,7 +81,7 @@
android:layout_marginRight="@dimen/avatar_item_distance"
android:padding="1dp"
android:scaleType="centerCrop"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<LinearLayout
android:layout_width="wrap_content"

16
src/main/res/layout/activity_muc_details.xml
View file

@ -32,24 +32,24 @@
android:paddingRight="@dimen/image_button_padding"
android:src="?attr/icon_edit_body" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/details_muc_avatar"
android:layout_width="@dimen/avatar_on_details_screen_size"
android:layout_height="@dimen/avatar_on_details_screen_size"
android:padding="1dp"
android:layout_gravity="center"
android:scaleType="centerCrop"
app:riv_corner_radius="80dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRoundBig"
android:visibility="gone" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/details_muc_avatar_square"
android:layout_width="@dimen/avatar_on_details_screen_size"
android:layout_height="@dimen/avatar_on_details_screen_size"
android:padding="1dp"
android:layout_gravity="center"
android:scaleType="centerCrop"
app:riv_corner_radius="5dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare"
android:visibility="gone" />
<LinearLayout
@ -330,7 +330,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<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"
@ -340,10 +340,10 @@
android:layout_alignParentRight="false"
android:padding="1dp"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="80dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRoundBig"
android:visibility="gone" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/your_photo_square"
android:layout_width="@dimen/avatar_on_details_screen_size"
android:layout_height="@dimen/avatar_on_details_screen_size"
@ -351,7 +351,7 @@
android:layout_toRightOf="@+id/your_photo"
android:padding="1dp"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare"
android:visibility="gone" />
<LinearLayout

4
src/main/res/layout/activity_publish_profile_picture.xml
View file

@ -44,7 +44,7 @@
android:layout_marginTop="@dimen/publish_avatar_top_margin"
android:layout_marginBottom="8dp">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/account_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -53,7 +53,7 @@
android:maxHeight="384dp"
android:padding="1dp"
android:scaleType="centerCrop"
app:riv_corner_radius="@dimen/rounded_image_border" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<!-- TODO: Add round account image too -->
</FrameLayout>

4
src/main/res/layout/activity_rtp_session.xml
View file

@ -97,12 +97,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"
app:strokeColor="@color/custom_theme_accent" />
<TextView

8
src/main/res/layout/contact.xml
View file

@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:padding="@dimen/list_padding">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/contact_photo"
android:layout_width="56dp"
android:layout_height="56dp"
@ -21,9 +21,9 @@
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="30dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/contact_photo_square"
android:layout_width="56dp"
android:layout_height="56dp"
@ -31,7 +31,7 @@
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<ImageView
android:id="@+id/user_active_indicator"

8
src/main/res/layout/conversation_list_row.xml
View file

@ -20,7 +20,7 @@
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"
@ -28,9 +28,9 @@
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="30dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/conversation_image_square"
android:layout_width="56dp"
android:layout_height="56dp"
@ -38,7 +38,7 @@
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<ImageView
android:id="@+id/user_active_indicator"

6
src/main/res/layout/message_content.xml
View file

@ -43,7 +43,7 @@
android:visibility="gone"
android:orientation="horizontal">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -52,7 +52,7 @@
android:maxWidth="500dp"
android:maxHeight="500dp"
android:scaleType="centerCrop"
app:riv_corner_radius="@dimen/rounded_image_border" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/message_image_gif"
@ -63,7 +63,7 @@
android:maxWidth="500dp"
android:maxHeight="500dp"
android:scaleType="centerCrop"
app:riv_corner_radius="@dimen/rounded_image_border" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<TextView
android:id="@+id/media_duration"

8
src/main/res/layout/message_received.xml
View file

@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo"
android:layout_width="40dp"
android:layout_height="40dp"
@ -38,9 +38,9 @@
android:layout_alignParentTop="true"
android:scaleType="fitXY"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="30dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo_square"
android:layout_width="40dp"
android:layout_height="40dp"
@ -49,7 +49,7 @@
android:layout_alignParentTop="true"
android:scaleType="fitXY"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<LinearLayout
android:id="@+id/message_box"

8
src/main/res/layout/message_sent.xml
View file

@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo"
android:layout_width="40dp"
android:layout_height="40dp"
@ -39,9 +39,9 @@
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="30dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo_square"
android:layout_width="40dp"
android:layout_height="40dp"
@ -50,7 +50,7 @@
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<View
android:id="@+id/placeholder"

8
src/main/res/layout/message_status.xml
View file

@ -21,7 +21,7 @@
android:text="@string/load_more_messages"
android:textColor="?attr/colorAccent" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo"
android:layout_width="32dp"
android:layout_height="32dp"
@ -34,9 +34,9 @@
android:scaleType="fitXY"
android:visibility="gone"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="30dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/message_photo_square"
android:layout_width="32dp"
android:layout_height="32dp"
@ -49,7 +49,7 @@
android:scaleType="fitXY"
android:visibility="gone"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<TextView
android:id="@+id/status_message"

8
src/main/res/layout/search_result_item.xml
View file

@ -9,7 +9,7 @@
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"
@ -17,9 +17,9 @@
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="30dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound" />
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/avatar_square"
android:layout_width="48dp"
android:layout_height="48dp"
@ -27,7 +27,7 @@
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
app:strokeColor="@color/custom_theme_accent"
app:riv_corner_radius="5dp" />
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoSquare" />
<RelativeLayout
android:layout_width="wrap_content"

4
src/main/res/layout/user_preview.xml
View file

@ -7,12 +7,12 @@
android:background="?selectableItemBackground"
android:padding="2dp">
<com.makeramen.roundedimageview.RoundedImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/avatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black54"
app:riv_corner_radius="30dp"
app:shapeAppearance="@style/ShapeAppearanceOverlay.PhotoRound"
android:scaleType="fitXY" />
</eu.siacs.conversations.ui.widget.SquareFrameLayout>
</layout>

1
src/main/res/values/about.xml
View file

@ -29,7 +29,6 @@
\n\nhttps://github.com/leolin310148/ShortcutBadger\n(Apache License, Version 2.0)
\n\nhttps://github.com/kyleduo/SwitchButton\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/google/gson\n(Apache License, Version 2.0)
\n\nhttp://hc.apache.org/httpcomponents-client\n(Apache License, Version 2.0)

1
src/main/res/values/strings.xml
View file

@ -1362,4 +1362,5 @@
<string name="not_dnssec_verified">Not DNSSEC verified</string>
<string name="dnssec_dane_verified">DNSSEC + DANE verified</string>
<string name="dnssec_verified">DNSSEC verified</string>
<string name="manage_phone_accounts">Manage phone accounts</string>
</resources>

20
src/main/res/values/styles.xml
View file

@ -249,4 +249,24 @@
<item name="android:alpha">0.8</item>
<item name="fontFamily">@font/notosansregular</item>
</style>
<style name="ShapeAppearanceOverlay.PhotoSquare" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">5dp</item>
</style>
<style name="ShapeAppearanceOverlay.PhotoRound" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">50%</item>
</style>
<style name="ShapeAppearanceOverlay.IncomingCall" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">@dimen/incoming_call_radius</item>
</style>
<style name="ShapeAppearanceOverlay.PhotoRoundBig" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">50%</item>
</style>
</resources>