dennisthiessen/RiskAhead-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DT-dev: Libs updated; replaced deprecated methods (GMaps OnCameraChanged to OnCameraIdle); minor fixes

Browse Source
This commit is contained in:
Dennis Thiessen
2017-04-15 13:07:56 +02:00
parent 7d698e5181
commit ee3a6e2dd5
15 changed files with 94 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/app.iml
View File

@@ -85,6 +85,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
@@ -132,32 +133,46 @@
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="iconics-core-2.5.5" level="project" />
<orderEntry type="library" exported="" name="library-1.0.19" level="project" />
<orderEntry type="library" exported="" name="play-services-location-8.4.0" level="project" />
<orderEntry type="library" exported="" name="play-services-plus-8.4.0" level="project" />
<orderEntry type="library" exported="" name="google-material-typeface-2.1.0.1.original" level="project" />
<orderEntry type="library" exported="" name="play-services-base-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-10.2.1" level="project" />
<orderEntry type="library" exported="" name="androidbootstrap-2.3.1" level="project" />
<orderEntry type="library" exported="" name="retrofit-1.6.1" level="project" />
<orderEntry type="library" exported="" name="play-services-base-8.4.0" level="project" />
<orderEntry type="library" exported="" name="play-services-measurement-8.4.0" level="project" />
<orderEntry type="library" exported="" name="androidbootstrap-2.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-8.4.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="android-maps-utils-0.4" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
<orderEntry type="library" exported="" name="play-services-gass-10.2.1" level="project" />
<orderEntry type="library" exported="" name="design-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
<orderEntry type="library" exported="" name="materialize-1.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-location-10.2.1" level="project" />
<orderEntry type="library" exported="" name="android-maps-utils-0.5" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-clearcut-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-10.2.1" level="project" />
<orderEntry type="library" exported="" name="bolts-android-1.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="materialdrawer-4.6.4" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-8.4.0" level="project" />
<orderEntry type="library" exported="" name="materialize-0.5.1" level="project" />
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-10.2.1" level="project" />
<orderEntry type="library" exported="" name="google-material-typeface-3.0.1.0.original" level="project" />
<orderEntry type="library" exported="" name="fabric-1.3.4" level="project" />
<orderEntry type="library" exported="" name="play-services-gcm-8.4.0" level="project" />
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
<orderEntry type="library" exported="" name="gson-2.7" level="project" />
<orderEntry type="library" exported="" name="play-services-plus-10.2.1" level="project" />
<orderEntry type="library" exported="" name="materialdrawer-5.9.0" level="project" />
<orderEntry type="library" exported="" name="play-services-iid-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-gcm-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-10.2.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
<orderEntry type="library" exported="" name="twitter-core-1.4.1" level="project" />
<orderEntry type="library" exported="" name="fastadapter-2.5.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
<orderEntry type="library" exported="" name="facebook-android-sdk-4.8.1" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" name="iconics-core-2.8.2" level="project" />
<orderEntry type="library" exported="" name="android-android-25" level="project" />
</component>
</module>

35
app/build.gradle
View File

@@ -29,6 +29,9 @@ android {
debuggable false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
debuggable true
}
}
lintOptions {
abortOnError false
@@ -42,24 +45,28 @@ repositories {
dependencies {
compile fileTree(dir: 'libs', include: 'Parse-*.jar')
compile 'com.facebook.android:facebook-android-sdk:4.8.1'
compile('com.twitter.sdk.android:twitter-core:1.4.1@aar') {
transitive = true;
}
compile('com.mikepenz:materialdrawer:4.6.4@aar') {
compile 'com.mikepenz:iconics-core:2.8.2@aar'
compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar'
compile('com.mikepenz:materialdrawer:5.9.0@aar') {
transitive = true
}
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.mikepenz:iconics-core:2.5.5@aar'
compile 'com.mikepenz:google-material-typeface:2.1.0.1.original@aar'
compile 'com.google.android.gms:play-services-gcm:8.4.0'
compile 'com.google.android.gms:play-services-plus:8.4.0'
compile 'com.google.android.gms:play-services-location:8.4.0'
compile 'com.google.android.gms:play-services-ads:8.4.0'
compile 'com.facebook.android:facebook-android-sdk:4.8.1'
compile 'com.beardedhen:androidbootstrap:2.0.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.google.android.gms:play-services-gcm:10.2.1'
compile 'com.google.android.gms:play-services-plus:10.2.1'
compile 'com.google.android.gms:play-services-location:10.2.1'
compile 'com.google.android.gms:play-services-ads:10.2.1'
compile 'com.google.android.gms:play-services-maps:10.2.1'
compile 'com.google.maps.android:android-maps-utils:0.5'
compile 'com.google.code.gson:gson:2.7'
compile 'com.beardedhen:androidbootstrap:2.3.1'
compile 'com.mcxiaoke.volley:library:1.0.19'
compile 'com.android.support:design:23.1.1'
compile 'com.google.code.gson:gson:2.4'
compile 'com.google.maps.android:android-maps-utils:0.4'
compile 'com.android.support:support-v4:23.1.1'
}

2
app/src/main/java/org/deke/risk/riskahead/MainActivity.java
View File

@@ -127,7 +127,7 @@ public class MainActivity extends BaseActivity{
}
private StringRequest getStringRequestIncidentCount() {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

17
app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
View File

@@ -239,13 +239,14 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
});
}
public GoogleMap.OnCameraChangeListener getCameraChangeListener() {
return new GoogleMap.OnCameraChangeListener()
public GoogleMap.OnCameraIdleListener getCameraChangeListener() {
return new GoogleMap.OnCameraIdleListener()
{
@Override
public void onCameraChange(CameraPosition position)
public void onCameraIdle()
{
mClusterManager.onCameraChange(position);
mClusterManager.onCameraIdle();
CameraPosition position = mMap.getCameraPosition();
if((position.zoom < MIN_ZOOM_LEVEL) && !session.getSubsPremium()) {
mMap.animateCamera(CameraUpdateFactory.zoomTo(MIN_ZOOM_LEVEL));
@@ -398,7 +399,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
private StringRequest getStringRequestGetAllIncidentsForHeatMapFromBound(final LatLng northeast, final LatLng southwest) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
@@ -446,7 +447,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
private StringRequest getStringRequestGetAllIncidentsFromBound(final LatLng northeast, final LatLng southwest) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
@@ -495,7 +496,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
private void initClustering() {
mClusterManager = new ClusterManager<>(this, mMap);
mMap.setOnCameraChangeListener(getCameraChangeListener());
mMap.setOnCameraIdleListener(getCameraChangeListener());
mClusterManager.setRenderer(new OwnIconRendered(MapsActivity.this, mMap, mClusterManager));
@@ -528,7 +529,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
private StringRequest getStringRequestGetIncidentScoreForInfoWindow(final View infoView, final String incidentID) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

2
app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java
View File

@@ -315,7 +315,7 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
private StringRequest getStringRequestAddIncidentWithPosition(final IncidentReport incident) {
showDialog();
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

6
app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java
View File

@@ -309,7 +309,7 @@ public class SubscriptionsActivity extends BaseActivity{
}
private StringRequest getStringAddSubscription(final String productId, final String type, final String price, final String currency) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
@@ -365,7 +365,7 @@ public class SubscriptionsActivity extends BaseActivity{
}
private StringRequest getStringGetSubscriptions(final String userId) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
@@ -426,7 +426,7 @@ public class SubscriptionsActivity extends BaseActivity{
}
private StringRequest getStringDeactivateSubscriptions(final String subscriptionId) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

8
app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java
View File

@@ -158,7 +158,7 @@ public class ViewReportActivity extends BaseActivity {
}
private StringRequest getStringRequestDeleteIncident(final Integer incidentid) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
@@ -213,7 +213,7 @@ public class ViewReportActivity extends BaseActivity {
}
private StringRequest getStringRequestGetIncidentWithPositionFromID(final Integer incidentid) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
@@ -447,7 +447,7 @@ public class ViewReportActivity extends BaseActivity {
}
private StringRequest getStringRequestAddVote(final Integer incidentid, final String votetype) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
@@ -502,7 +502,7 @@ public class ViewReportActivity extends BaseActivity {
}
private StringRequest getStringRequestDeleteVote(final Integer incidentid) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

2
app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java
View File

@@ -86,7 +86,7 @@ public class ProfileStatisticsFragment extends Fragment {
}
private StringRequest getStringRequestProfileStats() {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

2
app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java
View File

@@ -86,7 +86,7 @@ public class ReportListFragment extends Fragment{
}
private StringRequest getStringRequestGetIncidentsWithPositionFromUserID() {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

4
app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java
View File

@@ -239,7 +239,7 @@ public class SettingsFragment extends PreferenceFragment {
private StringRequest getStringRequestResetPW(final String email) {
((SettingsActivity) getActivity()).showDialog();
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
@@ -304,7 +304,7 @@ public class SettingsFragment extends PreferenceFragment {
}
private StringRequest getStringChangeUserSettings(final String username, final String name, final String surname, final String email) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

2
app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java
View File

@@ -79,7 +79,7 @@ public class Top10Fragment extends Fragment {
private StringRequest getStringRequestTop10() {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

4
app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java
View File

@@ -16,8 +16,8 @@ public class AppConfig {
public final static String URL_ENCRYPTED = "https://www.riskahead.de/helper/rest/";
public final static String URL_DEFAULT = "http://www.riskahead.de/helper/rest/";
public final static String URL_ABOUT = "http://www.riskahead.de/en/about/";
public final static String URL_CONTACT = "http://www.riskahead.de/en/contact/";
public final static String URL_ABOUT = "https://www.riskahead.net/about/";
public final static String URL_CONTACT = "https://www.riskahead.net/contact/";
/** INTENT MESSAGES **/
public final static String EXTRA_MESSAGE = "org.deke.risk.riskahead.MESSAGE";

4
app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java
View File

@@ -335,7 +335,7 @@ public abstract class BaseActivity extends AppCompatActivity {
public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
switch (drawerItem.getIdentifier()) {
switch ((int)drawerItem.getIdentifier()) {
case 1:
gotoMainActivity();
return false;
@@ -723,7 +723,7 @@ public abstract class BaseActivity extends AppCompatActivity {
}
private StringRequest getStringRequestSendFeedback(final String feedback, final String sysprop) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {

10
app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java
View File

@@ -612,6 +612,16 @@ public class IncidentReport implements ClusterItem {
return this.incidentPosition;
}
@Override
public String getTitle() {
return "Title";
}
@Override
public String getSnippet() {
return "Snippet";
}
public int getVotedScore(){
return this.votedScore;
}

2
app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java
View File

@@ -162,7 +162,7 @@ public class NotificationService extends Service {
};
private StringRequest getStringRequestIncidentsFromAreaAndTime(final Double latitude, final Double longitude, final int radius, final String time) {
return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener<String>() {
return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener<String>() {
@Override
public void onResponse(String response) {