Skip to content

A
AloqaIM-Android
Unverified Commit d45c1280 authored by Filipe de Lima Brito's avatar Filipe de Lima Brito Committed by GitHub
Browse files
Options

Merge branch 'develop' into 2292-nbamir

parents a79bc39d aa047343
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 159 deletions
app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
View file @ d45c1280
......@@ -3,6 +3,7 @@ package chat.rocket.android.chatrooms.adapter
import android.content.res.Resources
import android.graphics.drawable.Drawable
import android.view.View
import android.widget.TextView
import androidx.core.view.isGone
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
......@@ -15,7 +16,6 @@ import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.bumptech.glide.request.RequestOptions
import kotlinx.android.synthetic.main.item_chat.view.*
import kotlinx.android.synthetic.main.unread_messages_badge.view.*
class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit) :
ViewHolder<RoomItemHolder>(itemView) {
......@@ -31,8 +31,6 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
override fun bindViews(data: RoomItemHolder) {
val room = data.data
with(itemView) {
val avatar = room.avatar
Glide.with(image_avatar.context)
.load(room.avatar)
.apply(RequestOptions.bitmapTransform(RoundedCorners(10)))
......@@ -63,6 +61,7 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
}
if (room.alert) {
val text_total_unread_messages = text_total_unread_messages as TextView
if (room.unread == null) text_total_unread_messages.text = "!"
if (room.unread != null) text_total_unread_messages.text = room.unread
if (room.mentions) text_total_unread_messages.text = "@${room.unread}"
......
app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt
View file @ d45c1280
......@@ -11,7 +11,7 @@ import android.widget.TextView
import androidx.fragment.app.FragmentManager
import chat.rocket.android.R
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import kotlinx.android.synthetic.main.bottom_seet_fragment_directory_sorting.*
import kotlinx.android.synthetic.main.bottom_sheet_fragment_directory_sorting.*
fun showDirectorySortingBottomSheetFragment(
isSortByChannels: Boolean,
......@@ -59,7 +59,7 @@ class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() {
container: ViewGroup?,
savedInstanceState: Bundle?
): View? =
inflater.inflate(R.layout.bottom_seet_fragment_directory_sorting, container, false)
inflater.inflate(R.layout.bottom_sheet_fragment_directory_sorting, container, false)
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
......
app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
View file @ d45c1280
......@@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector,
@Inject
lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
@Inject
lateinit var fagmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
@Inject
lateinit var presenter: MainPresenter
......@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector,
activityDispatchingAndroidInjector
override fun supportFragmentInjector(): AndroidInjector<Fragment> =
fagmentDispatchingAndroidInjector
fragmentDispatchingAndroidInjector
override fun updateLanguage(language: String, country: String?) {
val locale: Locale = if (country != null) {
......
app/src/main/res/drawable/bg_empty_user_avatar.xml
View file @ d45c1280
<vector android:height="24dp" android:viewportHeight="100"
android:viewportWidth="100" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ededed" android:pathData="M50,100q-24.66,0 -49.32,0c-0.57,0 -0.68,-0.11 -0.68,-0.68Q0,50 0,0.68C0,0.11 0.11,0 0.68,0Q50,0 99.32,0c0.57,0 0.68,0.11 0.68,0.68q0,49.32 0,98.64c0,0.57 -0.11,0.68 -0.68,0.68Q74.66,100 50,100Z"/>
<path android:fillColor="#afafae" android:pathData="M49.42,90C41.72,90 34,90 26.34,90a13.82,13.82 0,0 1,-8.55 -2.75A11.18,11.18 0,0 1,13.22 79a46.76,46.76 0,0 1,3 -21.44,17.06 17.06,0 0,1 6.56,-8.48 15.67,15.67 0,0 1,7.3 -2.28,4.52 4.52,0 0,1 2.84,1c1.62,1 3.18,2.14 4.86,3.05a23.24,23.24 0,0 0,20.34 1.5A25.39,25.39 0,0 0,65 48.51c2.81,-2.26 5.65,-1.76 8.61,-0.71 3.73,1.32 6.24,4 8.11,7.39A35.18,35.18 0,0 1,85.31 67,54.2 54.2,0 0,1 86,77.31a12.47,12.47 0,0 1,-4 9.28,12.65 12.65,0 0,1 -7.33,3.22c-3.9,0.4 -7.82,0.13 -11.73,0.17C58.41,90 53.92,90 49.42,90Z"/>
<path android:fillColor="#afafae" android:pathData="M69.35,30.28c0.4,10.36 -8.74,20 -19.89,19.93s-19.92,-9.58 -19.89,-20 8.81,-19.93 20,-19.88C60.64,10.35 69.77,19.87 69.35,30.28Z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="100"
android:viewportHeight="100">
<path
android:fillColor="#ededed"
android:pathData="M50,100q-24.66,0 -49.32,0c-0.57,0 -0.68,-0.11 -0.68,-0.68Q0,50 0,0.68C0,0.11 0.11,0 0.68,0Q50,0 99.32,0c0.57,0 0.68,0.11 0.68,0.68q0,49.32 0,98.64c0,0.57 -0.11,0.68 -0.68,0.68Q74.66,100 50,100Z" />
<path
android:fillColor="#afafae"
android:pathData="M49.42,90C41.72,90 34,90 26.34,90a13.82,13.82 0,0 1,-8.55 -2.75A11.18,11.18 0,0 1,13.22 79a46.76,46.76 0,0 1,3 -21.44,17.06 17.06,0 0,1 6.56,-8.48 15.67,15.67 0,0 1,7.3 -2.28,4.52 4.52,0 0,1 2.84,1c1.62,1 3.18,2.14 4.86,3.05a23.24,23.24 0,0 0,20.34 1.5A25.39,25.39 0,0 0,65 48.51c2.81,-2.26 5.65,-1.76 8.61,-0.71 3.73,1.32 6.24,4 8.11,7.39A35.18,35.18 0,0 1,85.31 67,54.2 54.2,0 0,1 86,77.31a12.47,12.47 0,0 1,-4 9.28,12.65 12.65,0 0,1 -7.33,3.22c-3.9,0.4 -7.82,0.13 -11.73,0.17C58.41,90 53.92,90 49.42,90Z" />
<path
android:fillColor="#afafae"
android:pathData="M69.35,30.28c0.4,10.36 -8.74,20 -19.89,19.93s-19.92,-9.58 -19.89,-20 8.81,-19.93 20,-19.88C60.64,10.35 69.77,19.87 69.35,30.28Z" />
</vector>
app/src/main/res/drawable/ic_action_message_info_outline_24dp.xml
View file @ d45c1280
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="@color/actionMenuColor"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
......
app/src/main/res/drawable/ic_app_name.xml
View file @ d45c1280
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="832.000000dp"
android:height="220.000000dp"
android:viewportWidth="832.000000"
android:viewportHeight="220.000000">
android:width="832.0dp"
android:height="220.0dp"
android:viewportWidth="832.0"
android:viewportHeight="220.0">
<group
android:translateY="220.000000"
android:scaleX="0.100000"
android:scaleY="-0.100000">
android:translateY="220"
android:scaleX="0.1"
android:scaleY="-0.1">
<path
android:fillColor="#04436A"
android:strokeWidth="1"
......
app/src/main/res/drawable/ic_arrow_back_white_24dp.xml
View file @ d45c1280
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:autoMirrored="true"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
</vector>
app/src/main/res/drawable/ic_camera.xml deleted 100644 → 0
View file @ a79bc39d
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="18dp"
android:viewportWidth="20"
android:viewportHeight="18">
<path
android:fillColor="#1D74F5"
android:fillType="nonZero"
android:pathData="M10,10m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"
android:strokeWidth="1"
android:strokeColor="#00000000" />
<path
android:fillColor="#1D74F5"
android:fillType="nonZero"
android:pathData="M7,0L5.17,2L2,2C0.9,2 0,2.9 0,4L0,16C0,17.1 0.9,18 2,18L18,18C19.1,18 20,17.1 20,16L20,4C20,2.9 19.1,2 18,2L14.83,2L13,0L7,0ZM10,15C7.24,15 5,12.76 5,10C5,7.24 7.24,5 10,5C12.76,5 15,7.24 15,10C15,12.76 12.76,15 10,15Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
\ No newline at end of file
app/src/main/res/drawable/ic_camera_24dp.xml 0 → 100644
View file @ d45c1280
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF1D74F5"
android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
<path
android:fillColor="#FF1D74F5"
android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
</vector>
app/src/main/res/drawable/ic_check.xml
View file @ d45c1280
......@@ -4,7 +4,6 @@
android:viewportWidth="17"
android:viewportHeight="12">
<path
android:fillColor="#1D74F5"
android:fillType="nonZero"
......
app/src/main/res/drawable/ic_check_read_24dp.xml
View file @ d45c1280
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#1D74F5"
android:viewportWidth="24"
android:viewportHeight="24">
......
app/src/main/res/drawable/ic_check_unread_24dp.xml
View file @ d45c1280
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#999999"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
......
app/src/main/res/drawable/ic_hashtag_16dp.xml
View file @ d45c1280
......@@ -8,5 +8,5 @@
android:strokeWidth="1"
android:fillColor="#CBCBCC"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
android:strokeColor="#00000000" />
</vector>
app/src/main/res/drawable/ic_lock_12_dp.xml
View file @ d45c1280
......@@ -7,10 +7,10 @@
android:pathData="M1.5,5.5h9v6h-9z"
android:strokeWidth="1"
android:strokeColor="#787878"
android:fillType="evenOdd"/>
android:fillType="evenOdd" />
<path
android:pathData="M2.5,5.5L9.5,5.5L9.5,4C9.5,2.067 7.933,0.5 6,0.5C4.067,0.5 2.5,2.067 2.5,4L2.5,5.5Z"
android:strokeWidth="1"
android:strokeColor="#787878"
android:fillType="evenOdd"/>
android:fillType="evenOdd" />
</vector>
app/src/main/res/drawable/ic_unread_20dp.xml
View file @ d45c1280
......@@ -8,18 +8,18 @@
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#9EA2A8"/>
android:strokeColor="#9EA2A8" />
<path
android:pathData="M7.965,11.783a2.75,2.75 0,0 0,3.915 -3.661l-3.915,3.66z"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#9EA2A8"/>
android:strokeColor="#9EA2A8" />
<path
android:pathData="M3.025,15.047L16.105,3.14"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#9EA2A8"
android:strokeLineCap="round"/>
android:strokeLineCap="round" />
</vector>
app/src/main/res/drawable/ic_user_16dp.xml
View file @ d45c1280
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="15dp"
android:width="16dp"
android:height="16dp"
android:viewportWidth="15"
android:viewportWidth="16"
android:viewportHeight="16">
<group android:translateX="1">
<path
android:fillColor="#CBCBCC"
android:fillType="nonZero"
android:pathData="M1.5248,13.3289C1.7124,13.3993 1.9453,13.471 2.2276,13.5407C3.3824,13.8259 5.0297,14 7.25,14C9.4703,14 11.1176,13.8259 12.2724,13.5407C12.5547,13.471 12.7876,13.3993 12.9752,13.3289C12.8483,12.2275 12.2304,11.6229 11.0233,11.1185C10.8562,11.0486 10.6821,10.9818 10.4514,10.8975C10.5051,10.9171 10.0041,10.7357 9.8749,10.6871C8.6886,10.2409 8.125,9.817 8.1271,8.9552C8.1257,8.9352 8.1257,8.9352 8.1232,8.8835C8.1089,8.5412 8.1341,8.1482 8.2352,7.7544C8.3357,7.3629 8.5018,7.0212 8.7796,6.7313C9.4429,6.0859 9.75,5.4186 9.75,4.4169C9.75,2.7871 8.6092,1.5 7.25,1.5C5.8908,1.5 4.75,2.7871 4.75,4.4169C4.75,5.4177 5.0499,6.0675 5.7166,6.7436C5.9791,7.0111 6.1513,7.3472 6.2566,7.7298C6.3671,8.1314 6.3941,8.5324 6.3773,8.8838C6.3741,8.9408 6.3741,8.9408 6.375,8.8986C6.375,9.817 5.8114,10.2409 4.6251,10.6871C4.4959,10.7357 3.9949,10.9171 4.0486,10.8975C3.8179,10.9818 3.6438,11.0486 3.4767,11.1185C2.2696,11.6229 1.6517,12.2275 1.5248,13.3289ZM0,13.7878C0,11.6909 1.029,10.5156 2.8983,9.7344C3.0901,9.6543 3.2836,9.58 3.5339,9.4886C3.4888,9.505 3.978,9.3279 4.0971,9.2831C4.7164,9.0502 4.875,8.9309 4.8778,8.834C4.8775,8.8383 4.8775,8.8383 4.879,8.8121C4.8889,8.6053 4.8718,8.351 4.8104,8.1279C4.7676,7.9725 4.7093,7.8588 4.6472,7.7955C3.7195,6.8547 3.25,5.8375 3.25,4.4169C3.25,1.9963 5.0194,0 7.25,0C9.4806,0 11.25,1.9963 11.25,4.4169C11.25,5.8419 10.7679,6.8896 9.8447,7.7872C9.7867,7.8479 9.7298,7.9649 9.6881,8.1274C9.6297,8.3548 9.6132,8.6125 9.6219,8.8209C9.6231,8.8456 9.6231,8.8456 9.625,8.8986C9.625,8.9309 9.7836,9.0502 10.4029,9.2831C10.522,9.3279 11.0112,9.505 10.9661,9.4886C11.2164,9.58 11.4099,9.6543 11.6017,9.7344C13.471,10.5156 14.5,11.6909 14.5,13.7878L14.5,14.1647L14.1975,14.3896C13.9508,14.573 13.4546,14.7939 12.6319,14.997C11.351,15.3133 9.5847,15.5 7.25,15.5C4.9153,15.5 3.149,15.3133 1.8681,14.997C1.0454,14.7939 0.5492,14.573 0.3025,14.3896L0,14.1647L0,13.7878Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</group>
</vector>
app/src/main/res/drawable/image_dummy.xml
View file @ d45c1280
......@@ -7,10 +7,10 @@
android:pathData="M0,0h80v45h-80z"
android:strokeColor="#00000000"
android:fillColor="#C3D1DA"
android:strokeWidth="1"/>
android:strokeWidth="1" />
<path
android:pathData="M43.99,16.75C44.34,16.75 44.64,16.87 44.88,17.12C45.13,17.36 45.25,17.66 45.25,18.01L45.25,26.74C45.25,27.09 45.13,27.39 44.88,27.63C44.64,27.88 44.34,28 43.99,28L35.26,28C34.91,28 34.61,27.88 34.37,27.63C34.12,27.39 34,27.09 34,26.74L34,18.01C34,17.66 34.12,17.36 34.37,17.12C34.61,16.87 34.91,16.75 35.26,16.75L43.99,16.75ZM43.99,26.74L43.99,18.01L35.26,18.01L35.26,26.74L43.99,26.74ZM40.86,22.55L43.05,25.51L36.2,25.51L37.9,23.28L39.13,24.78L40.86,22.55Z"
android:strokeColor="#00000000"
android:fillColor="#5D8298"
android:strokeWidth="1"/>
android:strokeWidth="1" />
</vector>
app/src/main/res/drawable/message_reply_button_bg.xml
View file @ d45c1280
......@@ -6,5 +6,7 @@
<corners android:radius="4dp" />
<stroke android:color="#1D74F5" android:width="2dp" />
<stroke
android:width="2dp"
android:color="#1D74F5" />
</shape>
\ No newline at end of file
app/src/main/res/layout/app_bar_password.xml
View file @ d45c1280
......@@ -15,9 +15,11 @@
app:navigationIcon="?android:attr/homeAsUpIndicator"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/ActionModeStyle">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/text_change_password"
android:layout_width="wrap_content"
......
app/src/main/res/layout/bottom_seet_fragment_directory_sorting.xml → app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml
View file @ d45c1280
......@@ -83,11 +83,11 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_divider_two" />
<Switch
android:id="@+id/switch_global_users"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:checked="false"
app:layout_constraintBottom_toBottomOf="@+id/text_search_for_global_users"
......@@ -108,5 +108,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_search_for_global_users" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/emoji_image_row_item.xml
View file @ d45c1280
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/emoji_image_view"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center">
<ImageView
android:id="@+id/emoji_image_view"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:padding="8dp"
tools:src="@tools:sample/avatars" />
\ No newline at end of file
</FrameLayout>
app/src/main/res/layout/fragment_authentication_on_boarding.xml
View file @ d45c1280
......@@ -25,6 +25,7 @@
android:id="@+id/text_on_boarding_title"
style="@style/Authentication.TextView.Headline"
android:layout_marginTop="32dp"
android:gravity="center"
android:text="@string/msg_welcome_to_rocket_chat"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -33,6 +34,7 @@
<TextView
android:id="@+id/text_on_boarding_description"
style="@style/Authentication.TextView.Description"
android:gravity="center"
android:text="@string/msg_team_communication"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -41,7 +43,7 @@
<RelativeLayout
android:id="@+id/connect_with_a_server_container"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_height="60sp"
android:layout_marginTop="32dp"
android:background="@drawable/rounded_border"
android:foreground="?selectableItemBackground"
......@@ -84,7 +86,7 @@
<RelativeLayout
android:id="@+id/join_community_container"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_height="60sp"
android:layout_marginTop="10dp"
android:background="@drawable/rounded_border"
android:foreground="?selectableItemBackground"
......@@ -136,7 +138,7 @@
<RelativeLayout
android:id="@+id/create_server_container"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_height="60sp"
android:layout_marginTop="10dp"
android:background="@drawable/rounded_color_accent"
android:foreground="?selectableItemBackground"
......
app/src/main/res/layout/fragment_authentication_server.xml
View file @ d45c1280
......@@ -26,6 +26,7 @@
android:id="@+id/text_sign_in_to_your_server"
style="@style/Authentication.TextView.Headline"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/title_sign_in_your_server"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
app/src/main/res/layout/fragment_chat_details.xml
View file @ d45c1280
......@@ -21,7 +21,9 @@
style="@style/ChatDetails.Title.TextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="#important" />
android:drawableStart="@drawable/ic_hashtag_black_12dp"
android:drawablePadding="@dimen/text_view_drawable_padding"
tools:text="important" />
<TextView
android:id="@+id/title_description"
......
app/src/main/res/layout/fragment_settings.xml
View file @ d45c1280
......@@ -69,7 +69,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/image_avatar"
app:layout_constraintTop_toBottomOf="@+id/text_display_name"
tools:text="visible" />
tools:text="online" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
......
app/src/main/res/layout/item_actions_attachment.xml
View file @ d45c1280
......@@ -24,7 +24,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have made sure that everything is amazing!" />
<View
android:id="@+id/quote_bar"
......
app/src/main/res/layout/item_chat.xml
View file @ d45c1280
......@@ -62,16 +62,16 @@
android:layout_marginEnd="12dp"
android:textDirection="locale"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/layout_unread_messages_badge"
app:layout_constraintEnd_toStartOf="@+id/text_total_unread_messages"
app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
tools:text="Filipe de Lima Brito: Type something that is very long and need at least two lines, or maybe even more" />
<include
android:id="@+id/layout_unread_messages_badge"
android:id="@+id/text_total_unread_messages"
layout="@layout/unread_messages_badge"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_width="21sp"
android:layout_height="21sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/text_last_message" />
......
app/src/main/res/layout/item_message.xml
View file @ d45c1280
......@@ -156,7 +156,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/message_header"
app:layout_constraintTop_toBottomOf="@+id/message_header"
tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have made sure that everything is amazing!" />
<Button
android:id="@+id/button_join_video_call"
......
app/src/main/res/layout/message_attachment_options.xml
View file @ d45c1280
......@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="20dp"
android:drawableStart="@drawable/ic_camera"
android:drawableStart="@drawable/ic_camera_24dp"
android:gravity="start|center"
android:text="@string/action_take_a_photo" />
......
app/src/main/res/layout/unread_messages_badge.xml
View file @ d45c1280
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/text_total_unread_messages"
style="@style/ChatList.Badge.TextView"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_width="21sp"
android:layout_height="21sp"
android:background="@drawable/style_total_unread_messages"
android:visibility="gone"
tools:text="1"
tools:visibility="visible" />
\ No newline at end of file
</LinearLayout>
\ No newline at end of file
app/src/main/res/values-ar/strings.xml
View file @ d45c1280
......@@ -138,9 +138,9 @@
<string name="msg_utc_offset">التقديم عن UTC</string>
<string name="msg_new_password">إدخال كلمة سر جديدة</string>
<string name="msg_confirm_password">تأكيد كلمة السر</string>
<string name="msg_channel_name">تغيير الاسم</string>
<string name="msg_channel_name">اسم القناة</string>
<string name="msg_search">بحث</string>
<string name="msg_unread_messages">لرسالة غير مقروءة</string>
<string name="msg_unread_messages">رسائل غير مقروءة</string>
<string name="msg_preview_video">فيديو</string>
<string name="msg_preview_audio">صوت</string>
<string name="msg_preview_photo">صورة</string>
......@@ -185,7 +185,7 @@
<string name="msg_no_announcement">لا يوجد ملف مضاف</string>
<string name="msg_no_description">لا يوجد وصف مضاف</string>
<string name="msg_send_email">أرسال بريد</string>
<string name="msg_android_app_support">خدمة البرنامج </string>
<string name="msg_android_app_support">خدمة البرنامج</string>
<string name="msg_unable_to_update_password">لا يمكن تحديث كلمة السر خطأ: %1$s</string>
<string name="msg_password_updated_successfully">تم تحديث كلمة السر</string>
<plurals name="msg_reacted_with_">
......@@ -235,7 +235,7 @@
<string name="message_user_joined_channel">إنضم للقناة</string>
<string name="message_welcome">أهلا %s</string>
<string name="message_removed">تم حذف الرسالة</string>
<string name="message_pinned">تمميز رسالة:</string>
<string name="message_pinned">تعلق رسالة:</string>
<string name="message_muted">المسخدم %1$s صامت بواسطة %2$s</string>
<string name="message_unmuted">المستخدم %1$s غير صامت بواسطة %2$s</string>
<string name="message_role_add">%1$s تم جعله %2$s بواسطة %3$s</string>
......@@ -272,7 +272,7 @@
<string name="title_members_list">الأعضاء</string>
<!-- Mentions -->
<string name="msg_mentions">إشارة</string>
<string name="msg_mentions">إشارات</string>
<string name="msg_no_mention">لا إشارة</string>
<string name="msg_all_the_mentions_appear_here">الإشارات \nتظهر هنا</string>
......@@ -282,7 +282,7 @@
<string name="no_pinned_description">الرسائل المميزة\nتظهر هنا</string>
<!-- Favorite Messages -->
<string name="title_favorite_messages">الرسائل المفصلة</string>
<string name="title_favorite_messages">الرسائل المفضلة</string>
<string name="no_favorite_messages">الرسائل غير المفضلة</string>
<string name="no_favorite_description">الرسائل المفضلة\nتظهر هنا</string>
......@@ -318,7 +318,7 @@
<string name="Invite_user_to_join_channel_all_from">دعوة أعضاء [#channel] للانضمام لهذه المجموعة</string>
<string name="Invite_user_to_join_channel_all_to">دعوة أعضاء هذه المجموعة للانضمام ل [#channel]</string>
<string name="Archive">ارشيف</string>
<string name="Remove_someone_from_room">إوالة شخص من الغرفة</string>
<string name="Remove_someone_from_room">إزالة شخص من الغرفة</string>
<string name="Leave_the_current_channel">مغادرة القناة الحالية</string>
<string name="Displays_action_text">عرض نص الاجراء</string>
<string name="Direct_message_someone">رسالة مباشرة</string>
......@@ -328,7 +328,7 @@
<string name="Unarchive">حذف من الأرشيف</string>
<string name="Join_the_given_channel">الانضمام للقناة المعطاه</string>
<string name="Guggy_Command_Description">صنع gif بناءا على النص المعطى</string>
<string name="Slash_Topic_Description">وضع الموضوع</string>
<string name="Slash_Topic_Description">تعيين الموضوع</string>
<!-- Emoji messages -->
<string name="msg_no_recent_emoji">لا يوجد ايموجيز</string>
......
app/src/main/res/values/styles.xml
View file @ d45c1280
......@@ -10,6 +10,7 @@
<item name="searchViewStyle">@style/ChatRoom.SearchView</item>
<item name="actionModeBackground">@color/colorPrimary</item>
<item name="android:actionModeBackground">@color/colorPrimary</item>
<item name="android:textDirection">locale</item>
</style>
<!-- Widget styles. -->
......
emoji/src/main/res/drawable/ic_backspace_gray_24dp.xml
View file @ d45c1280
......@@ -8,8 +8,5 @@
<path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
<path
android:fillColor="@color/colorEmojiIcon"
android:pathData="M22,3 L7,3 C6.31,3,5.77,3.35,5.41,3.88 L0,12 L5.41,20.11
C5.77,20.64,6.31,21,7,21 L22,21 C23.1,21,24,20.1,24,19 L24,5 C24,3.9,23.1,3,22,3
Z M19,15.59 L17.59,17 L14,13.41 L10.41,17 L9,15.59 L12.59,12 L9,8.41 L10.41,7
L14,10.59 L17.59,7 L19,8.41 L15.41,12 L19,15.59 Z" />
android:pathData="M22,3 L7,3 C6.31,3,5.77,3.35,5.41,3.88 L0,12 L5.41,20.11 C5.77,20.64,6.31,21,7,21 L22,21 C23.1,21,24,20.1,24,19 L24,5 C24,3.9,23.1,3,22,3 Z M19,15.59 L17.59,17 L14,13.41 L10.41,17 L9,15.59 L12.59,12 L9,8.41 L10.41,7 L14,10.59 L17.59,7 L19,8.41 L15.41,12 L19,15.59 Z" />
</vector>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023