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

DT @29.01.2016: 1.8.3 release

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-29 14:09:36 +01:00
parent 4daba8037c
commit 7167cf0f72
32 changed files with 121 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/app-release.apk
View File

Binary file not shown.

4
app/build.gradle
View File

@@ -19,8 +19,8 @@ android {
applicationId "org.deke.risk.riskahead"
minSdkVersion 15
targetSdkVersion 22
versionCode 15
versionName "1.8"
versionCode 18
versionName "1.8.3"
}
buildTypes {
release {

1
app/src/main/AndroidManifest.xml
View File

@@ -28,6 +28,7 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:largeHeap="true"
android:theme="@style/MyRiskAheadTheme">
<!-- Google Maps Fragment API Key Data -->

49
app/src/main/java/org/deke/risk/riskahead/LoginActivity.java
View File

@@ -10,9 +10,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.text.method.MovementMethod;
import android.util.Log;
import android.util.Patterns;
import android.view.Menu;
@@ -21,7 +19,6 @@ import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -147,8 +144,10 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
input_username.addTextChangedListener(new TextValidator(input_username, getApplicationContext()) {
@Override
public void validate(TextView textView, String text) {
if (text.length() < 5) {
if (text.trim().length() < 5) {
textView.setError(getString(R.string.error_anytext));
}else{
textView.setError(null);
}
}
});
@@ -158,6 +157,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
public void validate(TextView textView, String text) {
if (!Patterns.EMAIL_ADDRESS.matcher(text).matches()) {
textView.setError(getString(R.string.error_email));
}else{
textView.setError(null);
}
}
});
@@ -167,6 +168,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
public void validate(TextView textView, String text) {
if (text.length() < 5) {
textView.setError(getString(R.string.error_password));
}else{
textView.setError(null);
}
}
});
@@ -566,20 +569,24 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
private void createAndShowPrivacyDialogForSocialUser(final String key, final String providerType, final String username, final String email) {
final TextView privacyText = new TextView(LoginActivity.this);
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT);
privacyText.setLayoutParams(lp);
privacyText.setText(R.string.txt_register_privacy);
privacyText.setMovementMethod(LinkMovementMethod.getInstance());
privacyText.setPadding(10,20,10,20);
privacyText.setPadding(5, 10, 5, 10);
CheckBox privacyCheckbox = new CheckBox(getApplicationContext());
privacyCheckbox.setText(R.string.txt_register_privacy_text);
privacyCheckbox.setTextColor(getResources().getColor(R.color.md_black_1000));
final float scale = this.getResources().getDisplayMetrics().density;
privacyCheckbox.setPadding(privacyCheckbox.getPaddingLeft() + (int) (10.0f * scale + 0.5f),
privacyCheckbox.getPaddingTop() + 5,
privacyCheckbox.getPaddingRight(),
privacyCheckbox.getPaddingBottom());
privacyCheckbox.setButtonDrawable(Resources.getSystem().getIdentifier("btn_check_holo_light", "drawable", "android"));
privacyCheckbox.setPadding(10,20,10,20);
LinearLayout layout = new LinearLayout(LoginActivity.this);
@@ -613,29 +620,34 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
}
});
dialog.setView(layout, 40, 40, 40, 40);
dialog.setView(layout, 30, 30, 30, 30);
dialog.show();
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
}
private void createAndShowPrivacyDialog(final String username, final String email, final String password) {
final TextView privacyText = new TextView(LoginActivity.this);
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT);
privacyText.setLayoutParams(lp);
privacyText.setText(R.string.txt_register_privacy);
privacyText.setMovementMethod(LinkMovementMethod.getInstance());
privacyText.setPadding(10,20,10,20);
privacyText.setPadding(5, 10, 5, 10);
CheckBox privacyCheckbox = new CheckBox(getApplicationContext());
privacyCheckbox.setText(R.string.txt_register_privacy_text);
privacyCheckbox.setTextColor(getResources().getColor(R.color.md_black_1000));
final float scale = this.getResources().getDisplayMetrics().density;
privacyCheckbox.setPadding(privacyCheckbox.getPaddingLeft() + (int) (10.0f * scale + 0.5f),
privacyCheckbox.getPaddingTop() + 5,
privacyCheckbox.getPaddingRight(),
privacyCheckbox.getPaddingBottom());
privacyCheckbox.setButtonDrawable(Resources.getSystem().getIdentifier("btn_check_holo_light", "drawable", "android"));
privacyCheckbox.setPadding(10,20,10,20);
LinearLayout layout = new LinearLayout(LoginActivity.this);
@@ -669,7 +681,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
}
});
dialog.setView(layout, 40, 40, 40, 40);
dialog.setView(layout, 30, 30, 30, 30);
dialog.show();
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
@@ -843,6 +855,15 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
pDialog.dismiss();
}
@Override
public void onBackPressed() {
Intent intent = new Intent(
LoginActivity.this,
StartActivity.class);
startActivity(intent);
finish();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_common, menu);

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

@@ -180,10 +180,10 @@ public class SubscriptionsActivity extends BaseActivity{
}
private void initPurchaseTable(ArrayList<String> responseList) throws JSONException {
TableRow.LayoutParams rowParamsDescription = new TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 0.7f);
TableRow.LayoutParams rowParamsDescription = new TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 0.65f);
rowParamsDescription.weight = 1.0f;
rowParamsDescription.gravity = Gravity.CENTER;
TableRow.LayoutParams rowParamsButton = new TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 0.3f);
TableRow.LayoutParams rowParamsButton = new TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 0.35f);
rowParamsDescription.setMargins(10,10,0,20);
rowParamsButton.setMargins(10,10,10,20);
@@ -195,7 +195,7 @@ public class SubscriptionsActivity extends BaseActivity{
String price = object.getString("price");
String title = object.getString("title");
purchaseMap.put(sku,object);
purchaseMap.put(sku, object);
TableRow tableRow = new TableRow(getApplicationContext());
@@ -223,7 +223,6 @@ public class SubscriptionsActivity extends BaseActivity{
tblBillings.addView(tableRow);
Log.d(TAG,"Product: "+sku+" Price: "+price);
}
hideDialog();
@@ -256,9 +255,8 @@ public class SubscriptionsActivity extends BaseActivity{
try {
JSONObject jo = new JSONObject(purchaseData);
String sku = jo.getString("productId");
String title = jo.getString("title");
showMessage(getResources().getString(R.string.txt_subs_youbought) +" "+ title + ". "+getResources().getString(R.string.txt_subs_thankyou));
showMessage(getResources().getString(R.string.txt_subs_youbought) + " " + purchaseMap.get(sku) + ". " + getResources().getString(R.string.txt_subs_thankyou));
addSubscription(purchaseMap.get(sku).getString("productId"),purchaseMap.get(sku).getString("type"),purchaseMap.get(sku).getString("price_amount_micros"),purchaseMap.get(sku).getString("price_currency_code"));
}
catch (JSONException e) {

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

@@ -19,7 +19,6 @@ import android.net.NetworkInfo;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.LayoutInflaterCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.format.DateUtils;
@@ -45,7 +44,6 @@ import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdRequest;
import com.google.android.gms.ads.InterstitialAd;
import com.mikepenz.google_material_typeface_library.GoogleMaterial;
import com.mikepenz.iconics.context.IconicsLayoutInflater;
import com.mikepenz.materialdrawer.AccountHeader;
import com.mikepenz.materialdrawer.AccountHeaderBuilder;
import com.mikepenz.materialdrawer.Drawer;
@@ -112,7 +110,6 @@ public abstract class BaseActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
LayoutInflaterCompat.setFactory(getLayoutInflater(), new IconicsLayoutInflater(getDelegate()));
super.onCreate(savedInstanceState);
setContentView(getLayoutResourceId());
@@ -150,7 +147,6 @@ public abstract class BaseActivity extends AppCompatActivity {
}
AppRater.app_launched(BaseActivity.this);
}
class LogoutReceiver extends BroadcastReceiver {
@@ -162,8 +158,8 @@ public abstract class BaseActivity extends AppCompatActivity {
}
@Override
protected void onPause(){
super.onPause();
protected void onDestroy(){
super.onDestroy();
unregisterBroadcastReceiver();
}
@@ -187,7 +183,6 @@ public abstract class BaseActivity extends AppCompatActivity {
unregisterReceiver(myReceiver);
}catch(final Exception e){
e.printStackTrace();
//no receiver registered - no problem
}
}

BIN
app/src/main/res/drawable-hdpi/header2.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
app/src/main/res/drawable/bg_withlogo_2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 336 KiB

After

Width:  |  Height:  |  Size: 195 KiB

BIN
app/src/main/res/drawable/dd_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 296 B

BIN
app/src/main/res/drawable/logo_riskahead.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
app/src/main/res/drawable/ra_qrcode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 27 KiB

2
app/src/main/res/layout/activity_login.xml
View File

@@ -79,8 +79,6 @@
android:layout_height="wrap_content"
android:text="@string/lbl_login_resendPW"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>

2
app/src/main/res/layout/activity_main.xml
View File

@@ -1,9 +1,7 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">

4
app/src/main/res/layout/activity_maps.xml
View File

@@ -2,7 +2,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
@@ -48,7 +47,4 @@
</RelativeLayout>
</RelativeLayout>

32
app/src/main/res/layout/activity_profile.xml
View File

@@ -1,7 +1,6 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
@@ -16,41 +15,40 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<LinearLayout
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:orientation="vertical">
<LinearLayout
<FrameLayout
android:id="@+id/layoutHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/toolbar"
android:layout_marginBottom="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_margin="5dp"
android:alpha="0.05"
android:layout_gravity="center_horizontal" />
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/toolbar"
android:background="?attr/colorPrimary"
android:elevation="6dp"
android:elevation="4dp"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tab_layout" />
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
</RelativeLayout>

24
app/src/main/res/layout/activity_report_wf.xml
View File

@@ -29,9 +29,18 @@
android:id="@+id/fragment_reportwf"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_gravity="center_horizontal" >
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_margin="5dp"
android:alpha="0.05"
android:layout_gravity="center_horizontal" />
</FrameLayout>
<LinearLayout
@@ -76,21 +85,12 @@
android:id="@+id/fab_reportwf_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_margin="12dp"
android:layout_above="@+id/layoutFooter"
android:layout_alignParentEnd="true"
android:clickable="true"
android:src="@android:drawable/ic_dialog_map" />
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentLeft="true"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_margin="5dp"
android:layout_gravity="center_horizontal" />
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atvStatus"
android:layout_width="wrap_content"
@@ -98,7 +98,7 @@
android:layout_above="@+id/layoutFooter"
android:layout_centerInParent="true"
android:padding="5dp"
android:textSize="40dp"
android:textSize="40sp"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o" />
</RelativeLayout>

10
app/src/main/res/layout/activity_settings.xml
View File

@@ -1,7 +1,6 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
@@ -23,6 +22,15 @@
android:layout_gravity="center_horizontal"
android:layout_below="@id/toolbar">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_margin="5dp"
android:alpha="0.05"
android:layout_gravity="center_horizontal" />
</FrameLayout>
</RelativeLayout>

20
app/src/main/res/layout/activity_subscriptions.xml
View File

@@ -1,7 +1,6 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
@@ -16,6 +15,7 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<LinearLayout
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
@@ -56,17 +56,19 @@
android:layout_marginBottom="10dp"
android:background="#464b4b4b" />
<TableLayout
android:id="@+id/tbl_billing"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/svlayoutContent"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TableLayout
android:id="@+id/tbl_billing"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</TableLayout>
</TableLayout>
</ScrollView>
</LinearLayout>

4
app/src/main/res/layout/fragment_profile_stats.xml
View File

@@ -7,13 +7,11 @@
android:layout_height="match_parent"
android:fillViewport="true"
android:padding="10dp"
android:background="@drawable/layout_bg_gradient"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true">
android:layout_height="wrap_content">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_membershiptype"

27
app/src/main/res/layout/fragment_reportwf_1.xml
View File

@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:fillViewport="true"
android:background="@drawable/layout_bg_gradient"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:orientation="vertical">
@@ -11,18 +8,10 @@
<RelativeLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/ll_01_01"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:layout_weight="1"
android:animateLayoutChanges="true"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_1_question"
@@ -37,7 +26,7 @@
<Spinner
android:id="@+id/dd_reportwf_1_cat_main"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -48,7 +37,7 @@
<Spinner
android:id="@+id/dd_reportwf_1_cat_sub"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -59,7 +48,7 @@
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:hint="@string/cat_hint"
android:maxLength="50"
android:id="@+id/txt_reportwf_1_cat_etc"
@@ -69,6 +58,7 @@
android:id="@+id/ll_pos"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:layout_centerHorizontal="true"
android:layout_below="@+id/txt_reportwf_1_cat_etc"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -91,13 +81,12 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/lbl_reportwf_position_detail"
android:layout_below="@+id/lbl_reportwf_1_question_2"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="20dp"
android:layout_marginBottom="50dp"/>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</ScrollView>

15
app/src/main/res/layout/fragment_reportwf_2.xml
View File

@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -13,16 +10,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_01_01"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_2_question"
@@ -57,6 +46,7 @@
<RelativeLayout
android:id="@+id/ll_report_from_time"
android:layout_width="match_parent"
android:layout_margin="15dp"
android:layout_height="wrap_content">
<TextView
@@ -104,6 +94,7 @@
<RelativeLayout
android:id="@+id/ll_report_to_time"
android:layout_width="match_parent"
android:layout_margin="15dp"
android:layout_height="wrap_content">
<TextView
@@ -148,6 +139,4 @@
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

17
app/src/main/res/layout/fragment_reportwf_3.xml
View File

@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -11,18 +8,10 @@
<LinearLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layoutSubContent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_3_question"
@@ -37,7 +26,6 @@
<Spinner
android:id="@+id/dd_reportwf_3_suspect"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -48,7 +36,6 @@
<Spinner
android:id="@+id/dd_reportwf_3_suspect_sub"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -60,11 +47,9 @@
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_3_suspect_etc"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</LinearLayout>
</ScrollView>

17
app/src/main/res/layout/fragment_reportwf_4.xml
View File

@@ -1,7 +1,4 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -10,19 +7,10 @@
<LinearLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layoutSubContent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_4_question"
android:layout_width="wrap_content"
@@ -36,7 +24,6 @@
<Spinner
android:id="@+id/dd_reportwf_4_weapon"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -48,11 +35,9 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:maxLength="50"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_4_weapon_etc"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</LinearLayout>
</ScrollView>

17
app/src/main/res/layout/fragment_reportwf_5.xml
View File

@@ -1,7 +1,4 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -10,18 +7,11 @@
<LinearLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layoutSubContent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_5_question"
@@ -36,7 +26,6 @@
<Spinner
android:id="@+id/dd_reportwf_5_count"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -48,11 +37,9 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:maxLength="50"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_5_count_etc"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</LinearLayout>
</ScrollView>

16
app/src/main/res/layout/fragment_reportwf_6.xml
View File

@@ -1,7 +1,4 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -10,19 +7,10 @@
<LinearLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layoutSubContent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_6_question"
android:layout_width="wrap_content"
@@ -36,7 +24,6 @@
<Spinner
android:id="@+id/dd_reportwf_6_victim"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -46,5 +33,4 @@
</LinearLayout>
</LinearLayout>
</ScrollView>

16
app/src/main/res/layout/fragment_reportwf_7.xml
View File

@@ -1,7 +1,4 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -10,18 +7,10 @@
<LinearLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layoutSubContent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_7_question"
@@ -37,7 +26,6 @@
<Spinner
android:id="@+id/dd_reportwf_7_victimorigin"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -49,11 +37,9 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:maxLength="50"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_7_victimorigin_etc"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</LinearLayout>
</ScrollView>

12
app/src/main/res/layout/fragment_reportwf_8.xml
View File

@@ -1,7 +1,4 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -10,7 +7,7 @@
<LinearLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">
@@ -45,7 +42,6 @@
<Spinner
android:id="@+id/dd_reportwf_8_suspectvehicle"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -57,7 +53,6 @@
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_8_suspectvehicle"
android:layout_gravity="center_horizontal" />
@@ -83,7 +78,6 @@
<Spinner
android:id="@+id/dd_reportwf_8_victimaff"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -95,7 +89,6 @@
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_8_victimaff"
android:layout_gravity="center_horizontal" />
@@ -121,7 +114,6 @@
<Spinner
android:id="@+id/dd_reportwf_8_recon"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -133,7 +125,6 @@
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_8_recon"
android:layout_gravity="center_horizontal" />
@@ -160,7 +151,6 @@
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_8_etc"
android:layout_gravity="center_horizontal"

14
app/src/main/res/layout/fragment_reportwf_finish.xml
View File

@@ -1,7 +1,4 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -9,7 +6,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
@@ -35,9 +32,8 @@
<LinearLayout
android:id="@+id/layoutMainContent2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:animateLayoutChanges="true"
android:textAlignment="center"
android:gravity="center"
android:orientation="vertical"
android:layout_weight="1">
@@ -53,23 +49,19 @@
android:textColor="@color/white" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutMainContent3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:textAlignment="center"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_final_thanks"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textAlignment="center"
android:layout_height="0dp"
android:gravity="center"
android:layout_margin="20dp"
android:text="@string/lbl_reportwf_finish_thx"

3
app/src/main/res/layout/fragment_top10list.xml
View File

@@ -1,16 +1,13 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:background="@drawable/layout_bg_gradient"
android:orientation="vertical">
<ListView
android:id="@+id/lv_top10list"
android:layout_below="@id/txt_profile_ranking"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_top10list_row.xml
View File

@@ -34,7 +34,7 @@
android:textColor="@color/text_light_grey"
android:id="@+id/txt_top10_name"
android:text="Member name"
android:textSize="16dp"
android:textSize="16sp"
android:typeface="serif" />
<TextView

8
app/src/main/res/values-de/strings.xml
View File

@@ -223,21 +223,21 @@
<string name="txt_share_page">Für mehr Details: www.riskahead.de</string>
<string name="txt_share_acttitle">Vorfall teilen…</string>
<string name="txt_viewreport_noinput">Keine Angaben</string>
<string name="txt_backpressed_msg">Drücke erneut Zurück um die RiskAhead zu schließen</string>
<string name="txt_backpressed_msg">Drücke erneut Zurück um RiskAhead zu schließen</string>
<string name="txt_notifystatus_txt">Benachrichtigungen: </string>
<string name="txt_notifystatus_activated">AN</string>
<string name="txt_notifystatus_activatedbutnotready">NICHT BEREIT (GPS FEHLT)</string>
<string name="txt_notifystatus_deactivated">AUS</string>
<string name="txt_map_zoomoutpremium">Hole dir die Premium-Mitgliedschaft um die ganze Karte zu sehen!</string>
<string name="txt_register_privacy">Bitte bestätige, dass du mit der Registrierung bei RiskAhead die <a href="http://www.riskahead.de">Datenschutzbestimmungen</a> und <a href="http://www.riskahead.de">Nutzungsbedingungen</a> gelesen hast und damit einverstanden bist.</string>
<string name="txt_register_privacy_text">Mit der Auswahl dieser Kontrollbox erkläre ich mich mit den Datenschutz- und Nutzungsbedingungen einverstanden</string>
<string name="txt_register_privacy">Bitte bestätige, dass du unsere <a href="http://www.riskahead.de">Datenschutzbestimmungen</a> und <a href="http://www.riskahead.de">Nutzungsbedingungen</a> gelesen hast und damit einverstanden bist.</string>
<string name="txt_register_privacy_text">Ich habe die Datenschutzbestimmungen und Nutzungsbedingungen zur Kenntnis genommen und stimme ihnen zu.</string>
<string name="txt_register_privacy_title">Deine Privatsphäre ist uns sehr wichtig</string>
<string name="txt_about_developedby">Entwickelt von</string>
<string name="txt_about_privacy">Datenschutzerklärung: <a href="http://www.riskahead.de/en/privacy/">http://www.riskahead.de/en/privacy/</a></string>
<string name="txt_about_terms">Nutzungsbedingungen: <a href="http://www.riskahead.de/en/terms/">http://www.riskahead.de/en/terms/</a></string>
<string name="txt_about_homepage">Website: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
<string name="txt_about_riskahead">RiskAhead for Android</string>
<string name="txt_about_riskahead">RiskAhead für Android</string>
<string name="menu_action_language">Sprache</string>
<string name="txt_language_title">Ändere Sprache</string>

8
app/src/main/res/values/strings.xml
View File

@@ -235,12 +235,12 @@
<string name="txt_notifystatus_activated">ON</string>
<string name="txt_notifystatus_activatedbutnotready">NOT READY (NO GPS)</string>
<string name="txt_notifystatus_deactivated">OFF</string>
<string name="txt_map_zoomoutpremium">Get Premiuim to view the Full Map!</string>
<string name="txt_map_zoomoutpremium">Get Premium to view the Full Map!</string>
<string name="txt_register_privacy">Please confirm that you have read our <a href="http://www.riskahead.de">Privacy Policy</a> and <a href="http://www.riskahead.de">Terms of Service</a> and you accept these by using RiskAhead.</string>
<string name="txt_register_privacy_text">By checking this checkbox I hereby confirm that I accept the terms of service and privacy policy</string>
<string name="txt_register_privacy">Please confirm that you have read and agree to our <a href="http://www.riskahead.de">Privacy Policy</a> and <a href="http://www.riskahead.de">Terms of Service</a></string>
<string name="txt_register_privacy_text">I have read the privacy policy and terms of service and confirm my agreement.</string>
<string name="txt_register_privacy_title">Your privacy is very important to us</string>
<string name="txt_about_developedby">Dveloped from</string>
<string name="txt_about_developedby">Developed from</string>
<string name="txt_about_privacy">Privacy Policy: <a href="http://www.riskahead.de/en/privacy/">http://www.riskahead.de/en/privacy/</a></string>
<string name="txt_about_terms">Terms of Service: <a href="http://www.riskahead.de/en/terms/">http://www.riskahead.de/en/terms/</a></string>
<string name="txt_about_homepage">Website: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>