From 906a288f73f6670c4fe5a92981f3fdf2b4cf2bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Thie=C3=9Fen?= Date: Tue, 12 Jan 2016 21:33:14 +0100 Subject: [PATCH] DT @12.01.2016: Bugfixes for 1.5.1 --- app/src/main/AndroidManifest.xml | 19 +++++++++++-------- .../deke/risk/riskahead/LoginActivity.java | 1 - .../deke/risk/riskahead/ProfileActivity.java | 10 +++++----- .../risk/riskahead/ViewReportActivity.java | 2 +- .../fragment/ProfileStatisticsFragment.java | 5 +---- .../fragment/ReportListFragment.java | 4 ---- app/src/main/res/values-de/strings.xml | 4 ++++ app/src/main/res/values/strings.xml | 4 ++++ 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index efe5b91..f7b19b4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,16 @@ + + + + + + - - - - getParams() { - // Posting parameters to login url Map params = new HashMap<>(); params.put("tag", AppConfig.REST_LOGIN); params.put("email", email); diff --git a/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java index e51d81e..05eb55c 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java @@ -36,8 +36,8 @@ public class ProfileActivity extends BaseActivity{ private void initProfileFromUserID(String msg_intent) { TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout); - tabLayout.addTab(tabLayout.newTab().setText("Statistics")); - tabLayout.addTab(tabLayout.newTab().setText("Reports")); + tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_stats))); + tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_reports))); tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); @@ -65,9 +65,9 @@ public class ProfileActivity extends BaseActivity{ private void initOwnProfileView() { TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout); - tabLayout.addTab(tabLayout.newTab().setText("Statistics")); - tabLayout.addTab(tabLayout.newTab().setText("Top 10")); - tabLayout.addTab(tabLayout.newTab().setText("Reports")); + tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_stats))); + tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_top10))); + tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_reports))); tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); diff --git a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java index db38d31..8e79a4d 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java @@ -305,7 +305,7 @@ public class ViewReportActivity extends BaseActivity { final String fromUid = Integer.toString(incident.getFidFromUser()); Drawable identityIcon = new IconicsDrawable(this) - .icon(GoogleMaterial.Icon.gmd_perm_identity) + .icon(GoogleMaterial.Icon.gmd_account_circle) .color(ContextCompat.getColor(getApplicationContext(), R.color.white)) .sizeDp(24); diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java index 9780266..ad73317 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java @@ -28,9 +28,6 @@ import org.json.JSONObject; import java.util.HashMap; import java.util.Map; -/** - * Created by Dennis on 13.12.2015. - */ public class ProfileStatisticsFragment extends Fragment { private final static String mActivityTitle = "User Statistics"; @@ -98,7 +95,7 @@ public class ProfileStatisticsFragment extends Fragment { points.setText(jObj.getString("points")); ranking.setText(jObj.getString("rank")); posts.setText(jObj.getString("numberOfPosts")); - txtMemberSince.setText(parent.user.get("created_at")); + txtMemberSince.setText(jObj.getString("created_at")); JSONArray jSubs = jObj.getJSONArray("subs"); boolean isPremium = false; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java index 4bd4741..28a7455 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java @@ -30,9 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -/** - * Created by Dennis on 13.12.2015. - */ public class ReportListFragment extends Fragment{ private final static String mActivityTitle = "ReportList"; private final static String TAG = ReportListFragment.class.getSimpleName(); @@ -106,7 +103,6 @@ public class ReportListFragment extends Fragment{ } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error getting incident list (Server returned error): " + errorMsg); - parent.showMessage(errorMsg); } } catch (JSONException e) { e.printStackTrace(); diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1024236..7b601da 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -127,6 +127,10 @@ und sein Rang ist … unterstützt RiskAhead seit + Top 10 + Statistik + Meldungen + PREMIUM NUTZER FREE NUTZER ADD-FREE NUTZER diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9de6aa5..318e7bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -132,6 +132,10 @@ and his/her rank is … is supporting RiskAhead since + Top 10 + Statistics + Reports + PREMIUM MEMBER FREE MEMBER ADD-FREE MEMBER