From 7d944a56a9c4659d91c377b04214adf1f3269e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Thie=C3=9Fen?= Date: Wed, 3 Feb 2016 22:32:28 +0100 Subject: [PATCH] =?UTF-8?q?@03.02.15=20Dennis=20Thie=C3=9Fen:=20Release=20?= =?UTF-8?q?1.8.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++-- .../org/deke/risk/riskahead/MainActivity.java | 6 ++-- .../org/deke/risk/riskahead/MapsActivity.java | 5 ++-- .../deke/risk/riskahead/ProfileActivity.java | 30 +++++-------------- .../risk/riskahead/ViewReportActivity.java | 14 ++------- .../riskahead/fragment/SettingsFragment.java | 16 +++++++--- app/src/main/res/values-ar/strings.xml | 8 +++++ app/src/main/res/values-de/strings.xml | 8 +++++ app/src/main/res/values-es/strings.xml | 8 +++++ app/src/main/res/values-fr/strings.xml | 8 +++++ app/src/main/res/values-pt/strings.xml | 8 +++++ app/src/main/res/values-ru/strings.xml | 8 +++++ app/src/main/res/values/strings.xml | 8 +++++ 13 files changed, 85 insertions(+), 48 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ce13806..92d5077 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,14 +13,14 @@ apply plugin: 'com.google.gms.google-services' android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion "23.0.2" defaultConfig { applicationId "org.deke.risk.riskahead" minSdkVersion 15 targetSdkVersion 22 - versionCode 21 - versionName "1.8.6" + versionCode 22 + versionName "1.8.7" } buildTypes { release { diff --git a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java index a8facb3..1bf1443 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java @@ -1,6 +1,5 @@ package org.deke.risk.riskahead; -import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; @@ -33,8 +32,6 @@ public class MainActivity extends BaseActivity{ private final static String TAG = MainActivity.class.getSimpleName(); private Handler mHandler = new Handler(); - private TextView notificationStatus; - @Override @@ -86,7 +83,7 @@ public class MainActivity extends BaseActivity{ public void run() { requestNumberOfIncidents(); - notificationStatus = (TextView) findViewById(R.id.lbl_main_notifystatus_status); + TextView notificationStatus = (TextView) findViewById(R.id.lbl_main_notifystatus_status); if(session.getNotificationEnabled()){ if(session.getNotificationServiceReady()){ notificationStatus.setText(getString(R.string.txt_notifystatus_activated)); @@ -142,6 +139,7 @@ public class MainActivity extends BaseActivity{ Log.e(TAG, "Error getting incident count: " + error.getMessage()); showMessage(getString(R.string.errormsg_couldnotretrieve)); stopRepeatingTask(); + hideDialog(); } }) { diff --git a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java index 2991222..d24368a 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java @@ -20,7 +20,6 @@ import android.view.Menu; import android.view.View; import android.widget.EditText; import android.widget.LinearLayout; -import android.widget.ProgressBar; import android.widget.RatingBar; import android.widget.TextView; @@ -749,14 +748,14 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa } private void showProgress(){ - ((ProgressBar) findViewById(R.id.pb_map_progress)).setVisibility(View.VISIBLE); + findViewById(R.id.pb_map_progress).setVisibility(View.VISIBLE); pbCounter++; } private void hideProgress(){ pbCounter--; if(pbCounter == 0){ - ((ProgressBar) findViewById(R.id.pb_map_progress)).setVisibility(View.GONE); + findViewById(R.id.pb_map_progress).setVisibility(View.GONE); } } } 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 d099e99..1d4b0cd 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java @@ -33,7 +33,7 @@ public class ProfileActivity extends BaseActivity{ Log.d(TAG,"ProfileActivity created"); } - private void initProfileFromUserID(String msg_intent) { + private void initProfileFromUserID(String userId) { TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout); tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_stats))); @@ -41,25 +41,7 @@ public class ProfileActivity extends BaseActivity{ tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); - final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - final PagerAdapter adapter = new ProfilePagerAdapter(getSupportFragmentManager(), tabLayout.getTabCount(), msg_intent); - - viewPager.setAdapter(adapter); - viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); - tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { - @Override - public void onTabSelected(TabLayout.Tab tab) { - viewPager.setCurrentItem(tab.getPosition()); - } - - @Override - public void onTabUnselected(TabLayout.Tab tab) { - } - - @Override - public void onTabReselected(TabLayout.Tab tab) { - } - }); + initViewPager(tabLayout, userId); } private void initOwnProfileView() { @@ -71,8 +53,12 @@ public class ProfileActivity extends BaseActivity{ tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); + initViewPager(tabLayout, user.get(SessionManager.KEY_UID)); + } + + private void initViewPager(TabLayout tabLayout, String userId) { final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - final PagerAdapter adapter = new ProfilePagerAdapter(getSupportFragmentManager(), tabLayout.getTabCount(), user.get(SessionManager.KEY_UID)); + final PagerAdapter adapter = new ProfilePagerAdapter(getSupportFragmentManager(), tabLayout.getTabCount(), userId); viewPager.setAdapter(adapter); viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); @@ -84,12 +70,10 @@ public class ProfileActivity extends BaseActivity{ @Override public void onTabUnselected(TabLayout.Tab tab) { - } @Override public void onTabReselected(TabLayout.Tab tab) { - } }); } 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 0d4b7db..804121f 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java @@ -67,8 +67,6 @@ public class ViewReportActivity extends BaseActivity { super.onCreate(savedInstanceState); userHasToBeLoggedIn(); - showDialog(); - txtIncidentCategory = (EditText) findViewById(R.id.txt_viewreport_incidentcategory); txtIncidentSubCategory = (EditText) findViewById(R.id.txt_viewreport_incidentsubcategory); txtPosition = (EditText) findViewById(R.id.txt_viewreport_position); @@ -151,19 +149,21 @@ public class ViewReportActivity extends BaseActivity { } public void getIncident(Integer uid) { + showDialog(); String tag_string_req = "getincidentwithpositionfromid"; StringRequest strReq = getStringRequestGetIncidentWithPositionFromID(uid); AppController.getInstance().addToRequestQueue(strReq, tag_string_req); } public void deleteIncident(Integer uid) { + showDialog(); + String tag_string_req = "deactivateIncident"; StringRequest strReq = getStringRequestDeleteIncident(uid); AppController.getInstance().addToRequestQueue(strReq, tag_string_req); } private StringRequest getStringRequestDeleteIncident(final Integer incidentid) { - showDialog(); return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { @Override @@ -212,7 +212,6 @@ public class ViewReportActivity extends BaseActivity { } private StringRequest getStringRequestGetIncidentWithPositionFromID(final Integer incidentid) { - showDialog(); return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { @Override @@ -362,8 +361,6 @@ public class ViewReportActivity extends BaseActivity { private void initReport(IncidentReport incident) { Context tmpContext = getApplicationContext(); - hideDialog(); - scorelabel.setText(Integer.toString(incident.getVotedScore())); txtIncidentCategory.setText(incident.getIncidentCategoryName(tmpContext)); txtIncidentSubCategory.setText(checkIfTextEmptyAndReturnString(incident.getIncidentSubCategoryName(tmpContext))); @@ -451,7 +448,6 @@ public class ViewReportActivity extends BaseActivity { @Override public void onResponse(String response) { Log.d(TAG, "MadeVote: " + response); - hideDialog(); try { JSONObject jObj = new JSONObject(response); @@ -478,7 +474,6 @@ public class ViewReportActivity extends BaseActivity { public void onErrorResponse(VolleyError error) { Log.e(TAG, "Error voting incident: " + error.getMessage()); showMessage(getString(R.string.errormsg_couldnotretrieve)); - hideDialog(); } }) { @@ -500,7 +495,6 @@ public class ViewReportActivity extends BaseActivity { String tag_string_req = "deletevote"; StringRequest strReq = getStringRequestDeleteVote(incidentid); AppController.getInstance().addToRequestQueue(strReq, tag_string_req); - } private StringRequest getStringRequestDeleteVote(final Integer incidentid) { @@ -509,7 +503,6 @@ public class ViewReportActivity extends BaseActivity { @Override public void onResponse(String response) { Log.d(TAG, "Delete Vote: " + response); - hideDialog(); try { JSONObject jObj = new JSONObject(response); @@ -534,7 +527,6 @@ public class ViewReportActivity extends BaseActivity { public void onErrorResponse(VolleyError error) { Log.e(TAG, "Error deleting voting incident: " + error.getMessage()); showMessage(getString(R.string.errormsg_couldnotretrieve)); - hideDialog(); } }) { diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java index b773435..c031727 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java @@ -85,13 +85,21 @@ public class SettingsFragment extends PreferenceFragment { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String newStringValue = newValue.toString(); - session.setNotificationRadius(Integer.valueOf(newStringValue)); - ((ListPreference) preference).setValue(newValue.toString()); - preference.setSummary(prefRadius.getEntry()); - return true; + + if(session.getSubsPremium() || Integer.valueOf(newStringValue) < 25){ + session.setNotificationRadius(Integer.valueOf(newStringValue)); + ((ListPreference) preference).setValue(newValue.toString()); + preference.setSummary(prefRadius.getEntry()); + return true; + }else{ + ((SettingsActivity) getActivity()).showMessage(getString(R.string.txt_premium_only)); + return false; + } + } }); + prefFrequency.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 057240c..d2d6cf8 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -409,6 +409,10 @@ 5 كم 10 كم 15 كم + 25 كم + 50 كم + 100 كم + 250 كم @@ -416,6 +420,10 @@ 5 10 15 + 25 + 50 + 100 + 250 diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dc1c56d..095c996 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -403,6 +403,10 @@ 5 km 10 km 15 km + 25 km + 50 km + 100 km + 250 km @@ -410,6 +414,10 @@ 5 10 15 + 25 + 50 + 100 + 250 diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7a00ad1..6a56d01 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -409,6 +409,10 @@ 5 km 10 km 15 km + 25 km + 50 km + 100 km + 250 km @@ -416,6 +420,10 @@ 5 10 15 + 25 + 50 + 100 + 250 diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 885ff71..d8c40eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -408,6 +408,10 @@ 5 km 10 km 15 km + 25 km + 50 km + 100 km + 250 km @@ -415,6 +419,10 @@ 5 10 15 + 25 + 50 + 100 + 250 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index aa2e7e8..02cfeec 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -425,6 +425,10 @@ Não foi possível recuperar as configurações do perfil 5 km 10 km 15 km + 25 km + 50 km + 100 km + 250 km @@ -432,6 +436,10 @@ Não foi possível recuperar as configurações do perfil 5 10 15 + 25 + 50 + 100 + 250 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 98ecb6c..e7f6fd3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -407,6 +407,10 @@ 5 km 10 km 15 km + 25 km + 50 km + 100 km + 250 km @@ -414,6 +418,10 @@ 5 10 15 + 25 + 50 + 100 + 250 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a010ca..c33978b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -411,6 +411,10 @@ 5 km 10 km 15 km + 25 km + 50 km + 100 km + 250 km @@ -418,6 +422,10 @@ 5 10 15 + 25 + 50 + 100 + 250