diff --git a/app/app-release.apk b/app/app-release.apk index 1612339..f5a1580 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/app.iml b/app/app.iml index 6503e48..8e19f6b 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 4496517..4eb9066 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "org.deke.risk.riskahead" minSdkVersion 15 targetSdkVersion 23 - versionCode 33 - versionName "2.0.4" + versionCode 34 + versionName "2.1" } buildTypes { release { 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 bdea35e..7ef89fe 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java @@ -41,8 +41,6 @@ import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; import com.google.android.gms.maps.model.TileOverlay; import com.google.android.gms.maps.model.TileOverlayOptions; -import com.google.android.gms.plus.Plus; -import com.google.android.gms.plus.model.people.Person; import com.google.maps.android.clustering.Cluster; import com.google.maps.android.clustering.ClusterManager; import com.google.maps.android.heatmaps.HeatmapTileProvider; @@ -142,8 +140,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa } @Override - public void onRequestPermissionsResult(int requestCode, - String permissions[], int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { switch (requestCode) { case MY_PERMISSIONS_REQUEST_LOCATION: { // If request is cancelled, the result arrays are empty. @@ -152,14 +149,9 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa try{ mMap.setMyLocationEnabled(true); }catch(SecurityException e){ - + Log.e(TAG,"Security Exception: "+e.toString()); } - - - } else { - } - return; } // other 'case' lines to check for other diff --git a/app/src/main/java/org/deke/risk/riskahead/adapter/ReportListAdapter.java b/app/src/main/java/org/deke/risk/riskahead/adapter/ReportListAdapter.java index 7af1eef..7428467 100644 --- a/app/src/main/java/org/deke/risk/riskahead/adapter/ReportListAdapter.java +++ b/app/src/main/java/org/deke/risk/riskahead/adapter/ReportListAdapter.java @@ -1,8 +1,10 @@ package org.deke.risk.riskahead.adapter; import android.content.Context; +import android.graphics.Color; import android.graphics.Typeface; import android.os.Build; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,6 +15,7 @@ import android.widget.TextView; import org.deke.risk.riskahead.R; import org.deke.risk.riskahead.helper.IncidentReport; +import org.json.JSONException; import org.json.JSONObject; import java.util.List; @@ -63,22 +66,49 @@ public class ReportListAdapter extends BaseAdapter { TextView categoryText = (TextView) vi.findViewById(R.id.txt_reportlist_lvrow_category); LinearLayout ll = (LinearLayout) vi.findViewById(R.id.lay_reportlist_color); ImageView iv = (ImageView) vi.findViewById(R.id.ic_reportlist_row); + LinearLayout bglayout = (LinearLayout) vi.findViewById(R.id.lay_reportlist_bgcolor); - IncidentReport item = new IncidentReport(data.get(position)); + boolean status = true; - titleText.setText(item.getIncidentCategoryName(vi.getContext())); - itemText.setText(item.getIncidentSubCategoryName(vi.getContext())); - categoryText.setText(item.getTimeString(vi.getContext())); - - titleText.setTypeface(null, Typeface.BOLD); - ll.setBackgroundColor(item.getCategoryColor()); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - iv.setBackground(parent.getContext().getDrawable(item.getIconDrawable())); - } else { - iv.setBackgroundDrawable(parent.getResources().getDrawable(item.getIconDrawable())); + try { + if(data.get(position).getInt("status") == 0){ + status = false; + } + } catch (JSONException e) { + e.printStackTrace(); } + if(!status){ + bglayout.setBackgroundColor(Color.argb(120, 255, 0, 0)); + + titleText.setText(""); + itemText.setText(R.string.txt_reportlist_deleted); + itemText.setGravity(Gravity.CENTER); + itemText.setPadding(10,0,0,0); + categoryText.setText(""); + + ll.setBackgroundColor(Color.argb(150, 255, 0, 0)); + iv.setVisibility(View.GONE); + }else { + bglayout.setBackgroundColor(Color.argb(0, 0, 0, 0)); + IncidentReport item = new IncidentReport(data.get(position)); + titleText.setText(item.getIncidentCategoryName(vi.getContext())); + itemText.setText(item.getIncidentSubCategoryName(vi.getContext())); + itemText.setGravity(Gravity.LEFT); + itemText.setPadding(0,0,0,0); + categoryText.setText(item.getTimeString(vi.getContext())); + + + titleText.setTypeface(null, Typeface.BOLD); + ll.setBackgroundColor(item.getCategoryColor()); + iv.setVisibility(View.VISIBLE); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + iv.setBackground(parent.getContext().getDrawable(item.getIconDrawable())); + } else { + iv.setBackgroundDrawable(parent.getResources().getDrawable(item.getIconDrawable())); + } + } return vi; } } \ No newline at end of file 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 aa55572..7e87e01 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 @@ -64,7 +64,10 @@ public class ReportListFragment extends Fragment{ @Override public void onItemClick(AdapterView parentview, View view, int position, long id) { try { - parent.gotoViewReportActivity(resultList.get(position).getInt("id")); + if(resultList.get(position).getInt("status") == 1){ + parent.gotoViewReportActivity(resultList.get(position).getInt("id")); + } + } catch (JSONException e) { e.printStackTrace(); } @@ -100,9 +103,7 @@ public class ReportListFragment extends Fragment{ for(int i=0;i { @Override protected void onBeforeClusterItemRendered(IncidentReport item, MarkerOptions markerOptions) { markerOptions.icon(item.getIcon()); + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date dateToCheck = null; + + + + try { + if(item.getToDate() != null && !item.getToDate().equals("0000-00-00")){ + dateToCheck = simpleDateFormat.parse(item.getToDate()); + }else if(item.getFromDate() != null){ + dateToCheck = simpleDateFormat.parse(item.getFromDate()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + + if(dateToCheck != null && !dateToCheck.after(new Date(System.currentTimeMillis()-14*24*60*60*1000))){ + markerOptions.alpha(0.5f); + } + markerOptions.snippet(item.getIncidentSubCategoryName(context)); markerOptions.title(item.getIncidentCategoryName(context)); super.onBeforeClusterItemRendered(item, markerOptions); diff --git a/app/src/main/res/layout/fragment_reportlist_row.xml b/app/src/main/res/layout/fragment_reportlist_row.xml index e4365ec..8a4dfea 100644 --- a/app/src/main/res/layout/fragment_reportlist_row.xml +++ b/app/src/main/res/layout/fragment_reportlist_row.xml @@ -4,7 +4,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingRight="5dp" android:weightSum="1"> @@ -37,7 +37,7 @@ android:typeface="serif" /> Bitte jetzt aktualisieren! Exit Später + Gelöscht diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6103432..fd3c3b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -255,6 +255,7 @@ There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. Dennis Thießen Kevin-Chris Gründel + Deleted A Threatening Incident or Situation