forked from upstream-mirrors/quik
Add labels for attachment options
This commit is contained in:
@@ -98,9 +98,9 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
|||||||
override val attachmentDeletedIntent: Subject<Attachment> by lazy { attachmentAdapter.attachmentDeleted }
|
override val attachmentDeletedIntent: Subject<Attachment> by lazy { attachmentAdapter.attachmentDeleted }
|
||||||
override val textChangedIntent by lazy { message.textChanges() }
|
override val textChangedIntent by lazy { message.textChanges() }
|
||||||
override val attachIntent by lazy { Observable.merge(attach.clicks(), attachingBackground.clicks()) }
|
override val attachIntent by lazy { Observable.merge(attach.clicks(), attachingBackground.clicks()) }
|
||||||
override val cameraIntent by lazy { camera.clicks() }
|
override val cameraIntent by lazy { Observable.merge(camera.clicks(), cameraLabel.clicks()) }
|
||||||
override val galleryIntent by lazy { gallery.clicks() }
|
override val galleryIntent by lazy { Observable.merge(gallery.clicks(), galleryLabel.clicks()) }
|
||||||
override val scheduleIntent by lazy { schedule.clicks() }
|
override val scheduleIntent by lazy { Observable.merge(schedule.clicks(), scheduleLabel.clicks()) }
|
||||||
override val attachmentSelectedIntent: Subject<Uri> = PublishSubject.create()
|
override val attachmentSelectedIntent: Subject<Uri> = PublishSubject.create()
|
||||||
override val inputContentIntent by lazy { message.inputContentSelected }
|
override val inputContentIntent by lazy { message.inputContentSelected }
|
||||||
override val scheduleSelectedIntent: Subject<Long> = PublishSubject.create()
|
override val scheduleSelectedIntent: Subject<Long> = PublishSubject.create()
|
||||||
|
|||||||
@@ -395,7 +395,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:constraint_referenced_ids="schedule, gallery, camera, attachingBackground" />
|
app:constraint_referenced_ids="schedule, scheduleLabel, gallery, galleryLabel, camera, cameraLabel, attachingBackground" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/attachingBackground"
|
android:id="@+id/attachingBackground"
|
||||||
@@ -425,6 +425,23 @@
|
|||||||
app:layout_constraintEnd_toEndOf="@id/attach"
|
app:layout_constraintEnd_toEndOf="@id/attach"
|
||||||
app:layout_constraintStart_toStartOf="@id/attach" />
|
app:layout_constraintStart_toStartOf="@id/attach" />
|
||||||
|
|
||||||
|
<com.moez.QKSMS.common.widget.QkTextView
|
||||||
|
android:id="@+id/scheduleLabel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="32dp"
|
||||||
|
android:layout_marginStart="8dp"
|
||||||
|
android:background="@drawable/rounded_rectangle_4dp"
|
||||||
|
android:backgroundTint="?attr/bubbleColor"
|
||||||
|
android:elevation="4dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:paddingEnd="8dp"
|
||||||
|
android:paddingStart="8dp"
|
||||||
|
android:text="@string/compose_schedule_cd"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/schedule"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/schedule"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/schedule" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/gallery"
|
android:id="@+id/gallery"
|
||||||
android:layout_width="40dp"
|
android:layout_width="40dp"
|
||||||
@@ -442,6 +459,23 @@
|
|||||||
app:layout_constraintEnd_toEndOf="@id/attach"
|
app:layout_constraintEnd_toEndOf="@id/attach"
|
||||||
app:layout_constraintStart_toStartOf="@id/attach" />
|
app:layout_constraintStart_toStartOf="@id/attach" />
|
||||||
|
|
||||||
|
<com.moez.QKSMS.common.widget.QkTextView
|
||||||
|
android:id="@+id/galleryLabel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="32dp"
|
||||||
|
android:layout_marginStart="8dp"
|
||||||
|
android:background="@drawable/rounded_rectangle_4dp"
|
||||||
|
android:backgroundTint="?attr/bubbleColor"
|
||||||
|
android:elevation="4dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:paddingEnd="8dp"
|
||||||
|
android:paddingStart="8dp"
|
||||||
|
android:text="@string/compose_gallery_cd"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/gallery"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/gallery"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/gallery" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/camera"
|
android:id="@+id/camera"
|
||||||
android:layout_width="40dp"
|
android:layout_width="40dp"
|
||||||
@@ -459,6 +493,23 @@
|
|||||||
app:layout_constraintEnd_toEndOf="@id/attach"
|
app:layout_constraintEnd_toEndOf="@id/attach"
|
||||||
app:layout_constraintStart_toStartOf="@id/attach" />
|
app:layout_constraintStart_toStartOf="@id/attach" />
|
||||||
|
|
||||||
|
<com.moez.QKSMS.common.widget.QkTextView
|
||||||
|
android:id="@+id/cameraLabel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="32dp"
|
||||||
|
android:layout_marginStart="8dp"
|
||||||
|
android:background="@drawable/rounded_rectangle_4dp"
|
||||||
|
android:backgroundTint="?attr/bubbleColor"
|
||||||
|
android:elevation="4dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:paddingEnd="8dp"
|
||||||
|
android:paddingStart="8dp"
|
||||||
|
android:text="@string/compose_camera_cd"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/camera"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/gallery"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/camera" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/attach"
|
android:id="@+id/attach"
|
||||||
android:layout_width="44dp"
|
android:layout_width="44dp"
|
||||||
|
|||||||
@@ -114,7 +114,7 @@
|
|||||||
<string name="compose_attach_cd">Add an attachment</string>
|
<string name="compose_attach_cd">Add an attachment</string>
|
||||||
<string name="compose_gallery_cd">Attach a photo</string>
|
<string name="compose_gallery_cd">Attach a photo</string>
|
||||||
<string name="compose_camera_cd">Take a photo</string>
|
<string name="compose_camera_cd">Take a photo</string>
|
||||||
<string name="compose_schedule_cd">Send later</string>
|
<string name="compose_schedule_cd">Schedule message</string>
|
||||||
<string name="compose_sim_cd">%s selected, change SIM card</string>
|
<string name="compose_sim_cd">%s selected, change SIM card</string>
|
||||||
<string name="compose_send_cd">Send message</string>
|
<string name="compose_send_cd">Send message</string>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user