Merge branch 'master' into values-syntax

This commit is contained in:
octoshrimpy
2025-02-02 09:08:20 -07:00
committed by GitHub
57 changed files with 1422 additions and 652 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 52 KiB

@@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M3,10v4c0,0.55 0.45,1 1,1h3l3.29,3.29c0.63,0.63 1.71,0.18 1.71,-0.71L12,6.41c0,-0.89 -1.08,-1.34 -1.71,-0.71L7,9L4,9c-0.55,0 -1,0.45 -1,1zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,4.45v0.2c0,0.38 0.25,0.71 0.6,0.85C17.18,6.53 19,9.06 19,12s-1.82,5.47 -4.4,6.5c-0.36,0.14 -0.6,0.47 -0.6,0.85v0.2c0,0.63 0.63,1.07 1.21,0.85C18.6,19.11 21,15.84 21,12s-2.4,-7.11 -5.79,-8.4c-0.58,-0.23 -1.21,0.22 -1.21,0.85z"/>
</vector>
@@ -37,7 +37,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:src="@tools:sample/avatars" />
tools:src="@tools:sample/backgrounds/scenic[0]" />
<TextView
android:id="@+id/fileName"
style="@style/TextPrimary"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ddffffff"
android:gravity="center"
android:visibility="gone"
tools:visibility="visible" />
</FrameLayout>
@@ -32,8 +32,6 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="12dp"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@id/messageBackground"
@@ -204,7 +202,7 @@
android:layout_height="56dp"
android:padding="10dp"
android:src="@drawable/ic_cancel_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toTopOf="@id/scheduledSeparator"
app:layout_constraintEnd_toEndOf="@id/messageBackground" />
@@ -230,7 +228,7 @@
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintEnd_toEndOf="@id/messageBackground"
app:layout_constraintStart_toStartOf="@id/messageBackground"
tools:listitem="@layout/attachment_image_list_item" />
tools:listitem="@layout/attachment_file_list_item" />
<dev.octoshrimpy.quik.common.widget.QkEditText
android:id="@+id/message"
@@ -262,7 +260,7 @@
android:contentDescription="@string/compose_sim_cd"
android:padding="8dp"
android:src="@drawable/ic_sim_card_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:tint="?android:attr/textColorSecondary"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="@id/messageBackground" />
@@ -304,7 +302,7 @@
android:contentDescription="@string/compose_send_cd"
android:padding="10dp"
android:src="@drawable/ic_send_black_24dp"
android:tint="?android:textColorSecondary"
app:tint="?android:textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="parent" />
@@ -371,7 +369,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="contact,contactLabel,schedule,scheduleLabel,gallery,galleryLabel,camera,cameraLabel,attachingBackground" />
app:constraint_referenced_ids="contact,contactLabel,schedule,scheduleLabel,gallery,galleryLabel,attachAFileIcon,attachAFileLabel,camera,cameraLabel,attachingBackground" />
<View
android:id="@+id/attachingBackground"
@@ -395,7 +393,7 @@
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_person_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:tint="?android:attr/textColorSecondary"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/schedule"
app:layout_constraintEnd_toEndOf="@id/attach"
@@ -429,9 +427,9 @@
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_event_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:tint="?android:attr/textColorSecondary"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/gallery"
app:layout_constraintBottom_toTopOf="@id/attachAFileIcon"
app:layout_constraintEnd_toEndOf="@id/attach"
app:layout_constraintStart_toStartOf="@id/attach" />
@@ -452,6 +450,43 @@
app:layout_constraintStart_toEndOf="@id/schedule"
app:layout_constraintTop_toTopOf="@id/schedule" />
<ImageView
android:id="@+id/attachAFileIcon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="12dp"
android:background="@drawable/circle"
android:backgroundTint="?attr/bubbleColor"
android:contentDescription="@string/compose_attach_file_cd"
android:elevation="4dp"
android:padding="10dp"
android:rotation="-45"
android:src="@drawable/ic_attachment_black_24dp"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/gallery"
app:layout_constraintEnd_toEndOf="@id/attach"
app:layout_constraintStart_toStartOf="@id/attach"
app:tint="?android:attr/textColorSecondary" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/attachAFileLabel"
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:paddingStart="8dp"
android:paddingEnd="8dp"
android:text="@string/compose_attach_file_cd"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintBottom_toBottomOf="@id/attachAFileIcon"
app:layout_constraintStart_toEndOf="@id/attachAFileIcon"
app:layout_constraintTop_toTopOf="@id/attachAFileIcon" />
<ImageView
android:id="@+id/gallery"
android:layout_width="40dp"
@@ -463,7 +498,7 @@
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_insert_photo_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:tint="?android:attr/textColorSecondary"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/camera"
app:layout_constraintEnd_toEndOf="@id/attach"
@@ -497,7 +532,7 @@
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_camera_alt_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:tint="?android:attr/textColorSecondary"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/attach"
app:layout_constraintEnd_toEndOf="@id/attach"
@@ -17,110 +17,126 @@
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground">
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/timestamp"
style="@style/TextSecondary"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="8dp"
app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Tue at 11:39pm" />
android:layout_marginEnd="36dp"
android:orientation="vertical">
<ImageView
android:id="@+id/sim"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginEnd="2dp"
android:src="@drawable/ic_sim_card_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toStartOf="@id/simIndex"
app:layout_constraintStart_toEndOf="@id/timestamp"
app:layout_constraintTop_toTopOf="@id/timestamp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/simIndex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/sim"
app:layout_constraintTop_toTopOf="@id/timestamp"
app:textSize="tertiary"
tools:text="1" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/timestamp"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="8dp"
app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Tue at 11:39pm" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/timestamp"
tools:itemCount="1"
tools:listitem="@layout/mms_image_preview_list_item" />
<ImageView
android:id="@+id/sim"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginEnd="2dp"
android:src="@drawable/ic_sim_card_black_24dp"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toStartOf="@id/simIndex"
app:layout_constraintStart_toEndOf="@id/timestamp"
app:layout_constraintTop_toTopOf="@id/timestamp"
app:tint="?android:attr/textColorSecondary" />
<dev.octoshrimpy.quik.common.widget.AvatarView
android:id="@+id/avatar"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginStart="12dp"
app:layout_constraintBottom_toBottomOf="@id/body"
app:layout_constraintStart_toStartOf="parent" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/simIndex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/sim"
app:layout_constraintTop_toTopOf="@id/timestamp"
app:textSize="tertiary"
tools:text="1" />
<dev.octoshrimpy.quik.common.widget.TightTextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="12dp"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/attachments"
app:layout_constraintWidth_max="384dp"
tools:backgroundTint="@color/tools_theme"
tools:text="@tools:sample/lorem/random" />
</androidx.constraintlayout.widget.ConstraintLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="72dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body"
app:textSize="tertiary"
tools:text="Sending..." />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
</androidx.constraintlayout.widget.ConstraintLayout>
<dev.octoshrimpy.quik.common.widget.AvatarView
android:id="@+id/avatar"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="bottom"
app:layout_constraintBottom_toBottomOf="@id/body"
app:layout_constraintStart_toStartOf="parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="1"
tools:listitem="@layout/mms_image_preview_list_item" />
<dev.octoshrimpy.quik.common.widget.TightTextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true"
tools:backgroundTint="@color/tools_theme"
tools:text="@tools:sample/lorem/random" />
</LinearLayout>
</LinearLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="72dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body"
app:textSize="tertiary"
tools:text="Sending..." />
</LinearLayout>
</FrameLayout>
@@ -17,133 +17,180 @@
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground">
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/timestamp"
style="@style/TextSecondary"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="8dp"
app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Tue at 11:39pm" />
<ImageView
android:id="@+id/sim"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginEnd="2dp"
android:src="@drawable/ic_sim_card_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toStartOf="@id/simIndex"
app:layout_constraintStart_toEndOf="@id/timestamp"
app:layout_constraintTop_toTopOf="@id/timestamp" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/simIndex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/sim"
app:layout_constraintTop_toTopOf="@id/timestamp"
app:textSize="tertiary"
tools:text="1" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginStart="60dp"
android:layout_marginStart="36dp"
android:layout_marginEnd="12dp"
android:gravity="end"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintTop_toBottomOf="@id/timestamp"
tools:itemCount="1"
tools:listitem="@layout/mms_image_preview_list_item" />
android:orientation="vertical">
<dev.octoshrimpy.quik.common.widget.TightTextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="60dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="12dp"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:backgroundTint="?attr/bubbleColor"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/attachments"
app:layout_constraintWidth_max="384dp"
tools:text="Hey! How's it going?" />
<ProgressBar
android:id="@+id/cancel"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="8dp"
android:background="@drawable/circle"
android:backgroundTint="?attr/bubbleColor"
android:elevation="4dp"
android:foreground="?attr/selectableItemBackground"
android:indeterminate="false"
android:progressDrawable="@drawable/circular_progress_bar"
app:layout_constraintBottom_toBottomOf="@id/body"
app:layout_constraintEnd_toStartOf="@id/body"
tools:progress="45"
tools:progressTint="@color/tools_theme" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/compose_message_item">
<ImageView
android:id="@+id/cancelIcon"
android:layout_width="0dp"
android:layout_height="0dp"
android:elevation="4dp"
android:padding="6dp"
android:src="@drawable/ic_stop_black_24dp"
app:layout_constraintBottom_toBottomOf="@id/cancel"
app:layout_constraintEnd_toEndOf="@id/cancel"
app:layout_constraintStart_toStartOf="@id/cancel"
app:layout_constraintTop_toTopOf="@id/cancel"
tools:tint="@color/tools_theme" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/timestamp"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="8dp"
app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Tue at 11:39pm" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="4dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/body"
app:textSize="tertiary"
tools:text="Sending..." />
<ImageView
android:id="@+id/sim"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginEnd="2dp"
android:contentDescription="@string/compose_message_sim"
android:src="@drawable/ic_sim_card_black_24dp"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toStartOf="@id/simIndex"
app:layout_constraintStart_toEndOf="@id/timestamp"
app:layout_constraintTop_toTopOf="@id/timestamp"
app:tint="?android:attr/textColorSecondary" />
</androidx.constraintlayout.widget.ConstraintLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/simIndex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/sim"
app:layout_constraintTop_toTopOf="@id/timestamp"
app:textSize="tertiary"
tools:text="1" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginBottom="2dp"
android:gravity="end"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="1"
tools:listitem="@layout/mms_image_preview_list_item" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/cancelFrame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/bodyBox"
android:layout_alignParentStart="true"
android:layout_marginEnd="12dp"
android:clipToPadding="false"
android:visibility="gone"
tools:visibility="visible">
<ProgressBar
android:id="@+id/cancel"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="@drawable/circle"
android:backgroundTint="?attr/bubbleColor"
android:clickable="false"
android:foreground="?attr/selectableItemBackground"
android:indeterminate="false"
android:progressDrawable="@drawable/circular_progress_bar"
tools:progress="45"
tools:progressTint="@color/tools_theme"
tools:visibility="visible" />
<ImageView
android:id="@+id/cancelIcon"
android:layout_width="36dp"
android:layout_height="36dp"
android:clickable="false"
android:contentDescription="@string/compose_message_cancel"
android:padding="6dp"
android:src="@drawable/ic_stop_black_24dp"
tools:tint="@color/tools_theme" />
</FrameLayout>
<LinearLayout
android:id="@+id/bodyBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/sendNowIcon"
android:layout_toEndOf="@id/cancelFrame"
android:orientation="horizontal">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<dev.octoshrimpy.quik.common.widget.TightTextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:backgroundTint="?attr/bubbleColor"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true"
tools:text="@tools:sample/lorem/random[0]" />
</LinearLayout>
<ImageView
android:id="@+id/sendNowIcon"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_alignBottom="@id/bodyBox"
android:layout_alignParentEnd="true"
android:layout_marginStart="12dp"
android:background="@drawable/circle"
android:backgroundTint="?attr/bubbleColor"
android:baselineAlignBottom="true"
android:contentDescription="@string/compose_message_send_now"
android:padding="6dp"
android:src="@drawable/ic_send_black_24dp"
android:visibility="gone"
tools:tint="@color/tools_theme"
tools:visibility="visible" />
</RelativeLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="4dp"
android:contentDescription="@string/compose_message_attachment"
android:textColor="?android:attr/textColorSecondary"
app:textSize="tertiary"
tools:text="Sending..." />
</LinearLayout>
</FrameLayout>
@@ -22,7 +22,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/frame"
android:layout_width="280dp"
android:layout_height="280dp"
android:layout_height="140dp"
android:layout_marginTop="2dp"
android:clipChildren="false">
@@ -70,7 +70,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notification_previews_title"
tools:summary="Show name and message" />
tools:summary="@string/settings_notification_previews_summary" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/wake"
@@ -79,6 +79,14 @@
app:title="@string/settings_notification_wake_title"
app:widget="@layout/settings_switch_widget" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/silentNotContact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notification_silent_title"
app:summary="@string/settings_notification_silent_summary"
app:widget="@layout/settings_switch_widget" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/vibration"
android:layout_width="match_parent"
@@ -19,18 +19,27 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginEnd="8dp">
<ImageView
android:id="@+id/thumbnail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:background="@drawable/rounded_rectangle_4dp"
android:backgroundTint="?android:attr/divider"
android:scaleType="centerCrop"
tools:src="@tools:sample/backgrounds/scenic" />
<TextView
android:id="@+id/fileName"
style="@style/TextPrimary"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ddffffff"
android:gravity="center"
android:visibility="gone"
tools:visibility="visible" />
</FrameLayout>
@@ -212,6 +212,15 @@
app:title="@string/settings_mms_size_title"
tools:summary="100KB" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/messsageLinkHandling"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible"
app:icon="@android:drawable/stat_sys_warning"
app:title="@string/settings_mms_weblink_title"
tools:summary="100KB" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
@@ -250,7 +250,7 @@
</plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Συγχρονισμός μηνυμάτων</string>
<string name="settings_sync_summary">Επανασυγχρονισμός μηνυμάτων με τη βάση δεδομένων SMS του Android</string>
<string name="settings_about_title">Σχετικά με το QUIK</string>
+29 -29
View File
@@ -68,9 +68,9 @@
<string name="main_default_sms_message">Faire de QUIK votre application SMS par défaut</string>
<string name="main_default_sms_change">Changer</string>
<string name="main_permission_required">Autorisation requise</string>
<string name="main_permission_sms">QUIK a besoin de l\'autorisation d’envoyer et de consulter des messages SMS</string>
<string name="main_permission_sms">QUIK a besoin de l\'autorisation d\’envoyer et de consulter les messages SMS</string>
<string name="main_permission_contacts">QUIK a besoin de l\'autorisation d\'accéder aux contacts</string>
<string name="main_permission_notifications">QUIK needs permission to display notifications</string>
<string name="main_permission_notifications">QUIK a besoin de l\'autorisation d\'afficher des notifications</string>
<string name="main_permission_allow">Autoriser</string>
<string name="drawer_inbox">Boite de réception</string>
@@ -86,14 +86,14 @@
<string name="drawer_plus_banner_summary">Débloquer les nouvelles fonctions sensationnelles et soutenir le développement</string>
<string name="rate_title">Vous aimez QUIK?</string>
<string name="rate_summary">Partagez un peu d’amour et évaluez-nous sur le Play Store !</string>
<string name="rate_okay">OK !</string>
<string name="rate_summary">Partagez un peu d\’amour et évaluez-nous sur le Play Store!</string>
<string name="rate_okay">OK!</string>
<string name="rate_dismiss">ANNULER</string>
<string name="dialog_delete_title">Supprimer</string>
<plurals name="dialog_delete_message">
<item quantity="one">Êtes-vous sûr de vouloir supprimer cette conversation ?</item>
<item quantity="other">Êtes-vous sûr de vouloir supprimer %d conversations ?</item>
<item quantity="one">Êtes-vous sûr de vouloir supprimer cette conversation?</item>
<item quantity="other">Êtes-vous sûr de vouloir supprimer %d conversations?</item>
</plurals>
<plurals name="dialog_delete_chat">
<item quantity="one">Êtes-vous sûr de vouloir supprimer ce message?</item>
@@ -114,10 +114,10 @@
<string name="compose_subtitle_results">%1$d sur %2$d résultats</string>
<string name="compose_send_group_title">Envoyer en tant que message groupé</string>
<string name="compose_send_group_summary">Les destinataires et les réponses seront visibles par tout le monde</string>
<string name="compose_messages_empty">C\'est le début de votre conversation. Dites quelque chose de sympa !</string>
<string name="compose_messages_empty">C\'est le début de votre conversation. Dites quelque chose de sympa!</string>
<string name="compose_vcard_label">Fiche du contact</string>
<string name="compose_scheduled_for">Programmé pour</string>
<string name="compose_scheduled_future">Le moment choisi doit être dans le futur !</string>
<string name="compose_scheduled_future">Le moment choisi doit être dans le futur!</string>
<string name="compose_scheduled_plus">Vous devez déverrouiller QUIK+ pour utiliser la programmation de message</string>
<string name="compose_scheduled_toast">Ajouté aux messages programmés</string>
<string name="compose_hint">Écrire un message&#8230;</string>
@@ -130,16 +130,16 @@
<string name="compose_menu_next">Suivant</string>
<string name="compose_menu_clear">Effacer</string>
<string name="compose_details_title">Détails du message</string>
<string name="compose_details_type">Type : %s</string>
<string name="compose_details_from">De : %s</string>
<string name="compose_details_to">À : %s</string>
<string name="compose_details_subject">Objet : %s</string>
<string name="compose_details_priority">Priorité : %s</string>
<string name="compose_details_size">Taille : %s</string>
<string name="compose_details_sent">Envoyé : %s</string>
<string name="compose_details_received">Reçu : %s</string>
<string name="compose_details_delivered">Délivré : %s</string>
<string name="compose_details_error_code">Code erreur : %d</string>
<string name="compose_details_type">Type: %s</string>
<string name="compose_details_from">De: %s</string>
<string name="compose_details_to">À: %s</string>
<string name="compose_details_subject">Objet: %s</string>
<string name="compose_details_priority">Priorité: %s</string>
<string name="compose_details_size">Taille: %s</string>
<string name="compose_details_sent">Envoyé: %s</string>
<string name="compose_details_received">Reçu: %s</string>
<string name="compose_details_delivered">Délivré: %s</string>
<string name="compose_details_error_code">Code erreur: %d</string>
<string name="compose_attach_cd">Ajouter une pièce jointe</string>
<string name="compose_gallery_cd">Joindre une photo</string>
<string name="compose_camera_cd">Prendre une photo</string>
@@ -174,8 +174,8 @@
<string name="backup_restoring">Restaurer à partir d\'une sauvegarde</string>
<string name="backup_loading">Chargement&#8230;</string>
<string name="backup_never">Jamais</string>
<string name="backup_location_title">Backup location</string>
<string name="backup_location_summary">Set folder</string>
<string name="backup_location_title">Emplacement de sauvegarde</string>
<string name="backup_location_summary">Définir le dossier</string>
<string name="backup_restore_title">Restauration</string>
<string name="backup_restore_summary">Sélectionner une sauvegarde</string>
<string name="backup_restore_error_plus">Déverrouillez QUIK+ pour utiliser la sauvegarde et la restauration</string>
@@ -184,8 +184,8 @@
<string name="backup_restore_confirm_title">Restaurer à partir d’une sauvegarde</string>
<string name="backup_restore_stop_title">Arrêter la restauration</string>
<string name="backup_restore_stop_message">Les messages qui ont déjà été restaurés resteront sur votre appareil</string>
<string name="backup_select_location_rationale_title">Select backup location</string>
<string name="backup_select_location_rationale_message">Please select a folder to save your backups to</string>
<string name="backup_select_location_rationale_title">Sélectionnez l\'emplacement de sauvegarde</string>
<string name="backup_select_location_rationale_message">Veuillez sélectionner un dossier dans lequel enregistrer vos sauvegardes</string>
<string name="backup_details">%1$s\n%2$d messages</string>
<string name="backup_selected_backup_error_title">Erreur</string>
<string name="backup_selected_backup_error_message">Impossible de lire le fichier de sauvegarde</string>
@@ -193,7 +193,7 @@
<string name="backup_restore_dialog_title">Sauvegardes</string>
<string name="backup_restore_dialog_summary" translatable="false">/QUIK/Backups</string>
<string name="backup_restore_dialog_empty">Aucune sauvegarde trouvée</string>
<string name="backup_disclaimer">Actuellement, seulement la sauvegarde et la restauration des SMS sont pris en charge. Les MMS et les sauvegardes planifiées arriveront bientôt !</string>
<string name="backup_disclaimer">Actuellement, seulement la sauvegarde et la restauration des SMS sont pris en charge. Les MMS et les sauvegardes planifiées arriveront bientôt!</string>
<string name="backup_now">Sauvegarder maintenant</string>
<string name="backup_progress_parsing">Analyse de la sauvegarde&#8230;</string>
<string name="backup_progress_running">%d/%d messages</string>
@@ -204,9 +204,9 @@
<string name="scheduled_title">Programmé</string>
<string name="scheduled_empty_description">Envoyer automatiquement un message, au moment précis que vous souhaitez</string>
<string name="scheduled_empty_message_1">Hé ! Quand était votre anniversaire déjà ?</string>
<string name="scheduled_empty_message_1">Hé! Quand était votre anniversaire déjà ?</string>
<string name="scheduled_empty_message_2">C’est le 23 décembre</string>
<string name="scheduled_empty_message_3">Joyeux anniversaire ! Regarde le grand ami que je suis, je me souviens de ton anniversaire</string>
<string name="scheduled_empty_message_3">Joyeux anniversaire! Regarde le grand ami que je suis, je me souviens de ton anniversaire</string>
<!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
<string name="scheduled_empty_message_3_timestamp">Envoyé le 23 décembre </string>
<string name="scheduled_compose_cd">Programmer un message</string>
@@ -339,7 +339,7 @@
<string name="about_changelog_title">Liste des modifications</string>
<string name="about_contact_title">Contact</string>
<string name="about_license_title">Licence</string>
<string name="about_copyright_title">Droits d’auteur</string>
<string name="about_copyright_title">Droits d\’auteur</string>
<string name="qksms_plus_description_title">Soutenir le développement, tout déverrouiller</string>
<string name="qksms_plus_description_summary">Vous pouvez sauver un développeur affamé pour seulement %s</string>
@@ -350,7 +350,7 @@
<string name="qksms_plus_upgrade_d" translatable="false">One-time purchase of %1$s %2$s</string>
<!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
<string name="qksms_plus_upgrade_donate">Déverrouiller + faire un don pour %1$s %2$s</string>
<string name="qksms_plus_thanks_title">Merci de soutenir QUIK !</string>
<string name="qksms_plus_thanks_title">Merci de soutenir QUIK!</string>
<string name="qksms_plus_thanks_summary">Vous avez maintenant accès à toutes les fonctionnalités de QUIK+</string>
<string name="qksms_plus_error">Une erreur s\'est produite. Merci de réessayer.</string>
<string name="qksms_plus_free_title">QUIK + est gratuit pour les utilisateurs de F-Droid ! Si vous souhaitez soutenir le développement, n’hésitez pas à faire un don.</string>
@@ -375,7 +375,7 @@
<string name="qksms_plus_respond_title">Réponse automatique</string>
<string name="qksms_plus_respond_summary">Répondre automatiquement aux messages entrants avec une réponse prédéfinie</string>
<string name="qksms_plus_more_title">Plus</string>
<string name="qksms_plus_more_summary">QUIK est en cours de développement actif, et votre achat comprendra toutes les futures fonctionnalités QUIK + !</string>
<string name="qksms_plus_more_summary">QUIK est en cours de développement actif, et votre achat comprendra toutes les futures fonctionnalités QUIK +!</string>
<string name="widget_loading">Chargement&#8230;</string>
<string name="widget_more">Afficher plus de conversations</string>
@@ -500,7 +500,7 @@
<item>J\'arrive</item>
<item>Merci</item>
<item>Ça a l\'air bien</item>
<item>Quoi de neuf ?</item>
<item>Quoi de neuf?</item>
<item>D\'accord</item>
<item>Non</item>
<item>Je t\'aime</item>
@@ -254,7 +254,7 @@
</plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string>
@@ -254,7 +254,7 @@
</plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sinchronizuoti pranešimus</string>
<string name="settings_sync_summary">Iš naujo sinchronizuoti Android pranešimų duomenų bazę</string>
<string name="settings_about_title">Apie QUIK</string>
@@ -250,7 +250,7 @@
</plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string>
@@ -250,7 +250,7 @@
</plurals>
<string name="settings_long_as_mms_title">நீண்ட செய்திகளை எம்.எம்.எஸ் ஆக அனுப்பு</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">தகவல்களை ஒத்திசை</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">QUIK பற்றி</string>
@@ -250,7 +250,7 @@
</plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string>
@@ -250,7 +250,7 @@
</plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string>
+29 -1
View File
@@ -141,6 +141,7 @@
<string name="compose_details_delivered">Delivered: %s</string>
<string name="compose_details_error_code">Error code: %d</string>
<string name="compose_attach_cd">Add an attachment</string>
<string name="compose_attach_file_cd">Attach any file</string>
<string name="compose_gallery_cd">Attach a photo</string>
<string name="compose_camera_cd">Take a photo</string>
<string name="compose_schedule_cd">Schedule message</string>
@@ -151,6 +152,12 @@
<string name="compose_sim_cd">%s selected, change SIM card</string>
<string name="compose_send_cd">Send message</string>
<string name="compose_message_cancel">Cancel</string>
<string name="compose_message_send_now">Send now</string>
<string name="compose_message_sim">SIM number</string>
<string name="compose_message_item">Message item</string>
<string name="compose_message_attachment">Attachment</string>
<string name="message_status_sending">Sending…</string>
<string name="message_status_delivered">Delivered %s</string>
<string name="message_status_failed">Failed to send. Tap to try again</string>
@@ -211,6 +218,7 @@
<string name="scheduled_empty_message_3_timestamp">Sending on December 23rd&#x200A;</string>
<string name="scheduled_compose_cd">Schedule a message</string>
<string name="scheduled_options_title">Scheduled message</string>
<string name="attachment_missing">Missing</string>
<string-array name="scheduled_options">
<item>Send now</item>
<item>Copy text</item>
@@ -237,7 +245,10 @@
<string name="settings_notification_action_2">Button 2</string>
<string name="settings_notification_action_3">Button 3</string>
<string name="settings_notification_previews_title">Notification previews</string>
<string name="settings_notification_previews_summary">Show name and message</string>
<string name="settings_notification_wake_title">Wake screen</string>
<string name="settings_notification_silent_title">Silent if not a contact</string>
<string name="settings_notification_silent_summary">Silences notifications for messages without recipients in your contacts</string>
<string name="settings_vibration_title">Vibration</string>
<string name="settings_ringtone_title">Sound</string>
<string name="settings_ringtone_none">None</string>
@@ -284,7 +295,8 @@
</plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_mms_weblink_title">Link handling in messages</string>
<string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string>
@@ -494,6 +506,18 @@
<item>0</item>
</integer-array>
<string-array name="messageLinkHandlings">
<item>Block</item>
<item>Allow</item>
<item>Ask before opening</item>
</string-array>
<integer-array name="messageLinkHandling_ids">
<item>0</item>
<item>1</item>
<item>2</item>
</integer-array>
<string-array name="qk_responses">
<item>Okay</item>
<item>Give me a moment</item>
@@ -510,4 +534,8 @@
</string-array>
<string name="speak_no_messages">No Messages</string>
<string name="speak_unseen_messages">Speak unseen messages</string>
<string name="messageLinkHandling_dialog_title">External Link Warning</string>
<string name="messageLinkHandling_dialog_body">Some links may be unsafe or redirect you unexpectedly. Review the link below before proceeding:\n\n%1$s\n\nDo you want to continue?</string>
<string name="messageLinkHandling_dialog_positive">Yes, open the link</string>
<string name="messageLinkHandling_dialog_negative">No</string>
</resources>