diff options
Diffstat (limited to 'src/main')
24 files changed, 5 insertions, 67 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 4033d71f..c1b775ce 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1164,7 +1164,6 @@ public class ConversationActivity extends XmppActivity setSelectedConversation(conversationList.get(0)); this.mConversationFragment.reInit(getSelectedConversation()); } else { - this.mConversationFragment.messageListAdapter.updatePreferences(); this.mConversationFragment.messagesView.invalidateViews(); this.mConversationFragment.setupIme(); } @@ -1503,10 +1502,6 @@ public class ConversationActivity extends XmppActivity return getPreferences().getBoolean("indicate_received", false); } - public boolean useWhiteBackground() { - return getPreferences().getBoolean("use_white_background",false); - } - protected boolean trustKeysIfNeeded(int requestCode) { return trustKeysIfNeeded(requestCode, ATTACHMENT_CHOICE_INVALID); } diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index cf663ebd..10fee99f 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -737,7 +737,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa this.mEditMessage.setText(""); this.mEditMessage.append(this.conversation.getNextMessage()); this.mEditMessage.setKeyboardListener(this); - messageListAdapter.updatePreferences(); this.messagesView.setAdapter(messageListAdapter); updateMessages(); this.messagesLoaded = true; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 3e3bf98b..f87b3d51 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -79,14 +79,11 @@ public class MessageAdapter extends ArrayAdapter<Message> { return true; } }; - private boolean mIndicateReceived = false; - private boolean mUseWhiteBackground = false; public MessageAdapter(ConversationActivity activity, List<Message> messages) { super(activity, 0, messages); this.activity = activity; metrics = getContext().getResources().getDisplayMetrics(); - updatePreferences(); } public void setOnContactPictureClicked(OnContactPictureClicked listener) { @@ -509,7 +506,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { } } - boolean darkBackground = (type == RECEIVED && (!isInValidSession || !mUseWhiteBackground)); + boolean darkBackground = (type == RECEIVED && !isInValidSession); if (type == STATUS) { if (conversation.getMode() == Conversation.MODE_SINGLE) { @@ -601,11 +598,6 @@ public class MessageAdapter extends ArrayAdapter<Message> { if (type == RECEIVED) { if(isInValidSession) { - if (mUseWhiteBackground) { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_white); - } else { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received); - } viewHolder.encryption.setVisibility(View.GONE); } else { viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning); @@ -655,11 +647,6 @@ public class MessageAdapter extends ArrayAdapter<Message> { Toast.makeText(activity,R.string.no_application_found_to_display_location,Toast.LENGTH_SHORT).show(); } - public void updatePreferences() { - this.mIndicateReceived = activity.indicateReceived(); - this.mUseWhiteBackground = activity.useWhiteBackground(); - } - public interface OnContactPictureClicked { void onContactPictureClicked(Message message); } diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index b68cc532..61b1b669 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_toRightOf="@+id/message_photo" - android:background="@drawable/message_bubble_received" + android:background="@drawable/message_bubble_received_white" android:minHeight="53dp" android:layout_marginTop="-2dp" android:layout_marginRight="-4dp" @@ -54,9 +54,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web|phone|email" - android:textColorLink="@color/white" - android:textColor="@color/white" - android:textColorHighlight="@color/grey800" + android:textColorLink="@color/primaryText" + android:textColor="@color/primaryText" + android:textColorHighlight="@color/grey500" android:textSize="?attr/TextSizeBody" app:emojiconSize="28sp" /> diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 01d019a6..fa76b1ae 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -487,8 +487,6 @@ <string name="download_failed_server_not_found">Неуспешно сваляне: Сървърът не е открит</string> <string name="download_failed_file_not_found">Неуспешно сваляне: Файлът не е открит</string> <string name="download_failed_could_not_connect">Неуспешно сваляне: Неуспешна връзка със сървъра</string> - <string name="pref_use_white_background">Използване на бял фон</string> - <string name="pref_use_white_background_summary">Показване на получените съобщения с черен текст на бял фон</string> <string name="account_status_tor_unavailable">Мрежата на Тор е недостъпна</string> <string name="server_info_broken">Повредено</string> <string name="pref_presence_settings">Настройки за присъствието</string> diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index c64b8d26..71187de4 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -489,8 +489,6 @@ <string name="download_failed_server_not_found">Stahování selhalo: Server nenalezen</string> <string name="download_failed_file_not_found">Stahování selhalo: Soubor nenalezen</string> <string name="download_failed_could_not_connect">Stahování selhalo: Nelze se připojit k hostu</string> - <string name="pref_use_white_background">Použít bílé pozadí</string> - <string name="pref_use_white_background_summary">Zobrazovat přijaté zprávy jako černý text na bílém pozadí</string> <string name="account_status_tor_unavailable">Tor síť není dostupná</string> <string name="server_info_broken">Rozbité</string> <string name="pref_presence_settings">Nastavení přítomnosti</string> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 9b1ab4b3..3d8a3595 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -549,8 +549,6 @@ <string name="download_failed_server_not_found">Download fehlgeschlagen: Server nicht gefunden</string> <string name="download_failed_file_not_found">Download fehlgeschlagen: Datei nicht gefunden</string> <string name="download_failed_could_not_connect">Download fehlgeschlagen: keine Verbindung zum Host</string> - <string name="pref_use_white_background">Weißen Hintergrund benutzen</string> - <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string> <string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string> <string name="server_info_broken">Fehlerhaft</string> <string name="pref_presence_settings">Status Einstellungen</string> diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index b327c1eb..818ba863 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -487,8 +487,6 @@ <string name="download_failed_server_not_found">Error al descargar: Servidor no encontrado</string> <string name="download_failed_file_not_found">Error al descargar: Archivo no encontrado</string> <string name="download_failed_could_not_connect">Error al descargar: No se ha podido conectar con el servidor</string> - <string name="pref_use_white_background">Usar fondo blanco</string> - <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string> <string name="account_status_tor_unavailable">Red Tor no disponible.</string> <string name="server_info_broken">Error</string> <string name="pref_presence_settings">Opciones de presencia</string> diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index d51b6f83..30209248 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -487,8 +487,6 @@ <string name="download_failed_server_not_found">Deskargak huts egin du: zerbitzaria ez da aurkitu</string> <string name="download_failed_file_not_found">Deskargak huts egin du: fitxategia ez da aurkitu</string> <string name="download_failed_could_not_connect">Deskargak huts egin du: ezin izan da ostalarira konektatu</string> - <string name="pref_use_white_background">Atzeko-planoan kolore zuria erabili</string> - <string name="pref_use_white_background_summary">Jasotako mezuak testu beltza atzeko-plano zuri baten gainean bezala erakutsi</string> <string name="account_status_tor_unavailable">Tor sarea ez dago eskuragarri</string> <string name="server_info_broken">Hondatuta</string> <string name="pref_presence_settings">Presentzia ezarpenak</string> diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 0332de89..49a968d4 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -487,8 +487,6 @@ <string name="download_failed_server_not_found">Échec du téléchargement : impossible de trouver le serveur</string> <string name="download_failed_file_not_found">Échec du téléchargement : impossible de trouver le fichier</string> <string name="download_failed_could_not_connect">Échec du téléchargement : impossible de se connecter à l\'hôte</string> - <string name="pref_use_white_background">Utiliser un fond blanc</string> - <string name="pref_use_white_background_summary">Afficher les messages reçus en texte noir sur fond blanc.</string> <string name="account_status_tor_unavailable">Réseau Tor inaccessible</string> <string name="server_info_broken">Détraqué</string> <string name="pref_presence_settings">Options de présence</string> diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 26db33ae..f1a32b3e 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -487,8 +487,6 @@ <string name="download_failed_server_not_found">Download fallito: Server non trovato</string> <string name="download_failed_file_not_found">Download fallito: File non trovato</string> <string name="download_failed_could_not_connect">Download fallito: Impossibile connettersi all\'host</string> - <string name="pref_use_white_background">Usa sfondo bianco</string> - <string name="pref_use_white_background_summary">Mostra i messaggi ricevuti con testo nero su sfondo bianco</string> <string name="account_status_tor_unavailable">Rete Tor non disponibile</string> <string name="server_info_broken">Rotto</string> <string name="pref_presence_settings">Impostazioni presenza</string> diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 9348a88e..d6ea073a 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -474,8 +474,6 @@ <string name="download_failed_server_not_found">ההורדה נכשלה: שרת לא נמצא</string> <string name="download_failed_file_not_found">ההורדה נכשלה: הקובץ לא נמצא</string> <string name="download_failed_could_not_connect">ההורדה נכשלה: נכשל ביצוע חיבור לשרת</string> - <string name="pref_use_white_background">השתמש ברקע לבן</string> - <string name="pref_use_white_background_summary">הראה הודעות שהתקבלו בטקסט שחור על גבי רקע לבען</string> <string name="server_info_broken">לא עובד</string> <string name="pref_presence_settings">הגדרות נוכחות Presence</string> <string name="pref_away_when_screen_off">העבר למצב \"לא נמצא\" כאשר המסך כבוי</string> diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 9c8b4fed..5935f90b 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -485,8 +485,6 @@ <string name="download_failed_server_not_found">ダウンロードに失敗しました: サーバーが見つかりません</string> <string name="download_failed_file_not_found">ダウンロードに失敗しました: ファイルが見つかりません</string> <string name="download_failed_could_not_connect">ダウンロードに失敗しました: ホストに接続できませんでした</string> - <string name="pref_use_white_background">白い背景を使用する</string> - <string name="pref_use_white_background_summary">白地に黒の文字で、受け取ったメッセージを表示します</string> <string name="account_status_tor_unavailable">Tor ネットワークが利用できません</string> <string name="server_info_broken">壊れています</string> <string name="pref_presence_settings">参加設定</string> diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index 0b8ad688..ef9df663 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -487,8 +487,6 @@ <string name="download_failed_server_not_found">Nedlasting feilet: Fant ikke tjener</string> <string name="download_failed_file_not_found">Nedlasting feilet: Fant ikke fila</string> <string name="download_failed_could_not_connect">Nedlasting feilet: Kunne ikke koble til tjeneren</string> - <string name="pref_use_white_background">Bruk hvit bakgrunn</string> - <string name="pref_use_white_background_summary">Vis mottatte meldinger som svart tekst på hvit bakgrunn</string> <string name="account_status_tor_unavailable">Tor-nettverk utilgjengelig</string> <string name="server_info_broken">Knekt</string> <string name="pref_presence_settings">Tilstedeværelse-innstillinger</string> diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 2a3138df..3baf2036 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -487,8 +487,6 @@ <string name="download_failed_server_not_found">Downloaden mislukt: server niet gevonden</string> <string name="download_failed_file_not_found">Downloaden mislukt: bestand niet gevonden</string> <string name="download_failed_could_not_connect">Downloaden mislukt: kon geen verbinding maken met host</string> - <string name="pref_use_white_background">Gebruik witte achtergrond</string> - <string name="pref_use_white_background_summary">Toon ontvangen berichten als zwarte tekst op een witte achtergrond</string> <string name="account_status_tor_unavailable">Tor-netwerk niet beschikbaar</string> <string name="server_info_broken">Gebroken</string> <string name="pref_presence_settings">Aanwezigheidsinstellingen</string> diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 518a4a3a..3a6f12e8 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -471,7 +471,5 @@ <string name="download_failed_server_not_found">Pobieranie nieudane: Nie odnaleziono serwera</string> <string name="download_failed_file_not_found">Pobieranie nieudane: Nie odnaleziono pliku</string> <string name="download_failed_could_not_connect">Pobieranie nieudane: Nie można połączyć z hostem</string> - <string name="pref_use_white_background">Białe tło</string> - <string name="pref_use_white_background_summary">Pokazuj otrzymane wiadomości jako czarny tekst na białym tle</string> <string name="server_info_broken">Zepsute</string> </resources> diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index e4fdb4cc..3486e09f 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -489,8 +489,6 @@ <string name="download_failed_server_not_found">Descarcarea a esuat: Serverul nu a fost gasit</string> <string name="download_failed_file_not_found">Descarcare esuata: Fisierul nu a fost gasit</string> <string name="download_failed_could_not_connect">Descarcarea a esuat. Nu s-a putut realiza conexiunea cu gazda.</string> - <string name="pref_use_white_background">Foloseste un fundal alb</string> - <string name="pref_use_white_background_summary">Arata mesajele primite cu negru pe fond alb</string> <string name="account_status_tor_unavailable">Reteaua Tor nu este disponibila</string> <string name="server_info_broken">Deteriorat</string> <string name="pref_presence_settings">Setari de prezenta</string> diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 68d84396..ec507f41 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -490,8 +490,6 @@ <string name="download_failed_server_not_found">Загрузка не удалась: сервер не найден</string> <string name="download_failed_file_not_found">Загрузка не удалась: файл не найден</string> <string name="download_failed_could_not_connect">Загрузка не удалась: не удалось подключиться к серверу</string> - <string name="pref_use_white_background">Использовать белый фон</string> - <string name="pref_use_white_background_summary">Показывать принятые сообщения черным текстом на белом фоне</string> <string name="account_status_tor_unavailable">Сеть Tor недоступна</string> <string name="server_info_broken">Повреждено</string> <string name="pref_presence_settings">Настройки присутствия</string> diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 43e8fc22..f70106c0 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -489,8 +489,6 @@ <string name="download_failed_server_not_found">Преузимање није успело: сервер није нађен</string> <string name="download_failed_file_not_found">Преузимање није успело: фајл није нађен</string> <string name="download_failed_could_not_connect">Преузимање није успело: не могу да се повежем са домаћином</string> - <string name="pref_use_white_background">Користи белу позадину</string> - <string name="pref_use_white_background_summary">Приказ примљених порука црним текстом на белој позадини</string> <string name="account_status_tor_unavailable">Тор мрежа недоступна</string> <string name="server_info_broken">Оштећен</string> <string name="pref_presence_settings">Поставке присутности</string> diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 25cb41b1..2b5ea08b 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -487,8 +487,6 @@ <string name="download_failed_server_not_found">Nerladdning gick fel: Server hittades inte</string> <string name="download_failed_file_not_found">Nerladdning gick fel: Filen hittades inte</string> <string name="download_failed_could_not_connect">Nerladdningen gick fel: Kunder inte ansluta till server</string> - <string name="pref_use_white_background">Använd vit bakgrund</string> - <string name="pref_use_white_background_summary">Visa mottagna meddelanden som svart text på vit bakgrund</string> <string name="account_status_tor_unavailable">Tor-nätverk ej tillgängligt</string> <string name="server_info_broken">Sönder</string> <string name="pref_presence_settings">Tillgänglighetsinställningar</string> diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index 9f3528ab..5ee66685 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -485,8 +485,6 @@ <string name="download_failed_server_not_found">İndirme başarısız: Sunucu bulunamadı</string> <string name="download_failed_file_not_found">İndirme başarısız: Dosya bulunamadı</string> <string name="download_failed_could_not_connect">İndirme başarısız: Sunucuya bağlanılamadı</string> - <string name="pref_use_white_background">Beyaz arka plan kullan</string> - <string name="pref_use_white_background_summary">Alınan iletileri beyaz arka plan üzerinde siyah yazıyla göster</string> <string name="account_status_tor_unavailable">Tor ağına erişilemiyor</string> <string name="server_info_broken">Bozuk</string> <string name="pref_presence_settings">Çevrimiçi durum bildirim ayarları</string> diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index a133606f..06d1926f 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -485,8 +485,6 @@ <string name="download_failed_server_not_found">下载失败：未找到服务器</string> <string name="download_failed_file_not_found">下载失败：未找到文件</string> <string name="download_failed_could_not_connect">下载失败：无法连接到服务器</string> - <string name="pref_use_white_background">使用白色背景</string> - <string name="pref_use_white_background_summary">收到的消息将显示为白底黑字</string> <string name="account_status_tor_unavailable">Tor network 不可用</string> <string name="server_info_broken">损坏</string> <string name="pref_presence_settings">上线设置</string> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5a25d998..522459e3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -586,8 +586,6 @@ <string name="download_failed_server_not_found">Download failed: Server not found</string> <string name="download_failed_file_not_found">Download failed: File not found</string> <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> - <string name="pref_use_white_background">Use white background</string> - <string name="pref_use_white_background_summary">Show received messages as black text on a white background</string> <string name="account_status_tor_unavailable">Tor network unavailable</string> <string name="server_info_broken">Broken</string> <string name="pref_presence_settings">Presence settings</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index ea685c14..dbe063b8 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -157,11 +157,6 @@ android:title="@string/pref_conference_name"/> <CheckBoxPreference android:defaultValue="false" - android:key="use_white_background" - android:summary="@string/pref_use_white_background_summary" - android:title="@string/pref_use_white_background"/> - <CheckBoxPreference - android:defaultValue="false" android:key="use_larger_font" android:summary="@string/pref_use_larger_font_summary" android:title="@string/pref_use_larger_font"/> |