Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Code quality

Browse Source 
Fix neg margin + typo in jitsi
This commit is contained in:
Valere 2020-08-14 10:10:08 +02:00
parent 8c150aa3e8
commit 050ef659b3
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
View File

@ -352,7 +352,6 @@ class RoomDetailViewModel @AssistedInject constructor(
val roomId: String = room.roomId
val confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.toLowerCase(VectorLocale.applicationLocale)
// DO NOT COMMIT
val jitsiDomain = session.getHomeServerCapabilities().preferredJitsiDomain ?: stringProvider.getString(R.string.preferred_jitsi_domain)
// We use the default element wrapper for this widget

29
vector/src/main/res/layout/custom_action_item_layout_badge.xml
View File

@ -1,31 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout style="?attr/actionButtonStyle"
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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"
style="?attr/actionButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:focusable="true"
xmlns:tools="http://schemas.android.com/tools">
android:focusable="true">
<ImageView
android:id="@+id/action_view_icon_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_integrations"
android:tint="@color/riotx_accent"
android:src="@drawable/ic_integrations"/>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/cart_badge"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="right|end|top"
android:layout_marginEnd="-4dp"
android:layout_marginTop="8dp"
android:background="@drawable/bg_unread_highlight"
android:gravity="center"
android:textColor="@android:color/white"
tools:text="8"
android:textSize="8sp"/>
android:textSize="8sp"
app:layout_constraintCircle="@+id/action_view_icon_image"
app:layout_constraintCircleAngle="45"
app:layout_constraintCircleRadius="12dp"
tools:ignore="MissingConstraints"
tools:text="8" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
vector/src/main/res/values/strings.xml
View File

@ -93,7 +93,7 @@
<string name="conference_call_in_progress">A conference is already in progress!</string>
<string name="video_meeting">Start video meeting</string>
<string name="audio_meeting">Start audio meeting</string>
<string name="audio_video_meeting_description">Meetings use Jisti security and permission policies. All people currently in the room will see an invite to join while your meeting is happening.</string>
<string name="audio_video_meeting_description">Meetings use Jitsi security and permission policies. All people currently in the room will see an invite to join while your meeting is happening.</string>
<string name="missing_permissions_title_to_start_conf_call">Cannot start call</string>
<string name="cannot_call_yourself">You cannot place a call with yourself</string>
<string name="cannot_call_yourself_with_invite">You cannot place a call with yourself, wait for participants to accept invitation</string>