From 35387fbc50a7f9cd121d0939cc3eeb1846c5ae25 Mon Sep 17 00:00:00 2001
From: massimiliano <massimiliano@disroot.org>
Date: Sun, 16 Dec 2018 11:40:25 +0100
Subject: [PATCH] Made as much strings translatable as possible+ A lot of smal
fixes
---
app/src/main/AndroidManifest.xml | 2 --
.../java/org/disroot/disrootapp/ui/MainActivity.java | 5 +----
.../disroot/disrootapp/ui/StateMessagesActivity.java | 11 +++--------
.../java/org/disroot/disrootapp/utils/Constants.java | 1 -
app/src/main/res/layout/activity_state.xml | 11 +++++++----
app/src/main/res/layout/activity_state_messages.xml | 11 +++++++----
app/src/main/res/values-es/strings.xml | 4 ++++
app/src/main/res/values-fr/strings.xml | 4 ++++
app/src/main/res/values-it/strings.xml | 4 ++++
app/src/main/res/values-nl/strings.xml | 4 ++++
app/src/main/res/values-pt/strings.xml | 4 ++++
app/src/main/res/values-sr/strings.xml | 4 ++++
app/src/main/res/values/colors.xml | 1 +
app/src/main/res/values/strings.xml | 4 ++++
app/src/main/res/xml/changelog_master.xml | 7 ++++++-
15 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 76f6ec1..ff5dcba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,10 +32,8 @@
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
-
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
-
<data
android:host="*.disroot.org"
android:scheme="https" />
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index d42b8d1..c712275 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -56,12 +56,9 @@ import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
import android.widget.ImageButton;
-import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.ScrollView;
-import android.widget.SimpleAdapter;
-import android.widget.TextView;
import android.widget.Toast;
@@ -1877,7 +1874,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
new NotificationCompat.Builder(this)
.setAutoCancel( true )
.setSmallIcon(R.drawable.ic_state)
- .setContentTitle( "Message from Disroot State!" )
+ .setContentTitle( getString( R.string.NotificationTitle ) )
.setContentText(name)//get text Title from json :-)
.setContentInfo(message)//get text message from json :-)
.setContentIntent(launchStateMessages);
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
index d91c4cf..4bf677a 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
@@ -2,9 +2,7 @@ package org.disroot.disrootapp.ui;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
-import android.content.Context;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.AsyncTask;
import android.os.Bundle;
@@ -28,7 +26,6 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import java.sql.Date;
import java.util.ArrayList;
import java.util.HashMap;
@@ -78,7 +75,6 @@ public class StateMessagesActivity extends AppCompatActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_about, menu);
return true;
}
@@ -86,9 +82,6 @@ public class StateMessagesActivity extends AppCompatActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
@@ -255,14 +248,16 @@ public class StateMessagesActivity extends AppCompatActivity {
case "Fixed":
case "Scheduled":
humanStatus.setTextColor(Color.GREEN);
+ humanStatus.setText(R.string.Scheduled);
break;
case "Investigating":
case "Watching":
humanStatus.setTextColor(Color.YELLOW);
-
+ humanStatus.setText(R.string.Investigating);
break;
case "Identified":
humanStatus.setTextColor(Color.RED);
+ humanStatus.setText(R.string.Identified);
break;
}
return v;
diff --git a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
index 641233d..68d148a 100644
--- a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
+++ b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
@@ -17,7 +17,6 @@ public class Constants {
public static final String URL_DisApp_POLL = "https://poll.disroot.org";
public static final String URL_DisApp_BOARD = "https://board.disroot.org";
public static final String URL_DisApp_USER = "https://user.disroot.org";
- public static final String URL_DisApp_STATE = "https://state.disroot.org";
public static final String URL_DisApp_HOWTO = "https://howto.disroot.org";
public static final String URL_DisApp_K9HELP = "https://howto.disroot.org/email/email-clients/mobile/androidk9";
public static final String URL_DisApp_XMPPHELP = "https://howto.disroot.org/xmpp/mobile/android";
diff --git a/app/src/main/res/layout/activity_state.xml b/app/src/main/res/layout/activity_state.xml
index 9725ad5..50abcec 100644
--- a/app/src/main/res/layout/activity_state.xml
+++ b/app/src/main/res/layout/activity_state.xml
@@ -22,7 +22,7 @@
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/DisTheme.PopupOverlay"
- app:title="@string/app_name">
+ app:title="@string/app_state">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
@@ -37,11 +37,13 @@
android:layout_height="wrap_content"
android:maxWidth="24dp"
android:drawableTop="@drawable/ic_state"
+ android:drawableTint="@color/gray"
android:text="@string/state_btn"
android:layout_gravity="center"
- android:layout_marginHorizontal="@android:dimen/app_icon_size"
+ android:layout_marginLeft="@android:dimen/app_icon_size"
+ android:layout_marginRight="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
- android:textColor="#ffffff"/>
+ android:textColor="@color/gray"/>
<Button
android:id="@+id/StateMessageBtn"
android:shadowColor="@color/bg_primary_blue"
@@ -51,7 +53,8 @@
android:drawableTop="@drawable/ic_state"
android:text="@string/state_messages_btn"
android:layout_gravity="center"
- android:layout_marginHorizontal="@android:dimen/app_icon_size"
+ android:layout_marginLeft="@android:dimen/app_icon_size"
+ android:layout_marginRight="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:textColor="#ffffff"/>
</android.support.v7.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/activity_state_messages.xml b/app/src/main/res/layout/activity_state_messages.xml
index 9725ad5..9173da2 100644
--- a/app/src/main/res/layout/activity_state_messages.xml
+++ b/app/src/main/res/layout/activity_state_messages.xml
@@ -22,7 +22,7 @@
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/DisTheme.PopupOverlay"
- app:title="@string/app_name">
+ app:title="@string/app_state">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
@@ -39,7 +39,8 @@
android:drawableTop="@drawable/ic_state"
android:text="@string/state_btn"
android:layout_gravity="center"
- android:layout_marginHorizontal="@android:dimen/app_icon_size"
+ android:layout_marginLeft="@android:dimen/app_icon_size"
+ android:layout_marginRight="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
android:textColor="#ffffff"/>
<Button
@@ -49,11 +50,13 @@
android:layout_height="wrap_content"
android:maxWidth="24dp"
android:drawableTop="@drawable/ic_state"
+ android:drawableTint="@color/gray"
android:text="@string/state_messages_btn"
android:layout_gravity="center"
- android:layout_marginHorizontal="@android:dimen/app_icon_size"
+ android:layout_marginLeft="@android:dimen/app_icon_size"
+ android:layout_marginRight="@android:dimen/app_icon_size"
style="?android:attr/borderlessButtonStyle"
- android:textColor="#ffffff"/>
+ android:textColor="@color/gray"/>
</android.support.v7.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0f5be6b..8891e51 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -148,4 +148,8 @@
<string name="state_messages_btn">Show State messages</string>
<string name="state_btn">Show Service State</string>
<string name="ScheduledAt">Scheduled at:</string>
+ <string name="NotificationTitle">Message from Disroot State!</string>
+ <string name="Scheduled">Scheduled</string>
+ <string name="Investigating">Investigating</string>
+ <string name="Identified">Identified</string>
</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8f809c9..5ee52b6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -177,4 +177,8 @@
<string name="state_messages_btn">Show State messages</string>
<string name="state_btn">Show Service State</string>
<string name="ScheduledAt">Scheduled at:</string>
+ <string name="NotificationTitle">Message from Disroot State!</string>
+ <string name="Scheduled">Scheduled</string>
+ <string name="Investigating">Investigating</string>
+ <string name="Identified">Identified</string>
</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8add8a9..aa525db 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -147,4 +147,8 @@
<string name="state_messages_btn">Mostra messaggi di stato</string>
<string name="state_btn">Mostra stato dei servizi</string>
<string name="ScheduledAt">In programma il: \</string>
+ <string name="NotificationTitle">Messaggio dallo Stato di Disroot!</string>
+ <string name="Scheduled">Pianificato</string>
+ <string name="Investigating">Indagando</string>
+ <string name="Identified">Identificato</string>
</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 96b8911..6f55f67 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -148,4 +148,8 @@
<string name="state_messages_btn">Toon statusberichten</string>
<string name="state_btn">Toon Service Status</string>
<string name="ScheduledAt">Gepland op: \</string>
+ <string name="NotificationTitle">Bericht van Disroot State!</string>
+ <string name="Scheduled">Gepland</string>
+ <string name="Investigating">Aan het onderzoeken</string>
+ <string name="Identified">Geïdentificeerd</string>
</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 76565fc..a0d0590 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -147,4 +147,8 @@
<string name="state_messages_btn">Show State messages</string>
<string name="state_btn">Show Service State</string>
<string name="ScheduledAt">Scheduled at:</string>
+ <string name="NotificationTitle">Message from Disroot State!</string>
+ <string name="Scheduled">Scheduled</string>
+ <string name="Investigating">Investigating</string>
+ <string name="Identified">Identified</string>
</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index f4da94d..2ce8c74 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -148,4 +148,8 @@
<string name="state_messages_btn">Show State messages</string>
<string name="state_btn">Show Service State</string>
<string name="ScheduledAt">Scheduled at:</string>
+ <string name="NotificationTitle">Message from Disroot State!</string>
+ <string name="Scheduled">Scheduled</string>
+ <string name="Investigating">Investigating</string>
+ <string name="Identified">Identified</string>
</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1074e58..996346c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
<resources>
<color name="bg_primary_blue">#50162d</color>
<color name="bg_primary_blue_dark">#1f5c60</color>
+ <color name="gray">#808080</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6eefaea..7608812 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -148,4 +148,8 @@
<string name="state_messages_btn">Show State messages</string>
<string name="state_btn">Show Service State</string>
<string name="ScheduledAt">Scheduled at: \</string>
+ <string name="NotificationTitle">Message from Disroot State!</string>
+ <string name="Scheduled">Scheduled</string>
+ <string name="Investigating">Investigating</string>
+ <string name="Identified">Identified</string>
</resources>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index d51d49d..7d6b224 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
- <release version="1.0.2" versioncode="12" >
+ <release version="1.1.0" versioncode="12" >
<change>State page is api based instead of webview</change>
<change>In State page is possible to view state messages</change>
<change>State page is ordered by status</change>
@@ -8,6 +8,11 @@
<change>Fixed app lanuch in state on fresh install</change>
<change>Refresh state data to update state events</change>
<change>Added app notification on new state events</change>
+ <change>Notifications make sound</change>
+ <change>Notification text comes from json data</change>
+ <change>Tapping on notification launches StateMessagesActivity</change>
+ <change>Made as much strings translatable as possible</change>
+ <change>A lot of smal fixes</change>
</release>
<release version="1.0.2" versioncode="12" >
<change>Third partie cookies disabled</change>
--
GitLab