keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fix spacing issue

Browse Source
pull/620/head
Niels Andriesse 3 years ago
parent 6393ed03bd
commit 1d83920684
31 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File

3
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt
Unescape Escape View File

@ -12,6 +12,7 @@ import androidx.core.view.children
import androidx.core.view.isVisible
import kotlinx.android.synthetic.main.album_thumbnail_view.view.*
import network.loki.messenger.R
import org.session.libsession.utilities.ViewUtil
import org.thoughtcrime.securesms.MediaPreviewActivity
import org.thoughtcrime.securesms.components.CornerMask
import org.thoughtcrime.securesms.conversation.v2.utilities.KThumbnailView
@ -20,6 +21,7 @@ import org.thoughtcrime.securesms.loki.utilities.ActivityDispatcher
import org.thoughtcrime.securesms.longmessage.LongMessageActivity
import org.thoughtcrime.securesms.mms.GlideRequests
import org.thoughtcrime.securesms.mms.Slide
import kotlin.math.roundToInt
class AlbumThumbnailView : FrameLayout {
@ -118,6 +120,7 @@ class AlbumThumbnailView : FrameLayout {
val maxEllipsis = (0 until layout.lineCount).maxByOrNull { lineNum -> layout.getEllipsisCount(lineNum) }
?: 0
// show read more text if at least one line is ellipsized
ViewUtil.setPaddingTop(albumCellBodyTextParent, if (maxEllipsis > 0) resources.getDimension(R.dimen.small_spacing).roundToInt() else resources.getDimension(R.dimen.medium_spacing).roundToInt())
albumCellBodyTextReadMore.isVisible = maxEllipsis > 0
}
}

9
app/src/main/res/layout/album_thumbnail_view.xml
Unescape Escape View File

@ -43,23 +43,21 @@
/>
<LinearLayout
android:id="@+id/albumCellBodyTextParent"
android:paddingHorizontal="@dimen/small_spacing"
android:padding="@dimen/medium_spacing"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/albumCellBodyTextReadMore"
android:orientation="horizontal">
<View
android:layout_marginStart="@dimen/small_spacing"
android:layout_width="@dimen/accent_line_thickness"
android:layout_height="match_parent"
android:layout_marginVertical="@dimen/small_spacing"
android:background="@color/accent"/>
<TextView
android:maxLines="4"
android:ellipsize="end"
android:id="@+id/albumCellBodyText"
android:textColor="@color/core_white"
android:layout_margin="@dimen/small_spacing"
android:layout_marginStart="@dimen/small_spacing"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
@ -70,7 +68,8 @@
app:layout_constraintStart_toStartOf="parent"
android:id="@+id/albumCellBodyTextReadMore"
android:textColor="@color/core_white"
android:padding="@dimen/small_spacing"
android:paddingHorizontal="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/values-af/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-ar/strings.xml
Unescape Escape View File

@ -62,7 +62,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">فشل الإرسال، انقر للرد الغير آمن</string>
<string name="ConversationItem_unable_to_open_media">لم يتم العثور على تطبيق قادر على فتح الملف.</string>
<string name="ConversationItem_copied_text">تم نسخ %s</string>
<string name="ConversationItem_read_more">&#160; إقرأ المزيد</string>
<string name="ConversationItem_read_more">إقرأ المزيد</string>
<string name="ConversationItem_download_more">&#160; تنزيل المزيد</string>
<string name="ConversationItem_pending">&#160; في الإنتظار</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-be/strings.xml
Unescape Escape View File

@ -58,7 +58,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-eo/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Sendado malsukcesis, tuŝeti por nesekura retropaŝo</string>
<string name="ConversationItem_unable_to_open_media">Ne povas trovi aplikaĵon, kiu kapablas malfermi ĉi tiun aŭdvidaĵon.</string>
<string name="ConversationItem_copied_text">Kopiinta %s</string>
<string name="ConversationItem_read_more">&#160; Legi pli</string>
<string name="ConversationItem_read_more">Legi pli</string>
<string name="ConversationItem_download_more">  Elŝuti pli</string>
<string name="ConversationItem_pending">  Pritraktota</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-hr/strings.xml
Unescape Escape View File

@ -56,7 +56,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-hy-rAM/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Չի ուղարկվում, սեղմեք անապահով այլընտրանքի համար</string>
<string name="ConversationItem_unable_to_open_media">Չհաջողվեց գտնել հավելված, որը ճանաչում է այս մեդիայի տեսակը։</string>
<string name="ConversationItem_copied_text">«%s»֊ը պատճենվել է</string>
<string name="ConversationItem_read_more">&#160; Տեսնել Ավելին</string>
<string name="ConversationItem_read_more">Տեսնել Ավելին</string>
<string name="ConversationItem_download_more">&#160; Բեռնել Ավելին</string>
<string name="ConversationItem_pending">&#160; Հերթագրված է</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-id/strings.xml
Unescape Escape View File

@ -52,7 +52,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-ka/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-ko/strings.xml
Unescape Escape View File

@ -52,7 +52,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">미디어를 열 수 있는 앱이 없음</string>
<string name="ConversationItem_copied_text">복사됨 %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-lo/strings.xml
Unescape Escape View File

@ -52,7 +52,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-lv/strings.xml
Unescape Escape View File

@ -56,7 +56,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-mk/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">ရုပ်သံ ကိုဖွင့်နိုင်သည့် app မရှိပါ။ </string>
<string name="ConversationItem_copied_text">ကူးပြီးပါပြီ %s </string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-mn/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-ms/strings.xml
Unescape Escape View File

@ -52,7 +52,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-no/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-ny/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Mana rirkachu, ashtawan yachankapak munashpaka kaypi llapipay</string>
<string name="ConversationItem_unable_to_open_media">Kayta paskankapakka mana aplicacionta taririnchu.</string>
<string name="ConversationItem_copied_text">Chayshinayarka %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-pa-rIN/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-ps/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-pt-rBR/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Falha no envio, toque para fallback inseguro</string>
<string name="ConversationItem_unable_to_open_media">Não é possível encontrar um app para abrir esta mídia.</string>
<string name="ConversationItem_copied_text">Copiou %s</string>
<string name="ConversationItem_read_more">&#160; Ler Mais</string>
<string name="ConversationItem_read_more">Ler Mais</string>
<string name="ConversationItem_download_more">&#160; Fazer Download de Mais</string>
<string name="ConversationItem_pending">&#160; Pendendo</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-sl/strings.xml
Unescape Escape View File

@ -58,7 +58,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-sr/strings.xml
Unescape Escape View File

@ -56,7 +56,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Слање није успело, тапните за необезбеђену одступницу</string>
<string name="ConversationItem_unable_to_open_media">Нема апликације која може да отвори овај медијум.</string>
<string name="ConversationItem_copied_text">Копирана %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-sw/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">imefeli kutuma, gusa kwa isiyo salama ili kuanguka nyuma</string>
<string name="ConversationItem_unable_to_open_media">Haiwezi kupata programu inayoweza kufungua media hii.</string>
<string name="ConversationItem_copied_text">nakala 1%s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-ta/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-te/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">పంపడం విఫలమైంది, అసురక్షిత తిరిగి పొందడం కోసం నొక్కండి</string>
<string name="ConversationItem_unable_to_open_media">మీడియా ఎంచుకోవడానికి అనువర్తనం దొరకదు.</string>
<string name="ConversationItem_copied_text">ప్రతి తీసుకోబడింది %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-th/strings.xml
Unescape Escape View File

@ -52,7 +52,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">การส่งล้มเหลว แตะเพื่อกลับไปใช้วิธีที่ไม่ปลอดภัยแทน</string>
<string name="ConversationItem_unable_to_open_media">ไม่พบแอปที่สามารถเปิดสื่อนี้</string>
<string name="ConversationItem_copied_text">คัดลอกแล้ว %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-ur-rIN/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-vi/strings.xml
Unescape Escape View File

@ -52,7 +52,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Không tìm thấy ứng dụng để mở dữ liệu truyền thông này.</string>
<string name="ConversationItem_copied_text">Đã sao chép %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Tải thêm</string>
<string name="ConversationItem_pending">&#160; Đang chờ</string>
<!-- ConversationActivity -->

2
app/src/main/res/values-xh/strings.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">tosobodde kufuna app esobola kugulawo kiwandiiko kyo</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<!-- ConversationActivity -->

2
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -64,7 +64,7 @@
<string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
<string name="ConversationItem_copied_text">Copied %s</string>
<string name="ConversationItem_read_more">&#160; Read More</string>
<string name="ConversationItem_read_more">Read More</string>
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>

Write Preview
Loading…
Cancel
Save