From 4076947705508da75a2609a4a7893c4348956adf Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 25 Sep 2017 21:10:49 +0200 Subject: reworked updater --- src/main/res/drawable-hdpi/ic_action_cancel.png | Bin 232 -> 0 bytes src/main/res/drawable-hdpi/ic_update_notification.png | Bin 0 -> 879 bytes src/main/res/drawable-mdpi/ic_action_cancel.png | Bin 177 -> 0 bytes src/main/res/drawable-mdpi/ic_update_notification.png | Bin 0 -> 496 bytes src/main/res/drawable-xhdpi/ic_action_cancel.png | Bin 272 -> 0 bytes .../res/drawable-xhdpi/ic_update_notification.png | Bin 0 -> 982 bytes src/main/res/drawable-xxhdpi/ic_action_cancel.png | Bin 355 -> 0 bytes .../res/drawable-xxhdpi/ic_update_notification.png | Bin 0 -> 1837 bytes src/main/res/drawable-xxxhdpi/ic_notification.png | Bin 1266 -> 3852 bytes .../res/drawable-xxxhdpi/ic_update_notification.png | Bin 0 -> 2035 bytes src/main/res/layout/activity_updater.xml | 2 +- src/main/res/values-de/strings.xml | 10 ++++------ src/main/res/values/strings.xml | 14 ++++++-------- 13 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/ic_action_cancel.png create mode 100644 src/main/res/drawable-hdpi/ic_update_notification.png delete mode 100644 src/main/res/drawable-mdpi/ic_action_cancel.png create mode 100644 src/main/res/drawable-mdpi/ic_update_notification.png delete mode 100644 src/main/res/drawable-xhdpi/ic_action_cancel.png create mode 100644 src/main/res/drawable-xhdpi/ic_update_notification.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_action_cancel.png create mode 100644 src/main/res/drawable-xxhdpi/ic_update_notification.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_update_notification.png (limited to 'src/main/res') diff --git a/src/main/res/drawable-hdpi/ic_action_cancel.png b/src/main/res/drawable-hdpi/ic_action_cancel.png deleted file mode 100644 index 5572c5248..000000000 Binary files a/src/main/res/drawable-hdpi/ic_action_cancel.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_update_notification.png b/src/main/res/drawable-hdpi/ic_update_notification.png new file mode 100644 index 000000000..b54ff5e20 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_update_notification.png differ diff --git a/src/main/res/drawable-mdpi/ic_action_cancel.png b/src/main/res/drawable-mdpi/ic_action_cancel.png deleted file mode 100644 index 3de614668..000000000 Binary files a/src/main/res/drawable-mdpi/ic_action_cancel.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_update_notification.png b/src/main/res/drawable-mdpi/ic_update_notification.png new file mode 100644 index 000000000..3ebf650fb Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_update_notification.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_cancel.png b/src/main/res/drawable-xhdpi/ic_action_cancel.png deleted file mode 100644 index 1e871a52c..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_cancel.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_update_notification.png b/src/main/res/drawable-xhdpi/ic_update_notification.png new file mode 100644 index 000000000..fd29feb75 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_update_notification.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/src/main/res/drawable-xxhdpi/ic_action_cancel.png deleted file mode 100644 index 8f1441277..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_cancel.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_update_notification.png b/src/main/res/drawable-xxhdpi/ic_update_notification.png new file mode 100644 index 000000000..b58ea3c2b Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_update_notification.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png index 614c85534..095522505 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_notification.png and b/src/main/res/drawable-xxxhdpi/ic_notification.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_update_notification.png b/src/main/res/drawable-xxxhdpi/ic_update_notification.png new file mode 100644 index 000000000..2edf85941 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_update_notification.png differ diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml index 8613b978a..2d8538537 100644 --- a/src/main/res/layout/activity_updater.xml +++ b/src/main/res/layout/activity_updater.xml @@ -22,7 +22,7 @@ style="?android:attr/progressBarStyleLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/progressBar" + android:id="@+id/UpdateProgressBar" android:layout_centerVertical="true" android:layout_centerHorizontal="true" /> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 35baf7fb2..9d8293c3b 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -191,7 +191,6 @@ OTR-Fingerabdruck OMEMO-Fingerabdruck OMEMO-Fingerabdruck der Nachricht - Eigener OMEMO-Fingerabdruck Andere Geräte OMEMO-Fingerabdruck vertrauen Fingerabdrücke werden abgerufen … @@ -389,7 +388,6 @@ Kontakt %s empfangen Antippen, um Pix-Art Messenger zu öffnen - Vordergrund-Dienst deaktivieren Profilbild wurde gespeichert %s wird gesendet %s wird angeboten @@ -439,17 +437,16 @@ Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen Auf Updates prüfen später - Auf Pix-Art Messenger Updates prüfen Update Dienst aktualisieren - Version %1$s ist verfügbar.\n\nDateigröße: %2$s\n\nJetzt auf Version %1$s aktualisieren?\n\n\n%4$s + Version %1$s ist verfügbar.\n\nDateigröße: %2$s\n\nJetzt auf Version %1$s aktualisieren? Download gestartet Kein Update verfügbar Tor-Netzwerk nicht verfügbar Bindungsfehler Host unbekannt Fehlerhaft - Pix-Art Messenger prüft auf eine neuere Version. Wenn ein Update verfügbar ist, wirst du gefragt, ob du deine Version aktualisieren möchtest. Der Update Dienst lädt und installiert die neue Version automatisch.\n\nBitte warten… + Pix-Art Messenger lädt und installiert die neue Version automatisch.\n\nBitte warten… Status Abwesend bei abgeschaltetem Bildschirm Setzt deinen Status auf "abwesend", solange dein Bildschirm abgeschaltet ist @@ -676,7 +673,6 @@ 6 Monate 7 Tage Heute - Fange an zu schreiben… Maximale Helligkeit Maximale Helligkeit aktivieren, wenn Videos oder Bilder im Vollbild betracht werden. Videos komprimieren @@ -738,5 +734,7 @@ teilweise Nutze Vordergrunddienst Einige Android Geräte schließen manche Apps nach einer gewissen Zeitspanne automatisch und du wirst keine neuen Nachrichten mehr empfangen können. Falls du solche Probleme hast, versuche den Vordergrunddienst zu aktivieren. Bitte beachte, dass dadurch ein permanente Eintrag in der Benachrichtigungsleiste erscheint. + Pix-Art Messenger Update Dienst + Update installieren? diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 86502dac1..d772c11a8 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -210,7 +210,6 @@ v\\OMEMO fingerprint OMEMO fingerprint of message v\\OMEMO fingerprint of message - Own OMEMO fingerprint Other devices Trust OMEMO Fingerprints Fetching keys… @@ -465,7 +464,6 @@ Android App Contact Received %s - Disable foreground service Touch to open Pix-Art Messenger Avatar has been published! Sending %s @@ -516,9 +514,8 @@ Use white background Show received messages as black text on a white background Check for Updates - Update Service - Version %1$s is available.\n\nFilesize: %2$s\n\nUpdate to version %1$s now?\n\n\n%4$s - Checking for Pix-Art Messenger updates + Update service + Version %1$s is available.\n\nFilesize: %2$s\n\nUpdate to version %1$s now? later update No update available @@ -531,7 +528,7 @@ Away when screen is off Marks your resource as away when the screen is turned off \"Do not disturb\" in silent mode - Pix-Art Messenger is checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.\n\nPlease wait… + Pix-Art Messenger is downloading and installing the new version automatically.\n\nPlease wait… Marks your resource as \"Do not disturb\" when device is in silent mode Treat vibrate as silent mode Marks your resource as \"Do not disturb\" when device is on vibrate @@ -595,7 +592,7 @@ Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. Disable The selected area is too large - Cancel update check? + Cancel update? Yes No (No activated accounts) @@ -739,7 +736,6 @@ 6 months 12 months Today - Start chatting… Switch to maximum brightness while watching videos or images in fullscreen. Maximum brightness Block Jabber-ID @@ -788,4 +784,6 @@ partial Some Android devices will close some apps after a period of time and you wont be able to receive new messages. If you have such problems, try to activate the foreground service. But keep in mind, that you will have a permanent notification with this option checked. Use foreground service + Pix-Art Messenger update service + Install update? -- cgit v1.2.3