From 35387fbc50a7f9cd121d0939cc3eeb1846c5ae25 Mon Sep 17 00:00:00 2001 From: massimiliano 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"> - - 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"> @@ -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"/>