Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions app/res/layout/fragment_channel_list.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/white"
tools:context="org.commcare.fragments.connectMessaging.ConnectMessageChannelListFragment">

Expand All @@ -13,6 +13,17 @@
android:layout_width="match_parent"
android:layout_marginTop="0dp"/>


<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_no_channel_msg"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/no_channel_msg"
android:visibility="gone"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -515,4 +515,5 @@
<string name="personalid_authentication_failed">La autenticación de la biometría en su dispositivo Android ha fallado. Aplique las actualizaciones de sistema disponibles o inténtelo de nuevo con un dispositivo diferente.</string>
<string name="connect_verify_configuration_failed">La configuración de la biometría en su dispositivo Android ha fallado. Por favor, inténtelo de nuevo %s.</string>

<string name="no_channel_msg">No tienes canales de mensajería activos.</string>
</resources>
1 change: 1 addition & 0 deletions app/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -518,4 +518,5 @@ License.
<string name="personalid_authentication_failed">L\'authentification des données biométriques sur votre appareil Android a échoué. Veuillez appliquer les mises à jour système disponibles ou réessayer avec un autre appareil.</string>
<string name="connect_verify_configuration_failed">La configuration des données biométriques sur votre appareil Android a échoué. Veuillez réessayer %s.</string>

<string name="no_channel_msg">Vous n\'avez aucun canal de messagerie actif.</string>
</resources>
1 change: 1 addition & 0 deletions app/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -513,4 +513,5 @@ License.
<string name="personalid_authentication_failed">आपके एंड्रॉइड डिवाइस पर बॉयोमीट्रिक्स का प्रमाणीकरण विफल हो गया है। कृपया कोई भी उपलब्ध सिस्टम अपडेट लागू करें, या किसी दूसरे डिवाइस के साथ पुनः प्रयास करें।</string>
<string name="connect_verify_configuration_failed">आपके एंड्रॉइड डिवाइस पर बॉयोमीट्रिक्स कॉन्फ़िगर करना विफल हो गया है। कृपया %s पुनः प्रयास करें।</string>

<string name="no_channel_msg">आपके पास वर्तमान में कोई संदेश चैनल नहीं है</string>
</resources>
2 changes: 1 addition & 1 deletion app/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,5 @@
<string name="connect_recovery_success_message">Jūsų paskyra atkurta! Galite toliau naudoti „PersonalID“.</string>
<string name="connect_register_success_message">Jūsų paskyra sukurta ir paruošta naudojimui!</string>
<string name="connect_backup_code_length">Būtinai atsiminkite savo atsarginį kodą! Jį turi sudaryti %d skaitmenys. Laikykite jį saugioje vietoje, nes jo prireiks norint vėl prisijungti prie paskyros.</string>

<string name="no_channel_msg">Jūs neturite jokių dabartinių susirašinėjimo kanalų</string>
</resources>
2 changes: 1 addition & 1 deletion app/res/values-no/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,5 @@
<string name="connect_recovery_success_message">Kontoen din er blitt gjenopprettet! Du kan gjenoppta bruken av PersonalID.</string>
<string name="connect_register_success_message">Kontoen din er blitt opprettet og er klar til bruk</string>
<string name="connect_backup_code_length">Sørg for å huske reservekoden din! Den må være på %d sifre. Oppbevar den på et trygt sted, da du trenger den for å få tilgang til kontoen din igjen.</string>

<string name="no_channel_msg">Du har ingen nåværende meldingskanaler</string>
</resources>
2 changes: 1 addition & 1 deletion app/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -522,5 +522,5 @@

<string name="recovery_network_cooldown">Demasiadas tentativas de pedido. Por favor, tente novamente dentro de uma hora.</string>
<string name="personalid_authentication_failed">A autenticação da biometria no seu dispositivo Android falhou. Por favor, aplique quaisquer atualizações de sistema disponíveis ou tente novamente com um dispositivo diferente.</string>

<string name="no_channel_msg">Você não possui canais de mensagens ativos.</string>
</resources>
2 changes: 1 addition & 1 deletion app/res/values-sw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -522,5 +522,5 @@

<string name="recovery_network_cooldown">Majaribio mengi mno ya ombi. Tafadhali jaribu tena baada ya saa moja.</string>
<string name="personalid_authentication_failed">Uthibitishaji wa bayometriki kwenye kifaa chako cha Android haukufaulu. Tafadhali weka masasisho yoyote ya mfumo yanayopatikana, au jaribu tena ukitumia kifaa tofauti.</string>

<string name="no_channel_msg">Huna njia za sasa za kutuma ujumbe</string>
</resources>
1 change: 1 addition & 0 deletions app/res/values-ti/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -506,4 +506,5 @@
<string name="recovery_network_cooldown">ኣዝዩ ብዙሕ ናይ ምሕታት ፈተነታት። በጃኻ ድሕሪ ሓደ ሰዓት እንደገና ፈትን።</string>
<string name="personalid_authentication_failed">ኣብ ናይ ኣንድሮይድ መሳርሒኻ ዘሎ ባዮሜትሪክስ ምእማት ኣይተዓወተን። በጃኹም ዝኾነ ይኹን ዝርከብ ናይ ሲስተም ምዕዳጋት ግበሩሉ፡ ወይ ድማ ብኻልእ መሳርሒ እንደገና ፈትኑ።</string>

<string name="no_channel_msg">ናይ ሕጂ ናይ መልእኽቲ ቻነላት የብልካን።</string>
</resources>
1 change: 1 addition & 0 deletions app/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -691,4 +691,5 @@
<string name="yesterday">Yesterday %1$s</string>

<string name="personalid_authentication_failed">Authenticating the biometrics on your Android device has failed. Please apply any available system updates, or try again with a different device</string>
<string name="no_channel_msg">You have no current messaging channels</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

import java.util.List;

import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static org.commcare.activities.connect.ConnectMessagingActivity.CHANNEL_ID;

public class ConnectMessageChannelListFragment extends Fragment {
Expand Down Expand Up @@ -135,7 +137,14 @@ public void refreshUi() {
Context context = getContext();
if (context != null) {
List<ConnectMessagingChannelRecord> channels = ConnectMessagingDatabaseHelper.getMessagingChannels(context);
channelAdapter.setChannels(channels);
if (!channels.isEmpty()) {
channelAdapter.setChannels(channels);
binding.rvChannel.setVisibility(VISIBLE);
binding.tvNoChannelMsg.setVisibility(GONE);
} else {
binding.rvChannel.setVisibility(GONE);
binding.tvNoChannelMsg.setVisibility(VISIBLE);
}
}
}
}