DT @26.01.2016: 1.7.2 release

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "org.deke.risk.riskahead"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 12
+        versionCode 14
-        versionName "1.7"
+        versionName "1.7.2"
     }
     buildTypes {
         release {

app/src/main/java/org/deke/risk/riskahead/MapsActivity.java

@@ -194,6 +194,14 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
                             }
                         });
                     }
+                }else{
+                    addButton.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Log.d(TAG, "MARKED LOCATION: " + markedLocation.latitude + " " + markedLocation.longitude);
+                            gotoReportActivity(markedLocation.latitude + ":" + markedLocation.longitude);
+                        }
+                    });
                 }
 
             }

app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java

@@ -374,15 +374,19 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
     }
 
     private void showDialogWhenReportAdded(final IncidentReport incident) {
+
         new AlertDialog.Builder(ReportWFActivity.this)
                 .setTitle(R.string.txt_share_title)
                 .setMessage(R.string.txt_share_message)
                 .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
+
+                        gotoMapActivity(incident.getPosition().latitude+":"+incident.getPosition().longitude);
+
                         Intent sharingIntent = new Intent(Intent.ACTION_SEND);
 
-                       Bitmap icon = BitmapFactory.decodeResource(getApplicationContext().getResources(),
+                        Bitmap icon = BitmapFactory.decodeResource(getApplicationContext().getResources(),
-                               R.drawable.logo_riskahead);
+                               R.drawable.ra_qrcode);
 
                         String text = getString(R.string.txt_share_hint)
                                         +getString(R.string.txt_share_hint2)+": "+ incident.getIncidentCategoryName(getApplicationContext())
@@ -398,6 +402,11 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
                         sharingIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                         startActivity(Intent.createChooser(sharingIntent, getString(R.string.txt_share_acttitle)));
 
+
+
+
+                        finish();
+
                         
                     }
                 })

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

@@ -305,7 +305,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     public void showAd(){
         if (mInterstitialAd.isLoaded()) {
             Log.d(TAG,"Loading Add...");
-            if(!session.getSubsNoAds() || !session.getSubsPremium()){
+            if(!(session.getSubsNoAds() || session.getSubsPremium())){
                 mInterstitialAd.show();
             }else{
                 Log.d(TAG,"Add not shown because user has status.");

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

@@ -343,7 +343,9 @@ public class IncidentReport implements ClusterItem {
 
         if((stringArray != null) && (this.fidIncidentSubCategory > 0) && (this.fidIncidentSubCategory <= stringArray.length)){
             returnValue = stringArray[this.fidIncidentSubCategory-1];
-            if(this.etcIncidentCategory.trim().length() > 0){
+            if((this.fidIncidentSubCategory == stringArray.length) && (this.etcIncidentCategory.trim().length() > 0)){
+                returnValue = this.etcIncidentCategory;
+            }else if(this.etcIncidentCategory.trim().length() > 0){
                 returnValue += " ("+this.etcIncidentCategory+")";
             }
         }

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

@@ -51,7 +51,8 @@ public class NotificationService extends Service {
 
     @Override
     public void onCreate(){
-        Log.d(TAG,"Service Created. Starting notification task...");
+        Log.d(TAG,"onCreate NotificationService");
+
         mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
         session = new SessionManager(getApplicationContext());
@@ -62,6 +63,7 @@ public class NotificationService extends Service {
         locationManager.requestLocationUpdates(
                 LocationManager.NETWORK_PROVIDER, 5000, 10, locationListener);
 
+        Log.d(TAG, "Service Created. Starting notification task...");
         mNotifyTask.run();
     }
 
@@ -237,4 +239,11 @@ public class NotificationService extends Service {
 
     }
 
+    @Override
+    public void onDestroy(){
+        super.onDestroy();
+        Log.d(TAG, "Destroy NotificationService");
+    }
+
+
 }

app/src/main/res/layout/activity_main.xml

@@ -19,13 +19,10 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:layout_below="@id/toolbar"
         android:id="@+id/imageView"
         android:src="@drawable/bg_withlogo_2"
-        android:scaleType="centerCrop"
+        android:scaleType="centerCrop" />
-        android:layout_alignParentTop="true"
-        android:alpha="0.9" />
-
-
 
     <RelativeLayout
         android:id="@+id/layoutContent"

app/src/main/res/layout/fragment_profile_stats.xml

@@ -32,7 +32,7 @@
             android:text="@string/lbl_profile_points_me"
             android:layout_below="@+id/btn_profile_membershiptype"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="10dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
@@ -45,6 +45,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/lbl_profile_points"
+            android:layout_marginTop="5dp"
             android:textSize="30sp" />
 
         <TextView
@@ -68,7 +69,7 @@
             android:layout_centerHorizontal="true"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             android:layout_below="@id/txt_profile_points"
             android:textColor="@color/text_light_grey"/>
 
@@ -80,7 +81,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/lbl_profile_numberposts"
             android:textSize="30sp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             />
 
         <TextView
@@ -103,7 +104,7 @@
             android:layout_centerHorizontal="true"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             android:layout_below="@id/txt_profile_numberposts"
             android:textColor="@color/text_light_grey"/>
 
@@ -115,7 +116,7 @@
             android:textSize="30sp"
             android:layout_centerHorizontal="true"
             android:layout_below="@+id/lbl_profile_ranking"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             />
 
         <TextView
@@ -135,7 +136,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="20sp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             android:layout_centerHorizontal="true"
             android:layout_above="@+id/lbl_main_txt5"
             />
@@ -148,7 +149,7 @@
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             android:textColor="@color/text_light_grey"/>
 
     </RelativeLayout>

app/src/main/res/values-de/strings.xml

@@ -376,7 +376,7 @@
         <item>Volksgruppe/Ethnie z.B. Hautfarbe</item>
         <item>Politische Zugehörigkeit</item>
         <item>Soziale Gruppe z.B. Einwanderer</item>
-        <item>Beruf z.B. Journalisten, Prostituierte</item>
+        <item>Beruf</item>
         <item>Sprachzugehörigkeit</item>
         <item>Sonstiges &#8230;</item>
     </string-array>

app/src/main/res/values/strings.xml

@@ -383,7 +383,7 @@
         <item>Ethnic Origin eg Skin Colour</item>
         <item>Political Affiliation</item>
         <item>Social Group eg Immigrants</item>
-        <item>Profession eg Journalist, Prostitute</item>
+        <item>Profession</item>
         <item>Language</item>
         <item>Other &#8230;</item>
     </string-array>