#207 - Dual SIM support

commit c3dc3ada558c466be5115cd7ddbf9651a229c217
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Sat Jun 2 02:54:06 2018 -0400

    Dual SIM support for QK Reply

commit 48688dd4720bd1b3abc049d365e208e1dfe5ccb8
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Sat Jun 2 00:37:08 2018 -0400

    #1172 - Load all recipients and subId from threadId when sending message from notification reply bar

commit 0b7195fb134c0a9f2a6b551176c6c25a26bf5838
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri Jun 1 23:43:30 2018 -0400

    Fix missing subId for RetrySending params

commit 0d3ec43c0e60bab4acc293947ea9f6d2228c1b19
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri Jun 1 23:27:56 2018 -0400

    Switch to appropriate SIM when new message is received

commit 1ae883af890104cf1da9e970571371c95666db66
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri Jun 1 23:07:16 2018 -0400

    Fix message grouping for incoming messages

commit 2bf7b2d99ddbfdcafff873f305180d6d38c37d65
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri Jun 1 22:56:31 2018 -0400

    Correctly assign subId for incoming SMS

commit 1f6028f8921320358a3053a2dbc2c6e05410964b
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri Jun 1 20:52:01 2018 -0400

    Abstract SubscriptionManager usage behind SubscriptionUtils

commit 8b18f16271f19a42800c737cfbd867365c4aa781
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri Jun 1 20:05:52 2018 -0400

    Store subId when receiving SMS

commit f0e4ffdf15eb54d8ef78adfe244943ef4cb95d4e
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri Jun 1 19:52:40 2018 -0400

    Use appropriate SIM card based on last message

commit b7893d69891e4fb61755b0733a5fab561e86bbf3
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Thu May 31 00:20:42 2018 -0400

    Fix crash when device doesn't support multi-sim

commit bb038068129227e931167976628e1a535efb09a0
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Wed May 30 23:54:14 2018 -0400

    Show sim indicator when subId changes in conversation

commit 952f15f7ebfb85a03feef51373ef30568b76d5eb
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Wed May 30 22:13:57 2018 -0400

    Send message from selected SIM

commit 4cfab7ca9ec9bd9c7ce82b3eb5f228cf511a7c7b
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Wed May 30 21:46:01 2018 -0400

    Fix filename for ActiveSubscriptionObservable

commit 720cb79cb4fbfb98b10e169f2fea84be02fd2f91
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Wed May 30 20:35:30 2018 -0400

    Allow cycling through inserted sims

commit fa95980e9bc8e8c01dab7b4b8e4ed3a1c9a0f0b0
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Wed May 30 18:26:44 2018 -0400

    Show sim card slot in compose bar
This commit is contained in:
Moez Bhatti
2018-06-02 02:58:42 -04:00
parent f71d2564b2
commit 1f345da920
32 changed files with 424 additions and 116 deletions
@@ -0,0 +1,9 @@
<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="#FF000000"
android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM14,8h"/>
</vector>
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -184,9 +185,37 @@
android:padding="12dp"
android:textColorHint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="@id/messageBackground"
app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintStart_toEndOf="@id/attachSeparator" />
<ImageView
android:id="@+id/sim"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginEnd="8dp"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/compose_attach_cd"
android:padding="10dp"
android:src="@drawable/ic_sim_card_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/message"
app:layout_constraintEnd_toEndOf="@id/messageBackground" />
<common.widget.QkTextView
android:id="@+id/simIndex"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/sim"
app:layout_constraintEnd_toEndOf="@id/sim"
app:layout_constraintStart_toStartOf="@id/sim"
app:layout_constraintTop_toTopOf="@id/sim"
tools:ignore="SpUsage"
tools:text="1" />
<common.widget.QkTextView
android:id="@+id/counter"
android:layout_width="0dp"
@@ -31,11 +31,36 @@
android:layout_height="wrap_content"
android:gravity="center"
android:padding="8dp"
app:layout_constraintEnd_toEndOf="parent"
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" />
<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" />
<LinearLayout
android:id="@+id/attachments"
android:layout_width="wrap_content"
@@ -31,11 +31,36 @@
android:layout_height="wrap_content"
android:gravity="center"
android:padding="8dp"
app:layout_constraintEnd_toEndOf="parent"
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" />
<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" />
<LinearLayout
android:id="@+id/attachments"
android:layout_width="wrap_content"
@@ -69,27 +69,79 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/composeBackgroundGradient" />
<View
android:id="@+id/messageBackground"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/rounded_rectangle_shadow"
android:backgroundTint="?attr/bubbleColor"
android:backgroundTintMode="multiply"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/send"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/messagePadding" />
<!-- The padding inside the messageBackground view is broken, probably because of 9patch weirdness -->
<View
android:id="@+id/messagePadding"
android:layout_width="0dp"
android:layout_height="8dp"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:paddingTop="8dp"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintEnd_toEndOf="@id/messageBackground"
app:layout_constraintStart_toStartOf="@id/messageBackground"
app:layout_constraintTop_toTopOf="@id/messageBackground" />
<common.widget.QkEditText
android:id="@+id/message"
style="@style/TextPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/rounded_rectangle_shadow"
android:backgroundTint="?attr/bubbleColor"
android:backgroundTintMode="multiply"
android:background="@null"
android:gravity="center_vertical"
android:hint="@string/compose_hint"
android:inputType="textLongMessage|textCapSentences|textMultiLine"
android:maxLines="6"
android:minHeight="44dp"
android:padding="20dp"
android:padding="12dp"
android:textColorHint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/messageBackground"
app:layout_constraintEnd_toStartOf="@id/send"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/messages" />
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintStart_toStartOf="@id/messageBackground" />
<ImageView
android:id="@+id/sim"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginEnd="8dp"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/compose_attach_cd"
android:padding="10dp"
android:src="@drawable/ic_sim_card_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/message"
app:layout_constraintEnd_toEndOf="@id/messageBackground" />
<common.widget.QkTextView
android:id="@+id/simIndex"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/sim"
app:layout_constraintEnd_toEndOf="@id/sim"
app:layout_constraintStart_toStartOf="@id/sim"
app:layout_constraintTop_toTopOf="@id/sim"
tools:ignore="SpUsage"
tools:text="1" />
<common.widget.QkTextView
android:id="@+id/counter"