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

DT @08.12.2015: Report-Workflow komplett überarbeitet -> noch in entwicklung!

Browse Source
This commit is contained in:
Dennis Thießen
2015-12-08 22:57:52 +01:00
parent e1dc4d624a
commit 6b6f3a8340
25 changed files with 1141 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/app.iml
View File

@@ -35,6 +35,7 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
@@ -73,7 +74,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/22.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.beardedhen/androidbootstrap/2.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.beardedhen/androidbootstrap/2.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.android/facebook-android-sdk/4.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.5.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.5.0/jars" />
@@ -99,6 +100,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.maps.android/android-maps-utils/0.3.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/twitter-core/1.4.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/fabric" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
@@ -116,8 +118,8 @@
<orderEntry type="library" exported="" name="play-services-appinvite-7.5.0" level="project" />
<orderEntry type="library" exported="" name="play-services-panorama-7.5.0" level="project" />
<orderEntry type="library" exported="" name="play-services-drive-7.5.0" level="project" />
<orderEntry type="library" exported="" name="androidbootstrap-2.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-gcm-7.5.0" level="project" />
<orderEntry type="library" exported="" name="androidbootstrap-2.0.1" level="project" />
<orderEntry type="library" exported="" name="retrofit-1.6.1" level="project" />
<orderEntry type="library" exported="" name="play-services-appindexing-7.5.0" level="project" />
<orderEntry type="library" exported="" name="library-1.0.19" level="project" />
@@ -127,6 +129,7 @@
<orderEntry type="library" exported="" name="fabric-1.3.4" level="project" />
<orderEntry type="library" exported="" name="play-services-plus-7.5.0" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-7.5.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="play-services-fitness-7.5.0" level="project" />
<orderEntry type="library" exported="" name="twitter-core-1.4.1" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-7.5.0" level="project" />
@@ -144,7 +147,6 @@
<orderEntry type="library" exported="" name="android-maps-utils-0.3.4" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-7.5.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-location-7.5.0" level="project" />
</component>
</module>

2
app/build.gradle
View File

@@ -40,7 +40,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.google.android.gms:play-services:7.5.0'
compile 'com.facebook.android:facebook-android-sdk:4.1.0'
compile 'com.beardedhen:androidbootstrap:2.0.0'
compile 'com.beardedhen:androidbootstrap:2.0.1'
compile 'com.mcxiaoke.volley:library:1.0.+'
compile('com.twitter.sdk.android:twitter-core:1.4.1@aar') {
transitive = true;

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.deke.risk.riskahead" >
package="org.deke.risk.riskahead">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -18,7 +18,7 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/CustomActionBarTheme" >
android:theme="@style/CustomActionBarTheme">
<!-- Google Maps Android API V2 requires OpenGL ES version 2 -->
<uses-feature
@@ -30,7 +30,8 @@
android:protectionLevel="signature" />
<!-- Google Maps Fragment API Key Data -->
<meta-data android:name="com.google.android.gms.version"
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<meta-data
android:name="com.google.android.maps.v2.API_KEY"
@@ -42,58 +43,52 @@
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />
<activity android:name="com.google.android.gms.ads.AdActivity"
<activity
android:name="com.google.android.gms.ads.AdActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:theme="@android:style/Theme.Translucent" />
<activity
android:name=".StartActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_start" >
android:label="@string/title_activity_start"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".LoginActivity"
android:screenOrientation="portrait"
android:label="@string/app_name"
android:parentActivityName=".StartActivity" >
android:parentActivityName=".StartActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".StartActivity" />
</activity>
<activity android:name="com.twitter.sdk.android.core.identity.OAuthActivity" />
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"
android:theme="@android:style/Theme.Translucent.NoTitleBar" >
</activity>
android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
<activity
android:name=".MainActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_entrance"
android:parentActivityName=".LoginActivity" >
</activity>
android:parentActivityName=".LoginActivity"
android:screenOrientation="portrait"></activity>
<activity
android:name=".MapsActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_maps"
android:parentActivityName=".MainActivity" >
android:parentActivityName=".MainActivity"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<meta-data
android:name="android.app.default_searchable"
android:value=".MapsActivity" />
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
@@ -106,43 +101,37 @@
<activity
android:name=".ProfileActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_user_config"
android:parentActivityName=".MainActivity" >
</activity>
android:parentActivityName=".MainActivity"
android:screenOrientation="portrait"></activity>
<activity
android:name=".ReportActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_report" >
</activity>
android:label="@string/title_activity_report"
android:screenOrientation="portrait"></activity>
<activity
android:name=".SettingsActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_settings" >
</activity>
android:label="@string/title_activity_settings"
android:screenOrientation="portrait"></activity>
<activity
android:name=".SubscriptionsActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_subscriptions" >
</activity>
android:label="@string/title_activity_subscriptions"
android:screenOrientation="portrait"></activity>
<activity
android:name=".ReportlistActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_reportlist"
android:parentActivityName=".ProfileActivity" >
android:parentActivityName=".ProfileActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ProfileActivity" />
</activity>
<activity
android:name=".ViewReportActivity"
android:screenOrientation="portrait"
android:label="@string/title_activity_view_report" >
</activity>
android:label="@string/title_activity_view_report"
android:screenOrientation="portrait"></activity>
<activity
android:name=".ReportWFActivity"
android:label="@string/title_activity_report_wf"></activity>
</application>
</manifest>

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

@@ -144,7 +144,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_login, menu);
getMenuInflater().inflate(R.menu.menu_common, menu);
return true;
}

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

@@ -324,6 +324,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_maps, menu);
getMenuInflater().inflate(R.menu.menu_common, menu);
SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
SearchView searchView = (SearchView) menu.findItem(R.id.location_search).getActionView();

102
app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java Normal file
View File

@@ -0,0 +1,102 @@
package org.deke.risk.riskahead;
import android.app.Fragment;
import android.app.FragmentTransaction;
import android.os.Bundle;
import android.view.Menu;
import android.view.View;
import com.beardedhen.androidbootstrap.BootstrapButton;
import org.deke.risk.riskahead.fragments.ReportWF_1_Fragment;
import org.deke.risk.riskahead.fragments.ReportWF_2_Fragment;
import org.deke.risk.riskahead.helper.BaseActivity;
import java.util.ArrayList;
import java.util.List;
public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragment.OnInputFinishedListener, ReportWF_2_Fragment.OnInputFinishedListener {
private final static String mActivityTitle = "Report NEW";
private final static String TAG = ReportWFActivity.class.getSimpleName();
List<Fragment> fragList = new ArrayList<Fragment>();
Fragment frag_report_1 = new ReportWF_1_Fragment();
Fragment frag_report_2 = new ReportWF_2_Fragment();
BootstrapButton btnContinue;
BootstrapButton btnReportNow;
private int currentState = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//setContentView(R.layout.activity_report_wf);
fragList.add(frag_report_1);
fragList.add(frag_report_2);
initFragment(currentState);
btnContinue = (BootstrapButton) findViewById(R.id.btn_reportwf_next);
btnContinue.setVisibility(View.INVISIBLE);
btnContinue.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
initFragment(currentState+1);
}
});
btnReportNow = (BootstrapButton) findViewById(R.id.btn_reportwf_reportnow);
btnReportNow.setVisibility(View.INVISIBLE);
}
private void initFragment(int state) {
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.replace(R.id.fragment_reportwf, fragList.get(state));
transaction.addToBackStack(null);
transaction.commit();
if(state > 1) btnReportNow.setVisibility(View.VISIBLE);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_reportwf, menu);
getMenuInflater().inflate(R.menu.menu_common, menu);
return true;
}
@Override
protected int getLayoutResourceId() {
return R.layout.activity_report_wf;
}
@Override
protected String getActivityName() {
return mActivityTitle;
}
@Override
public void onInputFinished(boolean finished) {
if(finished) {
btnContinue.setVisibility(View.VISIBLE);
}else{
btnContinue.setVisibility(View.INVISIBLE);
}
if(finished && (currentState == 1)){
btnReportNow.setVisibility(View.VISIBLE);
} else if (currentState > 1) {
btnReportNow.setVisibility(View.VISIBLE);
} else {
btnReportNow.setVisibility(View.INVISIBLE);
}
}
}

185
app/src/main/java/org/deke/risk/riskahead/fragments/ReportWF_1_Fragment.java Normal file
View File

@@ -0,0 +1,185 @@
package org.deke.risk.riskahead.fragments;
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.Spinner;
import com.beardedhen.androidbootstrap.AwesomeTextView;
import org.deke.risk.riskahead.R;
import org.deke.risk.riskahead.helper.HintAdapter;
/**
* Created by Dennis on 04.12.2015.
*/
public class ReportWF_1_Fragment extends Fragment{
private View mainview;
Spinner spinner_main_1;
Spinner spinner_sub_1;
OnInputFinishedListener mCallback;
public interface OnInputFinishedListener {
void onInputFinished(boolean finished);
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
mainview = inflater.inflate(R.layout.fragment_reportwf_1, container, false);
initSpinnerOneMain();
initSpinnerOneSub();
return mainview;
}
private void isFinished(boolean isFinished){
if(isFinished){
mainview.findViewById(R.id.atv_reportwf_1_finish).setVisibility(View.VISIBLE);
}else{
mainview.findViewById(R.id.atv_reportwf_1_finish).setVisibility(View.INVISIBLE);
}
mCallback.onInputFinished(isFinished);
}
private void initSpinnerOneMain() {
spinner_main_1 = (Spinner) mainview.findViewById(R.id.dd_reportwf_1_cat_main);
ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(getActivity(),
R.array.cat_situation_main, android.R.layout.simple_spinner_dropdown_item);
adapter_main_1.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner_main_1.setAdapter(new HintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, getActivity()));
spinner_main_1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
int stringid = 0;
switch (position) {
case 1:
stringid = R.array.cat_situation_sub_general;
break;
case 2:
stringid = R.array.cat_situation_sub_verbal;
break;
case 3:
stringid = R.array.cat_situation_sub_force;
break;
case 4:
stringid = R.array.cat_situation_sub_force_serious;
break;
case 5:
stringid = R.array.cat_situation_sub_nature;
break;
case 6:
stringid = R.array.cat_situation_sub_infrastructure;
break;
default:
stringid = R.array.cat_situation_sub_general;
break;
}
Spinner spinner_sub_1 = (Spinner) mainview.findViewById(R.id.dd_reportwf_1_cat_sub);
ArrayAdapter<CharSequence> adapter_sub_1 = ArrayAdapter.createFromResource(mainview.getContext(),
stringid, android.R.layout.simple_spinner_dropdown_item);
adapter_sub_1.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner_sub_1.setAdapter(new HintAdapter(adapter_sub_1, R.layout.contact_spinner_row_nothing_selected, getActivity()));
if (((HintAdapter) spinner_main_1.getAdapter()).isInInitialState()){
spinner_sub_1.setVisibility(View.INVISIBLE);
}else{
spinner_sub_1.setVisibility(View.VISIBLE);
}
isFinished(false);
}
@Override
public void onNothingSelected(AdapterView<?> parentView) {
// your code here
}
});
}
private void initSpinnerOneSub() {
spinner_sub_1 = (Spinner) mainview.findViewById(R.id.dd_reportwf_1_cat_sub);
spinner_sub_1.setVisibility(View.INVISIBLE);
spinner_sub_1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
int i = 99;
switch (((Spinner) mainview.findViewById(R.id.dd_reportwf_1_cat_main)).getSelectedItemPosition()) {
case 1:
i = 7;
break;
case 2:
i = 5;
break;
case 3:
i = 6;
break;
case 4:
i = 7;
break;
case 5:
i = 7;
break;
case 6:
i = 8;
break;
}
if (position == i) {
mainview.findViewById(R.id.txt_reportwf_1_cat_etc).setVisibility(View.VISIBLE);
} else {
mainview.findViewById(R.id.txt_reportwf_1_cat_etc).setVisibility(View.INVISIBLE);
}
if (((HintAdapter) spinner_sub_1.getAdapter()).isInInitialState()){
isFinished(false);
}else{
isFinished(true);
}
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
}
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
try {
mCallback = (OnInputFinishedListener) activity;
} catch (ClassCastException e) {
throw new ClassCastException(activity.toString()
+ " must implement OnInputFinishedListener");
}
}
@Override
public void onDetach() {
super.onDetach();
}
}

185
app/src/main/java/org/deke/risk/riskahead/fragments/ReportWF_2_Fragment.java Normal file
View File

@@ -0,0 +1,185 @@
package org.deke.risk.riskahead.fragments;
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.Spinner;
import android.widget.TextView;
import com.beardedhen.androidbootstrap.AwesomeTextView;
import org.deke.risk.riskahead.R;
import org.deke.risk.riskahead.helper.HintAdapter;
/**
* Created by Dennis on 08.12.2015.
*/
public class ReportWF_2_Fragment extends Fragment{
View mainview;
Spinner spinner_main_1;
Spinner spinner_sub_1;
OnInputFinishedListener mCallback;
public interface OnInputFinishedListener {
void onInputFinished(boolean finished);
}
private void isFinished(boolean isFinished){
if(isFinished){
mainview.findViewById(R.id.atv_reportwf_2_finish).setVisibility(View.VISIBLE);
}else{
mainview.findViewById(R.id.atv_reportwf_2_finish).setVisibility(View.INVISIBLE);
}
mCallback.onInputFinished(isFinished);
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
mainview = inflater.inflate(R.layout.fragment_reportwf_2, container, false);
initSpinnerOneMain();
initSpinnerOneSub();
initLayoutFromTime();
initLayoutToTime();
return mainview;
}
private void initLayoutToTime() {
RelativeLayout rlFromTime = (RelativeLayout) mainview.findViewById(R.id.ll_report_to_time);
rlFromTime.setVisibility(View.INVISIBLE);
}
private void initLayoutFromTime() {
RelativeLayout rlFromTime = (RelativeLayout) mainview.findViewById(R.id.ll_report_from_time);
rlFromTime.setVisibility(View.INVISIBLE);
}
private void initSpinnerOneSub() {
spinner_sub_1 = (Spinner) mainview.findViewById(R.id.dd_reportwf_2_time_sub);
spinner_sub_1.setVisibility(View.INVISIBLE);
spinner_sub_1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
if(((HintAdapter) spinner_sub_1.getAdapter()).isInInitialState()){
isFinished(false);
} else {
isFinished(true);
}
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
}
private void initSpinnerOneMain() {
spinner_main_1 = (Spinner) mainview.findViewById(R.id.dd_reportwf_2_time_main);
ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(getActivity(),
R.array.cat_time_main, android.R.layout.simple_spinner_dropdown_item);
adapter_main_1.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner_main_1.setAdapter(new HintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, getActivity()));
spinner_main_1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
int stringid = 0;
switch (position) {
case 1:
mainview.findViewById(R.id.ll_report_from_time).setVisibility(View.INVISIBLE);
mainview.findViewById(R.id.ll_report_to_time).setVisibility(View.INVISIBLE);
mainview.findViewById(R.id.dd_reportwf_2_time_sub).setVisibility(View.INVISIBLE);
isFinished(true);
break;
case 2:
mainview.findViewById(R.id.ll_report_from_time).setVisibility(View.INVISIBLE);
mainview.findViewById(R.id.ll_report_to_time).setVisibility(View.INVISIBLE);
stringid = R.array.cat_time_sub_periodical;
break;
case 3:
mainview.findViewById(R.id.ll_report_from_time).setVisibility(View.VISIBLE);
mainview.findViewById(R.id.ll_report_to_time).setVisibility(View.INVISIBLE);
mainview.findViewById(R.id.dd_reportwf_2_time_sub).setVisibility(View.INVISIBLE);
break;
case 4:
mainview.findViewById(R.id.ll_report_from_time).setVisibility(View.VISIBLE);
mainview.findViewById(R.id.ll_report_to_time).setVisibility(View.VISIBLE);
mainview.findViewById(R.id.dd_reportwf_2_time_sub).setVisibility(View.INVISIBLE);
break;
case 5:
mainview.findViewById(R.id.ll_report_from_time).setVisibility(View.INVISIBLE);
mainview.findViewById(R.id.ll_report_to_time).setVisibility(View.INVISIBLE);
mainview.findViewById(R.id.dd_reportwf_2_time_sub).setVisibility(View.INVISIBLE);
isFinished(true);
break;
default:
mainview.findViewById(R.id.ll_report_from_time).setVisibility(View.INVISIBLE);
mainview.findViewById(R.id.ll_report_to_time).setVisibility(View.INVISIBLE);
mainview.findViewById(R.id.dd_reportwf_2_time_sub).setVisibility(View.INVISIBLE);
isFinished(false);
break;
}
if(!((HintAdapter) spinner_main_1.getAdapter()).isInInitialState() && stringid != 0) {
ArrayAdapter<CharSequence> adapter_sub_1 = ArrayAdapter.createFromResource(mainview.getContext(),
stringid, android.R.layout.simple_spinner_dropdown_item);
adapter_sub_1.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner_sub_1.setAdapter(new HintAdapter(adapter_sub_1, R.layout.contact_spinner_row_nothing_selected, getActivity()));
spinner_sub_1.setVisibility(View.VISIBLE);
} else if(stringid == 0) {
spinner_sub_1.setVisibility(View.INVISIBLE);
}
if(((HintAdapter) spinner_main_1.getAdapter()).isInInitialState()){
isFinished(false);
}
}
@Override
public void onNothingSelected(AdapterView<?> parentView) {
// your code here
}
});
}
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
try {
mCallback = (OnInputFinishedListener) activity;
} catch (ClassCastException e) {
throw new ClassCastException(activity.toString()
+ " must implement OnInputFinishedListener");
}
}
@Override
public void onDetach() {
super.onDetach();
}
}

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

@@ -34,6 +34,7 @@ import org.deke.risk.riskahead.MapsActivity;
import org.deke.risk.riskahead.R;
import org.deke.risk.riskahead.ReportActivity;
import org.deke.risk.riskahead.ProfileActivity;
import org.deke.risk.riskahead.ReportWFActivity;
import org.deke.risk.riskahead.ReportlistActivity;
import org.deke.risk.riskahead.SettingsActivity;
import org.deke.risk.riskahead.SubscriptionsActivity;
@@ -126,8 +127,9 @@ public abstract class BaseActivity extends AppCompatActivity {
}
public void showAd(){
// TODO: 03.12.2015 activate when needed
if (mInterstitialAd.isLoaded()) {
mInterstitialAd.show();
// mInterstitialAd.show();
}
}
@@ -175,8 +177,6 @@ public abstract class BaseActivity extends AppCompatActivity {
setShareIntent();
*/
getMenuInflater().inflate(R.menu.menu_login, menu);
return true;
}
@@ -254,13 +254,7 @@ public abstract class BaseActivity extends AppCompatActivity {
public void gotoReportActivity(){
Intent intent;
intent = new Intent(getApplicationContext(), ReportActivity.class);
startActivity(intent);
}
public void gotoReportlistActivity(){
Intent intent;
intent = new Intent(getApplicationContext(), ReportlistActivity.class);
intent = new Intent(getApplicationContext(), ReportWFActivity.class);
startActivity(intent);
}
@@ -271,6 +265,12 @@ public abstract class BaseActivity extends AppCompatActivity {
startActivity(intent);
}
public void gotoReportlistActivity(){
Intent intent;
intent = new Intent(getApplicationContext(), ReportlistActivity.class);
startActivity(intent);
}
public void gotoMapActivity(){
Intent intent;
intent = new Intent(getApplicationContext(), MapsActivity.class);

171
app/src/main/java/org/deke/risk/riskahead/helper/HintAdapter.java Normal file
View File

@@ -0,0 +1,171 @@
package org.deke.risk.riskahead.helper;
/**
* Created by Dennis on 06.12.2015.
*/
import android.content.Context;
import android.database.DataSetObserver;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ListAdapter;
import android.widget.SpinnerAdapter;
/**
* Decorator Adapter to allow a Spinner to show a 'Nothing Selected...' initially
* displayed instead of the first choice in the Adapter.
*/
public class HintAdapter implements SpinnerAdapter, ListAdapter {
protected static final int EXTRA = 1;
protected SpinnerAdapter adapter;
protected Context context;
protected int nothingSelectedLayout;
protected int nothingSelectedDropdownLayout;
protected LayoutInflater layoutInflater;
private boolean isInInitialState = false;
/**
* Use this constructor to have NO 'Select One...' item, instead use
* the standard prompt or nothing at all.
* @param spinnerAdapter wrapped Adapter.
* @param nothingSelectedLayout layout for nothing selected, perhaps
* you want text grayed out like a prompt...
* @param context
*/
public HintAdapter(
SpinnerAdapter spinnerAdapter,
int nothingSelectedLayout, Context context) {
this(spinnerAdapter, nothingSelectedLayout, -1, context);
}
/**
* Use this constructor to Define your 'Select One...' layout as the first
* row in the returned choices.
* If you do this, you probably don't want a prompt on your spinner or it'll
* have two 'Select' rows.
* @param spinnerAdapter wrapped Adapter. Should probably return false for isEnabled(0)
* @param nothingSelectedLayout layout for nothing selected, perhaps you want
* text grayed out like a prompt...
* @param nothingSelectedDropdownLayout layout for your 'Select an Item...' in
* the dropdown.
* @param context
*/
public HintAdapter(SpinnerAdapter spinnerAdapter, int nothingSelectedLayout, int nothingSelectedDropdownLayout, Context context) {
this.adapter = spinnerAdapter;
this.context = context;
this.nothingSelectedLayout = nothingSelectedLayout;
this.nothingSelectedDropdownLayout = nothingSelectedDropdownLayout;
layoutInflater = LayoutInflater.from(context);
}
@Override
public final View getView(int position, View convertView, ViewGroup parent) {
// This provides the View for the Selected Item in the Spinner, not
// the dropdown (unless dropdownView is not set).
if (position == 0) {
isInInitialState = true;
return getNothingSelectedView(parent);
}
isInInitialState = false;
return adapter.getView(position - EXTRA, null, parent); // Could re-use
// the convertView if possible.
}
/**
* View to show in Spinner with Nothing Selected
* Override this to do something dynamic... e.g. "37 Options Found"
* @param parent
* @return
*/
protected View getNothingSelectedView(ViewGroup parent) {
return layoutInflater.inflate(nothingSelectedLayout, parent, false);
}
@Override
public View getDropDownView(int position, View convertView, ViewGroup parent) {
// Android BUG! http://code.google.com/p/android/issues/detail?id=17128 -
// Spinner does not support multiple view types
if (position == 0) {
return nothingSelectedDropdownLayout == -1 ?
new View(context) :
getNothingSelectedDropdownView(parent);
}
// Could re-use the convertView if possible, use setTag...
return adapter.getDropDownView(position - EXTRA, null, parent);
}
/**
* Override this to do something dynamic... For example, "Pick your favorite
* of these 37".
* @param parent
* @return
*/
protected View getNothingSelectedDropdownView(ViewGroup parent) {
return layoutInflater.inflate(nothingSelectedDropdownLayout, parent, false);
}
@Override
public int getCount() {
int count = adapter.getCount();
return count == 0 ? 0 : count + EXTRA;
}
@Override
public Object getItem(int position) {
return position == 0 ? null : adapter.getItem(position - EXTRA);
}
@Override
public int getItemViewType(int position) {
return 0;
}
@Override
public int getViewTypeCount() {
return 1;
}
@Override
public long getItemId(int position) {
return position >= EXTRA ? adapter.getItemId(position - EXTRA) : position - EXTRA;
}
@Override
public boolean hasStableIds() {
return adapter.hasStableIds();
}
@Override
public boolean isEmpty() {
return adapter.isEmpty();
}
@Override
public void registerDataSetObserver(DataSetObserver observer) {
adapter.registerDataSetObserver(observer);
}
@Override
public void unregisterDataSetObserver(DataSetObserver observer) {
adapter.unregisterDataSetObserver(observer);
}
public boolean isInInitialState(){
return isInInitialState;
}
@Override
public boolean areAllItemsEnabled() {
return false;
}
@Override
public boolean isEnabled(int position) {
return position != 0; // Don't allow the 'nothing selected'
// item to be picked.
}
}

12
app/src/main/res/drawable/layout_bg_gradient.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<gradient
android:angle="90"
android:startColor="#d9d9d9"
android:endColor="#f2f2f2"
android:type="linear" />
</shape>
</item>
</selector>

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

@@ -2,8 +2,9 @@
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"
style="@style/CustomActionBarTheme"
android:id="@+id/drawer_layout"
android:background="@color/bg_common_2"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
@@ -37,8 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
android:layout_centerHorizontal="true"
android:textSize="40dp" />
android:textSize="40sp" />
<TextView
android:id="@+id/lbl_main_txt2"
@@ -47,8 +47,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="34dp"
android:textColor="#aa999999"
android:layout_centerHorizontal="true" />
android:textColor="#aa999999"/>
</LinearLayout>
@@ -70,20 +69,22 @@
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
bootstrap:bootstrapText="@string/btn_main_report"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true" />
bootstrap:roundedCorners="true"
android:layout_gravity="center_vertical" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_main_viewmap"
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
bootstrap:bootstrapText="@string/btn_main_viewmap"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"/>
bootstrap:roundedCorners="true"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

5
app/src/main/res/layout/activity_report.xml
View File

@@ -35,8 +35,6 @@
android:layout_alignLeft="@+id/input_report_short"
android:layout_alignStart="@+id/input_report_short"/>
<EditText
android:id="@+id/input_report_short"
android:hint="@string/input_report_short_hint"
@@ -189,8 +187,7 @@
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

69
app/src/main/res/layout/activity_report_wf.xml Normal file
View File

@@ -0,0 +1,69 @@
<android.support.v4.widget.DrawerLayout
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/drawer_layout"
android:background="@color/bg_common_2"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/linearLayout1"
android:animateLayoutChanges="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/rl_main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/fragment_reportwf"
android:layout_gravity="center_horizontal"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_marginBottom="0dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_reportwf_reportnow"
bootstrap:bootstrapText="Report NOW!"
android:layout_width="0dp"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="danger"
android:layout_weight="1" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_reportwf_next"
bootstrap:bootstrapText="Continue"
android:layout_height="wrap_content"
android:layout_width="0dp"
bootstrap:bootstrapBrand="success"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff"/>
</android.support.v4.widget.DrawerLayout>

14
app/src/main/res/layout/contact_spinner_row_nothing_selected.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="?android:attr/spinnerItemStyle"
android:layout_width="300dp"
android:layout_height="50dp"
android:maxLength="30"
android:gravity="left|center"
android:layout_margin="5dp"
android:background="@drawable/dropdown_2"
android:textSize="18sp"
android:textColor="#808080"
android:text="Please select..." />

68
app/src/main/res/layout/fragment_reportwf_1.xml Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:padding="0dip"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout android:id="@+id/menu_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:animateLayoutChanges="true">
<TextView
android:id="@+id/lbl_reportwf_1_question"
android:layout_centerHorizontal="true"
android:text="What happened?"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_margin="20dp"
android:textColor="@color/bg_common" />
<Spinner
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_margin="5dp"
android:maxLength="10"
android:background="@drawable/dropbox_2"
android:id="@+id/dd_reportwf_1_cat_main"
android:spinnerMode="dialog"
android:prompt="@string/lbl_spinner_choose"
android:layout_below="@id/lbl_reportwf_1_question"/>
<Spinner
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_margin="5dp"
android:maxLength="10"
android:background="@drawable/dropbox_2"
android:id="@+id/dd_reportwf_1_cat_sub"
android:spinnerMode="dropdown"
android:layout_below="@id/dd_reportwf_1_cat_main"/>
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:visibility="invisible"
android:hint="Please enter your info here"
android:id="@+id/txt_reportwf_1_cat_etc"
android:layout_below="@id/dd_reportwf_1_cat_sub"/>
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atv_reportwf_1_finish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="80dp"
android:visibility="invisible"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o"
android:layout_alignTop="@+id/txt_reportwf_1_cat_etc"
android:layout_centerHorizontal="true"
android:layout_marginTop="19dp" />
</RelativeLayout>
</ScrollView>

148
app/src/main/res/layout/fragment_reportwf_2.xml Normal file
View File

@@ -0,0 +1,148 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout android:id="@+id/menu_ll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:padding="5dp"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_2_question"
android:text="When did it happen?"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_margin="20dp"
android:textColor="@color/bg_common"
android:layout_gravity="center_horizontal" />
<Spinner
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_margin="5dp"
android:background="@drawable/dropdown_2"
android:id="@+id/dd_reportwf_2_time_main"
android:layout_gravity="center_horizontal" />
<Spinner
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_margin="5dp"
android:background="@drawable/dropdown_2"
android:id="@+id/dd_reportwf_2_time_sub"
android:layout_gravity="center_horizontal" />
<RelativeLayout
android:id="@+id/ll_report_from_time"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/lbl_report_from_date"
android:text="@string/lbl_report_from_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/dd_report_category" />
<TextView
android:id="@+id/lbl_report_from_time"
android:text="@string/lbl_report_from_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/input_report_from_time"
android:layout_alignLeft="@+id/input_report_from_time"
android:layout_alignStart="@+id/input_report_from_time"/>
<EditText
android:id="@+id/input_report_from_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:layout_marginRight="5dp"
android:ems="10"
android:layout_below="@+id/lbl_report_from_date"
android:layout_alignLeft="@+id/lbl_report_from_date"
android:layout_alignStart="@+id/lbl_report_from_date"
android:focusable="false"/>
<EditText
android:id="@+id/input_report_from_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="time"
android:ems="10"
android:layout_alignBottom="@+id/input_report_from_date"
android:layout_toRightOf="@+id/input_report_from_date"
android:layout_toEndOf="@+id/input_report_from_date"
android:focusable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/ll_report_to_time"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/lbl_report_to_date"
android:text="@string/lbl_report_to_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/dd_report_category" />
<TextView
android:id="@+id/lbl_report_to_time"
android:text="@string/lbl_report_to_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/input_report_to_time"
android:layout_alignLeft="@+id/input_report_to_time"
android:layout_alignStart="@+id/input_report_to_time"/>
<EditText
android:id="@+id/input_report_to_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:layout_marginRight="5dp"
android:ems="10"
android:layout_below="@+id/lbl_report_to_date"
android:layout_alignLeft="@+id/lbl_report_to_date"
android:layout_alignStart="@+id/lbl_report_to_date"
android:focusable="false"/>
<EditText
android:id="@+id/input_report_to_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="time"
android:ems="10"
android:layout_alignBottom="@+id/input_report_to_date"
android:layout_toRightOf="@+id/input_report_to_date"
android:layout_toEndOf="@+id/input_report_to_date"
android:focusable="false"/>
</RelativeLayout>
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atv_reportwf_2_finish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="80dp"
android:visibility="invisible"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</ScrollView>

13
app/src/main/res/layout/map_info_window.xml
View File

@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="200dp"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:background="@drawable/layout_bg">
android:padding="1dp"
android:background="#CCc9c9c9">
<LinearLayout
android:orientation="horizontal"
android:id="@+id/lay_infowindow_color"
android:background="#e45151"
android:layout_width="5dp"
android:layout_marginRight="3dp"
android:layout_height="match_parent">
</LinearLayout>
@@ -28,6 +27,7 @@
android:id="@+id/txt_infowindow_title"
android:text="Header"
android:textSize="16dp"
android:paddingLeft="5dp"
android:typeface="serif" />
<TextView
@@ -35,6 +35,7 @@
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Long Text"
android:paddingLeft="5dp"
android:id="@+id/txt_infowindow_description"
android:typeface="serif" />
@@ -43,7 +44,7 @@
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Category"
android:paddingLeft="5dp"
android:paddingBottom="10dp"
android:id="@+id/txt_infowindow_category"
android:typeface="serif" />
@@ -53,7 +54,7 @@
android:id="@+id/lay_infowindow_2"
android:background="#55151515"
android:layout_width="match_parent"
android:layout_marginRight="5dp"
android:padding="3dp"
android:layout_height="match_parent">
<TextView

12
app/src/main/res/menu/menu_common.xml
View File

@@ -1,10 +1,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:omgandroid="http://schemas.android.com/apk/res-auto">
<!-- <item
android:id="@+id/menu_item_share"
android:title="Share"
omgandroid:showAsAction="ifRoom"
omgandroid:actionProviderClass= "android.support.v7.widget.ShareActionProvider" />-->
<item android:id="@+id/menu_action_about" android:title="@string/menu_action_about"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_help" android:title="@string/menu_action_help"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_exit" android:title="@string/menu_action_exit"
android:orderInCategory="100" app:showAsAction="never" />
</menu>

12
app/src/main/res/menu/menu_login.xml
View File

@@ -1,12 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" tools:context=".LoginActivity">
<item android:id="@+id/menu_action_about" android:title="@string/menu_action_about"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_help" android:title="@string/menu_action_help"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_exit" android:title="@string/menu_action_exit"
android:orderInCategory="100" app:showAsAction="never" />
</menu>

8
app/src/main/res/menu/menu_maps.xml
View File

@@ -5,16 +5,12 @@
<item android:id="@+id/menu_action_refresh" android:title="@string/menu_action_refresh"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_about" android:title="@string/menu_action_about"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_help" android:title="@string/menu_action_help"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_exit" android:title="@string/menu_action_exit"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/location_search"
android:title="Search"
android:icon="@android:drawable/ic_menu_search"
app:showAsAction="always"
app:actionViewClass="android.support.v7.widget.SearchView" />
</menu>

15
app/src/main/res/menu/menu_reportwf.xml Normal file
View File

@@ -0,0 +1,15 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<item android:id="@+id/btn_reportwf_new"
android:title="New Report"
android:icon="@drawable/ic_action_reply_all"
app:showAsAction="always"/>
<item android:id="@+id/btn_reportwf_back"
android:title="New Report"
android:icon="@drawable/ic_action_reply"
app:showAsAction="always"/>
</menu>

4
app/src/main/res/values/colors.xml
View File

@@ -2,13 +2,13 @@
<color name="bg_login">#26ae90</color>
<color name="bg_register">#2e3237</color>
<color name="bg_common_2">#e1e1e1</color>
<color name="bg_common_2">#ececec</color>
<color name="bg_common">#0461A8</color>
<color name="white">#ffffff</color>
<color name="title">#ffffff</color>
<color name="red">#ff0000</color>
<color name="my_awesome_red">#ff4400</color>
<color name="my_awesome_darker_red">#03518c</color>
<color name="dark_red">#03518c</color>
<color name="input_login">#222222</color>
<color name="input_login_hint">#999999</color>
<color name="input_register">#888888</color>

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

@@ -117,5 +117,97 @@
<string name="progress_getdata_title">Retrieve data from server</string>
<string name="lbl_mapsinfowindow_author">Author</string>
<string name="lbl_mapsinfowindow_score">Score</string>
<string name="title_activity_report_wf">Report NEW</string>
<string name="lbl_spinner_choose">Please choose...</string>
<string name="lbl_report_from_date">From date (yyyy-MM-dd)</string>
<string name="lbl_report_from_time">From time</string>
<string name="lbl_report_to_date">To date (yyyy-MM-dd)</string>
<string name="lbl_report_to_time">To time</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
<item>Mündliche Gewalt</item>
<item>Leichte bis schwere körperliche Gewalt</item>
<item>Lebensgefährliche Gewalt</item>
<item>Naturkatastrophe</item>
<item>Menschliche Katastrophe &amp; Infrastruktur</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Diebstahl, Betrug</item>
<item>Drogen in Getränk/Speise, Drogenmissbrauch</item>
<item>Demonstration, Unruhen, Straßenblockade</item>
<item>Checkpoint, Kontrollen</item>
<item>Korruption, Erpressung, Schutzgeld</item>
<item>Einflussgebiet Kriminalität, Milizen, Terroristen</item>
<item>Sonstiges...</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Sexuelle Belästigung</item>
<item>Beleidigung, Drohung</item>
<item>Vernehmung/Befragung öffentlich</item>
<item>Aufhetzung</item>
<item>Sonstiges...</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Sexueller Übergriff</item>
<item>Angriff auf Person allgemein</item>
<item>Schlägerei</item>
<item>Festnahme/Gefangennahme </item>
<item>Zwangsarbeit</item>
<item>Sonstiges...</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Vergewaltigung</item>
<item>Folter, Entführung, Geiselnahme</item>
<item>Schießerei</item>
<item>Explosion, Selbstmordattentat</item>
<item>Mord, Tötung, Hinrichtung</item>
<item>Leichenzurschaustellung zur Abschreckung</item>
<item>Sonstiges...</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Temperaturextrem</item>
<item>Wind, Sturm, Orkan, Tornado</item>
<item>Überschwemmung/-flutung</item>
<item>Erdbeben, Berghang Einsturz</item>
<item>Feuer, Rauch-, Aschewolken, Vulkanausbruch</item>
<item>Hungersnot, Tierplage</item>
<item>Sonstiges...</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Smog Stadt</item>
<item>Stromausfall, Unfall</item>
<item>Zerstörung, Einsturzgefahr Gebäude</item>
<item>Brandkatastrophe</item>
<item>Chemiekatastrophe, Ölpest</item>
<item>Seuche, Krankheit</item>
<item>Chaos Bevölkerung</item>
<item>Sonstiges...</item>
</string-array>
<string-array name="cat_time_main">
<item>Jetzt!</item>
<item>Regelmäßig</item>
<item>Bestimmter Zeitpunkt</item>
<item>Bestimmter Zeitraum</item>
<item>Weiß ich nicht</item>
</string-array>
<string-array name="cat_time_sub_periodical">
<item>Vormittags</item>
<item>Tagsüber</item>
<item>Abends</item>
<item>Nachts</item>
</string-array>
</resources>

6
app/src/main/res/values/styles.xml
View File

@@ -1,9 +1,4 @@
<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- <item name="android:background" tools:ignore="NewApi">@color/red</item>-->
<!-- <item name="background">@color/red</item>-->
</style>
<style name="wrapping_button">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
@@ -14,7 +9,6 @@
<item name="android:actionBarStyle" tools:ignore="NewApi">@style/MyActionBar</item>
<item name="actionBarStyle">@style/MyActionBar</item>
<item name="actionBarTheme">@style/MyActionBarTheme</item>
<item name="colorPrimaryDark">@color/my_awesome_darker_red</item>
</style>
<style name="MyActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">