diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 43c2277cac03969033151595e07846bf98261f40..76f6ec152c08156c961cac8d91ca168a3de83759 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,14 @@
android:label="@string/title_activity_about"
android:theme="@style/DisTheme" />
<activity android:name=".ui.WelcomeActivity" />
+ <activity
+ android:name=".ui.StateActivity"
+ android:label="@string/title_activity_state"
+ android:theme="@style/DisTheme" />
+ <activity
+ android:name=".ui.StateMessagesActivity"
+ android:label="@string/title_activity_state"
+ android:theme="@style/DisTheme" />
<activity
android:name="wsdfhjxc.taponium.MainActivity"
android:label="@string/title_activity_tap"
@@ -56,14 +64,6 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity
- android:name=".ui.StateActivity"
- android:label="@string/title_activity_state"
- android:theme="@style/DisTheme" />
- <activity
- android:name=".ui.Tabbed_state"
- android:label="@string/title_activity_tabbed_state"
- android:theme="@style/DisTheme"></activity>
</application>
</manifest>
\ No newline at end of file
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 27e914d56f013e0f266e52aa90e3a556e952dcac..c933a7b3582b7f1b9269bfd1a5046b32a95713f4 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -287,6 +287,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
/* if((xmpp1 == null)&&(xmpp2 != null)) { */
if((xmpp1 == null)&&(xmpp2 != null)) {//if(xmpp1 == null) {
startActivity(xmpp2);
+ return;
}
//need to change to give user choise || check.getBoolean("checkPix",false)
if((xmpp1 != null)&&(xmpp2 != null)) {
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java
index 087fc8a94310ffe4da156fab0b30b475a12c737d..e25b0be95c5d5c5f63c9049bca60eae85d662dc8 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java
@@ -2,14 +2,18 @@ package org.disroot.disrootapp.ui;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
+import android.content.Intent;
import android.graphics.Color;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.SimpleAdapter;
@@ -27,7 +31,9 @@ import java.util.HashMap;
public class StateActivity extends AppCompatActivity {
- private String TAG = MainActivity.class.getSimpleName();
+ Button button;
+
+ private String TAG = StateActivity.class.getSimpleName();
private ProgressDialog pDialog;
private ListView lv;
@@ -35,7 +41,6 @@ public class StateActivity extends AppCompatActivity {
// URL to get data JSON
static String url = "https://state.disroot.org/api/v1/components";
static String url1 = "https://state.disroot.org/api/v1/components?page=2";
- static String incidenturl0 ="https://state.disroot.org/api/v1/incidents?sort=id&order=desc";
ArrayList<HashMap<String, String>> stateList;
@@ -54,6 +59,16 @@ public class StateActivity extends AppCompatActivity {
}
});
+
+ button = findViewById(R.id.StateMessageBtn);//StateMessageBtn
+ button.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View arg0) {
+ Intent goState = new Intent(StateActivity.this, StateMessagesActivity.class);
+ StateActivity.this.startActivity(goState);
+ }
+
+ });
+
stateList = new ArrayList<>();
lv = findViewById(R.id.list);
@@ -61,6 +76,32 @@ public class StateActivity extends AppCompatActivity {
new GetList().execute();
}
+ @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;
+ }
+
+
+ @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();
+
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_home) {
+ Intent goHome = new Intent(StateActivity.this, MainActivity.class);
+ StateActivity.this.startActivity(goHome);
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
/**
* Async task class to get json by making HTTP call
*/
@@ -84,7 +125,6 @@ public class StateActivity extends AppCompatActivity {
// Making a request to url and getting response
String jsonStr0 = sh.makeServiceCall(url);
String jsonStr1 = sh.makeServiceCall(url1);
- String jsonStrincidents0 = sh.makeServiceCall(incidenturl0);
Log.e(TAG, "Response from url: " + jsonStr0);
@@ -174,51 +214,6 @@ public class StateActivity extends AppCompatActivity {
}
});
}
- } if (jsonStrincidents0 != null) {//Incidaetnts page
- try {
- JSONObject jsonObj = new JSONObject(jsonStrincidents0);
-
- // Getting JSON Array node
- JSONArray data = jsonObj.getJSONArray("data");
-
- // looping through All data
- for (int i = 0; i < data.length(); i++) {
- JSONObject c = data.getJSONObject(i);
-
- String id = c.getString("id");
- String name = c.getString("name");
- String message = c.getString("message");
- String scheduled_at = c.getString("scheduled_at");
- String updated_at = c.getString("updated_at");
- String lastUpdated = "Last Updated: " + updated_at;
- String human_status = c.getString("human_status");
-
- // tmp hash map for single service
- HashMap<String, String> service = new HashMap<>();
-
- // adding each child node to HashMap key => value
- service.put("id", id);
- service.put("name", name);
- service.put("message", message);
- service.put("scheduled_at", scheduled_at);
- service.put("updated_at", lastUpdated);
- service.put("human_status", human_status);
-
- // adding service to service list
- stateList.add(service);
- }
- } catch (final JSONException e) {
- Log.e(TAG, "Json parsing error: " + e.getMessage());
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- Toast.makeText(getApplicationContext(),
- "Json parsing error: " + e.getMessage(),
- Toast.LENGTH_LONG)
- .show();
- }
- });
- }
}else {
Log.e(TAG, "Couldn't get json from server.");
runOnUiThread(new Runnable() {
@@ -244,9 +239,9 @@ public class StateActivity extends AppCompatActivity {
//Updating parsed JSON data into ListView
ListAdapter adapter = new SimpleAdapter(
StateActivity.this, stateList,
- R.layout.list_item, new String[]{"name","message", "description", "updated_at", "scheduled_at",
- "status_name", "human_status"}, new int[]{R.id.name, R.id.message,
- R.id.description,R.id.updated_at, R.id.scheduled_at, R.id.status_name, R.id.human_status})
+ R.layout.list_item, new String[]{"name", "description", "updated_at",
+ "status_name"}, new int[]{R.id.name,
+ R.id.description,R.id.updated_at, R.id.status_name})
//Change Color based on Status
{
@@ -305,22 +300,6 @@ public class StateActivity extends AppCompatActivity {
status.setText(R.string.PerformanceIssues);
status.setTextColor(Color.YELLOW);
break;
- }//Human_status
- TextView humanStatus = v.findViewById(R.id.human_status);
- String humanStatusValue = humanStatus.getText().toString();
- switch (humanStatusValue) {
- case "Fixed":
- case "Scheduled":
- humanStatus.setTextColor(Color.GREEN);
- break;
- case "Investigating":
- case "Watching":
- humanStatus.setTextColor(Color.YELLOW);
-
- break;
- case "Identified":
- humanStatus.setTextColor(Color.RED);
- break;
}
return v;
}
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..9ddfae73d1d948fc66d9eafb0e5928e2b645185e
--- /dev/null
+++ b/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
@@ -0,0 +1,272 @@
+package org.disroot.disrootapp.ui;
+
+import android.annotation.SuppressLint;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.disroot.disrootapp.R;
+import org.disroot.disrootapp.utils.HttpHandler;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class StateMessagesActivity extends AppCompatActivity {
+
+ Button button;
+ private String TAG = StateMessagesActivity.class.getSimpleName();
+
+ private ProgressDialog pDialog;
+ private ListView lv;
+
+ // URL to get data JSON
+ static String incidenturl0 ="https://state.disroot.org/api/v1/incidents?sort=id&order=desc";
+
+ ArrayList<HashMap<String, String>> messageList;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_state_messages);
+
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+ toolbar.setNavigationIcon(R.drawable.ic_arrow_back);
+ toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ onBackPressed();
+ }
+ });
+
+
+ button = findViewById(R.id.StateBtn);//StateBtn
+ button.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View arg0) {
+ Intent goState = new Intent(StateMessagesActivity.this, StateActivity.class);
+ StateMessagesActivity.this.startActivity(goState);
+ }
+
+ });
+
+ messageList = new ArrayList<>();
+
+ lv = findViewById(R.id.list);
+
+ new GetList().execute();
+ }
+
+ @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;
+ }
+
+
+ @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();
+
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_home) {
+ Intent goHome = new Intent(StateMessagesActivity.this, MainActivity.class);
+ StateMessagesActivity.this.startActivity(goHome);
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ /**
+ * Async task class to get json by making HTTP call
+ */
+ @SuppressLint("StaticFieldLeak")
+ class GetList extends AsyncTask<Void, Void, Void> {
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+ // Showing progress dialog
+ pDialog = new ProgressDialog(StateMessagesActivity.this);
+ pDialog.setMessage("Loading…");
+ pDialog.setCancelable(false);
+ pDialog.show();
+ }
+
+ @Override
+ protected Void doInBackground(Void... arg0) {
+ HttpHandler sh = new HttpHandler();
+
+ // Making a request to url and getting response
+ String jsonStrincidents0 = sh.makeServiceCall(incidenturl0);
+
+ Log.e(TAG, "Response from url: " + incidenturl0);
+
+ if (jsonStrincidents0 != null) {//Incidaetnts page
+ try {
+ JSONObject jsonObj = new JSONObject(jsonStrincidents0);
+
+ // Getting JSON Array node
+ JSONArray data = jsonObj.getJSONArray("data");
+
+ // looping through All data
+ for (int i = 0; i < data.length(); i++) {
+ JSONObject c = data.getJSONObject(i);
+
+ String id = c.getString("id");
+ String name = c.getString("name");
+ String message = c.getString("message");
+ String scheduled_at = c.getString("scheduled_at");
+ String scheduledAt = "Scheduled at: " + scheduled_at;
+ String updated_at = c.getString("updated_at");
+ String lastUpdated = "Last Updated: " + updated_at;
+ String human_status = c.getString("human_status");
+
+ // tmp hash map for single service
+ HashMap<String, String> service = new HashMap<>();
+
+ // adding each child node to HashMap key => value
+ service.put("id", id);
+ service.put("name", name);
+ service.put("message", message);
+ service.put("scheduled_at", scheduledAt);
+ service.put("updated_at", lastUpdated);
+ service.put("human_status", human_status);
+
+ // adding service to service list
+ messageList.add(service);
+ }
+ } catch (final JSONException e) {
+ Log.e(TAG, "Json parsing error: " + e.getMessage());
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(getApplicationContext(),
+ "Json parsing error: " + e.getMessage(),
+ Toast.LENGTH_LONG)
+ .show();
+ }
+ });
+ }
+ }else {
+ Log.e(TAG, "Couldn't get json from server.");
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(getApplicationContext(),
+ "Couldn't get json from server. Check LogCat for possible errors!",
+ Toast.LENGTH_LONG)
+ .show();
+ }
+ });
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void result) {
+ super.onPostExecute(result);
+ // Dismiss the progress dialog
+ if (pDialog.isShowing())
+ pDialog.dismiss();
+
+ //Updating parsed JSON data into ListView
+ ListAdapter adapter = new SimpleAdapter(
+ StateMessagesActivity.this, messageList,
+ R.layout.list_item, new String[]{"name","message", "updated_at", "scheduled_at", "human_status"}, new int[]{R.id.name, R.id.message,
+ R.id.updated_at, R.id.scheduled_at, R.id.human_status})
+
+ //Change Color based on Status
+ {
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ View v = super.getView(position, convertView, parent);
+ //Name Email
+ TextView nameMail = v.findViewById(R.id.name);
+ String nameMailValue = nameMail.getText().toString();
+ switch (nameMailValue) {
+ case "Email Service":
+ nameMail.setText(R.string.EmailService);
+ break;
+ default:
+ break;
+ }
+ //Name WebMail
+ TextView nameWebmail = v.findViewById(R.id.name);
+ String nameWebmailValue = nameWebmail.getText().toString();
+ switch (nameWebmailValue) {
+ case "WebMail Service":
+ nameWebmail.setText(R.string.WebmailService);
+ break;
+ default:
+ break;
+ }
+ //Name Cloud
+ TextView nameCloud = v.findViewById(R.id.name);
+ String nameCloudValue = nameCloud.getText().toString();
+ switch (nameCloudValue) {
+ case "WebMail Service":
+ nameCloud.setText(R.string.Cloud);
+ break;
+ default:
+ break;
+ }
+ //Make Last updated translatable
+ TextView updated = v.findViewById(R.id.updated_at);
+ String updatedValue = updated.getText().toString();
+ if (updatedValue.startsWith("Last Updated: ")){
+ updated.setText(updatedValue.replace("Last Updated: ",getText(R.string.LastUpdated)));
+ }
+ //Make Scheduled at translatable
+ TextView scheduled = v.findViewById(R.id.scheduled_at);
+ String scheduledValue = scheduled.getText().toString();
+ if (scheduledValue.startsWith("Scheduled at: ")){
+ scheduled.setText(scheduledValue.replace("Scheduled at: ",getText(R.string.ScheduledAt)));
+ }
+ //Human_status
+ TextView humanStatus = v.findViewById(R.id.human_status);
+ String humanStatusValue = humanStatus.getText().toString();
+ switch (humanStatusValue) {
+ case "Fixed":
+ case "Scheduled":
+ humanStatus.setTextColor(Color.GREEN);
+ break;
+ case "Investigating":
+ case "Watching":
+ humanStatus.setTextColor(Color.YELLOW);
+
+ break;
+ case "Identified":
+ humanStatus.setTextColor(Color.RED);
+ break;
+ }
+ return v;
+ }
+ };
+ lv.setAdapter(adapter);
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_state.xml b/app/src/main/res/layout/activity_state.xml
index 8521c9094aaa9137e1c983c3393b5721030933ee..9725ad5266d91c8e6c0f13bae92d8473d3203ecd 100644
--- a/app/src/main/res/layout/activity_state.xml
+++ b/app/src/main/res/layout/activity_state.xml
@@ -26,6 +26,36 @@
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
+<android.support.v7.widget.LinearLayoutCompat
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="#203140">
+ <Button
+ android:id="@+id/StateBtn"
+ android:shadowColor="@color/bg_primary_blue"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="24dp"
+ android:drawableTop="@drawable/ic_state"
+ android:text="@string/state_btn"
+ android:layout_gravity="center"
+ android:layout_marginHorizontal="@android:dimen/app_icon_size"
+ style="?android:attr/borderlessButtonStyle"
+ android:textColor="#ffffff"/>
+ <Button
+ android:id="@+id/StateMessageBtn"
+ android:shadowColor="@color/bg_primary_blue"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="24dp"
+ android:drawableTop="@drawable/ic_state"
+ android:text="@string/state_messages_btn"
+ android:layout_gravity="center"
+ android:layout_marginHorizontal="@android:dimen/app_icon_size"
+ style="?android:attr/borderlessButtonStyle"
+ android:textColor="#ffffff"/>
+</android.support.v7.widget.LinearLayoutCompat>
+
<ListView
android:id="@+id/list"
diff --git a/app/src/main/res/layout/activity_state_messages.xml b/app/src/main/res/layout/activity_state_messages.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9725ad5266d91c8e6c0f13bae92d8473d3203ecd
--- /dev/null
+++ b/app/src/main/res/layout/activity_state_messages.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
+ tools:context=".ui.StateActivity">
+
+ <android.support.design.widget.AppBarLayout
+ android:id="@+id/appbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/appbar_padding_top"
+ android:theme="@style/DisTheme.AppBarOverlay">
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:layout_weight="1"
+ android:background="?attr/colorPrimary"
+ app:layout_scrollFlags="scroll|enterAlways"
+ app:popupTheme="@style/DisTheme.PopupOverlay"
+ app:title="@string/app_name">
+
+ </android.support.v7.widget.Toolbar>
+ </android.support.design.widget.AppBarLayout>
+<android.support.v7.widget.LinearLayoutCompat
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="#203140">
+ <Button
+ android:id="@+id/StateBtn"
+ android:shadowColor="@color/bg_primary_blue"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="24dp"
+ android:drawableTop="@drawable/ic_state"
+ android:text="@string/state_btn"
+ android:layout_gravity="center"
+ android:layout_marginHorizontal="@android:dimen/app_icon_size"
+ style="?android:attr/borderlessButtonStyle"
+ android:textColor="#ffffff"/>
+ <Button
+ android:id="@+id/StateMessageBtn"
+ android:shadowColor="@color/bg_primary_blue"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="24dp"
+ android:drawableTop="@drawable/ic_state"
+ android:text="@string/state_messages_btn"
+ android:layout_gravity="center"
+ android:layout_marginHorizontal="@android:dimen/app_icon_size"
+ style="?android:attr/borderlessButtonStyle"
+ android:textColor="#ffffff"/>
+</android.support.v7.widget.LinearLayoutCompat>
+
+
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="#203140"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 95a31f11421ccd3edacb1d322f4c6964b6031fb2..0f5be6b9ba594df2c3e0d89d35221cc8404f550a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -145,4 +145,7 @@
<string name="PerformanceIssues">Performance Issues</string>
<string name="Notification">No issues</string>
<string name="Notificationissues">Some systems are experiencing issues</string>
+ <string name="state_messages_btn">Show State messages</string>
+ <string name="state_btn">Show Service State</string>
+ <string name="ScheduledAt">Scheduled at:</string>
</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 474f1b4b6702a13cd68f943a62d834fc2ea7a008..8f809c92e9afd6d594c8a18de82358b8380a4ab4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -174,4 +174,7 @@
<string name="PerformanceIssues">Performance Issues</string>
<string name="Notification">No issues</string>
<string name="Notificationissues">Some systems are experiencing issues</string>
+ <string name="state_messages_btn">Show State messages</string>
+ <string name="state_btn">Show Service State</string>
+ <string name="ScheduledAt">Scheduled at:</string>
</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c74ad2e6e4e6cf7ff4cc1a4ab611b5c2063ea00a..8add8a9caf9a531ff7b9973947016c18fd7587df 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -142,6 +142,9 @@
<string name="WebmailService">Servizio WebMail</string>
<string name="Cloud">Cloud</string>
<string name="PerformanceIssues">Problemi di performanza</string>
- <string name="Notification">No issues</string>
- <string name="Notificationissues">Some systems are experiencing issues</string>
+ <string name="Notification">Nessun problema con i servizi</string>
+ <string name="Notificationissues">Alcuni sistemi stanno avendo dei problemi</string>
+ <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>
</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3470e80ca70ca9082ac6351550c07a3aecf62f79..96b8911a28a432829d537481d27f1dee8c1bb48a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -143,6 +143,9 @@
<string name="WebmailService">WebMail Service</string>
<string name="Cloud">Cloud</string>
<string name="PerformanceIssues">Prestatieproblemen</string>
- <string name="Notification">No issues</string>
- <string name="Notificationissues">Some systems are experiencing issues</string>
+ <string name="Notification">Geen problemen</string>
+ <string name="Notificationissues">Sommige systemen ondervinden problemen</string>
+ <string name="state_messages_btn">Toon statusberichten</string>
+ <string name="state_btn">Toon Service Status</string>
+ <string name="ScheduledAt">Gepland op: \</string>
</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index c31104545e00ec4bd93197c97cf3af4ec3cd815d..76565fc593303da93325dbd80f5d005e6820139b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -144,4 +144,7 @@
<string name="PerformanceIssues">Performance Issues</string>
<string name="Notification">No issues</string>
<string name="Notificationissues">Some systems are experiencing issues</string>
+ <string name="state_messages_btn">Show State messages</string>
+ <string name="state_btn">Show Service State</string>
+ <string name="ScheduledAt">Scheduled at:</string>
</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 924f060c922780a6b7192639db5001f6ea785c0a..f4da94dc8145996147e5f352c1118e1123f8524a 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -145,4 +145,7 @@
<string name="PerformanceIssues">Performance Issues</string>
<string name="Notification">No issues</string>
<string name="Notificationissues">Some systems are experiencing issues</string>
+ <string name="state_messages_btn">Show State messages</string>
+ <string name="state_btn">Show Service State</string>
+ <string name="ScheduledAt">Scheduled at:</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e4f44e7c3d29453ef9e96d9536b1cf64a3ebcf3..6eefaea8e46718e4491984df7e4da8b2bd521f65 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -139,13 +139,13 @@
<string name="Operational">Operational</string>
<string name="MajorOutage">Major Outage</string>
<string name="EmailService">Email Service</string>
- <string name="LastUpdated">"Last updated: "</string>
+ <string name="LastUpdated">"Last updated: \"</string>
<string name="WebmailService">WebMail Service</string>
<string name="Cloud">Cloud</string>
<string name="PerformanceIssues">Performance Issues</string>
<string name="Notification">No issues</string>
<string name="Notificationissues">Some systems are experiencing issues</string>
- <string name="title_activity_main2">Main2Activity</string>
- <string name="section_format">Hello World from section: %1$d</string>
- <string name="title_activity_tabbed_state">tabbed_state</string>
+ <string name="state_messages_btn">Show State messages</string>
+ <string name="state_btn">Show Service State</string>
+ <string name="ScheduledAt">Scheduled at: \</string>
</resources>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 95356793a48c4c0a164d9cd118f32802e94b9937..c986ec836497bbada4366fa43c7ea5f672b06550 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -2,6 +2,8 @@
<changelog>
<release version="1.0.2" versioncode="12" >
<change>State page is api based instead of webview</change>
+ <change>In State page is possible to view state messages</change>
+ <change>Fixed app crashing when launching Pix-art messenger</change>
</release>
<release version="1.0.2" versioncode="12" >
<change>Third partie cookies disabled</change>