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

DT @17.09.2015: User Profile in User Config und User Profile unterteilt. Menu angepasst.

Browse Source
This commit is contained in:
Dennis Thießen
2015-09-17 21:06:15 +02:00
parent ea1ae90b3f
commit d4230ba969
19 changed files with 211 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,11 +125,12 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
if((id == R.id.menu_action_exit)){
finish();
System.exit(0);
}
return super.onOptionsItemSelected(item);
return super.onOptionsItemSelected(item);
}
@Override
@@ -268,7 +269,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
@Override
protected Map<String, String> getParams() {
// Posting params to register url
Map<String, String> params = new HashMap<String, String>();
Map<String, String> params = new HashMap<>();
params.put("tag", "sociallogin");
params.put("key", key);
params.put("providerType", providerType);
@@ -368,7 +369,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
@Override
protected Map<String, String> getParams() {
// Posting parameters to login url
Map<String, String> params = new HashMap<String, String>();
Map<String, String> params = new HashMap<>();
params.put("tag", "login");
params.put("email", email);
params.put("password", password);
@@ -436,7 +437,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
@Override
protected Map<String, String> getParams() {
// Posting params to register url
Map<String, String> params = new HashMap<String, String>();
Map<String, String> params = new HashMap<>();
params.put("tag", "register");
params.put("username", username);
params.put("email", email);
@@ -507,12 +508,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
try {
JSONObject jObj = new JSONObject(response);
boolean error = jObj.getBoolean("error");
if (!error) {
// do nothing actually
} else {
// Error occurred in registration. Get the error
// message
if (error) {
// Error occurred in registration. Get the error message
String errorMsg = jObj.getString("error_msg");
Toast.makeText(getApplicationContext(),
errorMsg, Toast.LENGTH_LONG).show();
@@ -536,7 +533,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
@Override
protected Map<String, String> getParams() {
// Posting params to register url
Map<String, String> params = new HashMap<String, String>();
Map<String, String> params = new HashMap<>();
params.put("tag", "resendactivationusermail");
params.put("email", email);

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

@@ -17,7 +17,6 @@ import com.android.volley.toolbox.StringRequest;
import org.deke.risk.riskahead.helper.AppConfig;
import org.deke.risk.riskahead.helper.AppController;
import org.deke.risk.riskahead.helper.BaseActivity;
import org.deke.risk.riskahead.helper.SQLiteHandler;
import org.json.JSONException;
import org.json.JSONObject;
@@ -34,7 +33,6 @@ public class MainActivity extends BaseActivity{
public static FragmentManager fragmentManager;
Handler mHandler = new Handler();
private SQLiteHandler db;
private final static int INTERVAL = 1000 * 10; //10 seconds
private TextView incidentCount;
@@ -47,8 +45,6 @@ public class MainActivity extends BaseActivity{
msg_input = intent.getStringExtra(MainActivity.EXTRA_MESSAGE);
fragmentManager = getSupportFragmentManager();
db = new SQLiteHandler(getApplicationContext());
incidentCount = (TextView) findViewById(R.id.txt_main_incidents);
findViewById(R.id.btn_main_report).setOnClickListener(new View.OnClickListener() {
@@ -146,7 +142,7 @@ public class MainActivity extends BaseActivity{
@Override
protected Map<String, String> getParams() {
// Posting params to register url
Map<String, String> params = new HashMap<String, String>();
Map<String, String> params = new HashMap<>();
params.put("tag", "getincidentcount");
params.put("email", email);

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

@@ -31,6 +31,17 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
private static GoogleMap mMap;
private LatLng myLocation;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.frag_maps_map)).getMap();
mMap.getUiSettings().setZoomControlsEnabled(true);
handleIntent(getIntent());
setUpMap();
}
private void handleIntent(Intent intent){
if(Intent.ACTION_SEARCH.equals(intent.getAction()))
{
@@ -63,7 +74,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
private void showLocations(Cursor c){
MarkerOptions markerOptions = null;
MarkerOptions markerOptions;
LatLng position = null;
mMap.clear();
while(c.moveToNext()){
@@ -105,16 +116,6 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
showLocations(c);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.frag_maps_map)).getMap();
mMap.setMyLocationEnabled(true);
mMap.getUiSettings().setZoomControlsEnabled(true);
handleIntent(getIntent());
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_maps, menu);

34
app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java
View File

@@ -3,54 +3,22 @@ package org.deke.risk.riskahead;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import com.beardedhen.androidbootstrap.BootstrapButton;
import org.deke.risk.riskahead.helper.BaseActivity;
import org.deke.risk.riskahead.helper.SQLiteHandler;
import java.util.HashMap;
public class ProfileActivity extends BaseActivity {
private final static String mActivityTitle = "User Profile";
private final static String TAG = ProfileActivity.class.getSimpleName();
private TextView txtName;
private TextView txtEmail;
private BootstrapButton btnLogout;
private SQLiteHandler db;
public HashMap<String, String> user;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
txtName = (TextView) findViewById(R.id.txt_profile_name);
txtEmail = (TextView) findViewById(R.id.txt_profile_email);
btnLogout = (BootstrapButton) findViewById(R.id.btn_profile_logout);
btnLogout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
logoutUser();
}
});
db = new SQLiteHandler(getApplicationContext());
user = db.getUserDetails();
txtName.setText(user.get("username"));
txtEmail.setText(user.get("email"));
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_profile, menu);
getMenuInflater().inflate(R.menu.menu_common, menu);
return true;
}

23
app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java
View File

@@ -1,18 +1,37 @@
package org.deke.risk.riskahead;
import android.os.Bundle;
import android.widget.TextView;
import org.deke.risk.riskahead.helper.BaseActivity;
public class SettingsActivity extends BaseActivity {
private final static String mActivityTitle = "Settings";
private final static String mActivityTitle = "Account Settings";
private final static String TAG = SettingsActivity.class.getSimpleName();
private TextView txtUsername;
private TextView txtSurname;
private TextView txtName;
private TextView txtEmail;
private TextView txtPassword;
private TextView txtPassword2;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
txtUsername = (TextView) findViewById(R.id.txt_settings_username);
txtName = (TextView) findViewById(R.id.txt_settings_name);
txtSurname = (TextView) findViewById(R.id.txt_settings_surname);
txtEmail = (TextView) findViewById(R.id.txt_settings_email);
txtPassword = (TextView) findViewById(R.id.txt_settings_password);
txtPassword2 = (TextView) findViewById(R.id.txt_settings_retype_password);
txtUsername.setText(user.get("username"));
txtName.setText(user.get("name"));
txtSurname.setText(user.get("surname"));
txtEmail.setText(user.get("email"));
}
@Override

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

@@ -48,7 +48,7 @@ public class StartActivity extends AppCompatActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_start, menu);
getMenuInflater().inflate(R.menu.menu_common, menu);
return true;
}

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

@@ -12,7 +12,6 @@ public class AppController extends Application {
public static final String TAG = AppController.class.getSimpleName();
private RequestQueue mRequestQueue;
private static AppController mInstance;
@Override

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

@@ -38,9 +38,8 @@ public abstract class BaseActivity extends AppCompatActivity {
private ArrayAdapter<String> mAdapter;
private ShareActionProvider mShareActionProvider;
private SQLiteHandler db;
private SessionManager session;
public SQLiteHandler db;
public SessionManager session;
public HashMap<String, String> user;
@Override
@@ -125,7 +124,7 @@ public abstract class BaseActivity extends AppCompatActivity {
}
private void addDrawerItems() {
String[] osArray = { "Start", "Report", "Incident Map", "Profile", "Settings", "Subscription", "Logout" };
String[] osArray = { "Start", "Report", "Incident Map", " User Profile", "Account Settings", "Subscriptions", "Logout" };
mAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, osArray);
mDrawerList.setAdapter(mAdapter);
@@ -219,17 +218,13 @@ public abstract class BaseActivity extends AppCompatActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
//noinspection SimplifiableIfStatement
if (id == R.id.action_settings) {
return true;
if((id == R.id.menu_action_exit)){
finish();
System.exit(0);
}
// Activate the navigation drawer toggle
if (mDrawerToggle.onOptionsItemSelected(item)) {
return true;
}

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

@@ -17,129 +17,20 @@
android:layout_marginRight="20dp"
android:orientation="vertical" >
<TextView
android:id="@+id/lbl_profile_username"
android:text="@string/lbl_profile_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"/>
<EditText
android:id="@+id/txt_profile_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_profile_username"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_profile_name"
android:text="@string/lbl_profile_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_profile_username" />
<TextView
android:id="@+id/lbl_profile_surname"
android:text="@string/lbl_profile_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/txt_profile_surname"
android:layout_alignLeft="@+id/txt_profile_surname"
android:layout_alignStart="@+id/txt_profile_surname"/>
<EditText
android:id="@+id/txt_profile_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_below="@+id/lbl_profile_name"
android:layout_alignLeft="@+id/lbl_profile_name"
android:layout_alignStart="@+id/lbl_profile_name"/>
<EditText
android:id="@+id/txt_profile_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_alignBottom="@+id/txt_profile_name"
android:layout_toRightOf="@+id/txt_profile_name"
android:layout_toEndOf="@+id/txt_profile_name"/>
<TextView
android:id="@+id/lbl_profile_email"
android:text="@string/lbl_profile_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_profile_name"/>
<EditText
android:id="@+id/txt_profile_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_profile_email"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_profile_password"
android:text="@string/lbl_profile_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_profile_email"/>
<EditText
android:id="@+id/txt_profile_password"
android:inputType="textPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="7"
android:layout_below="@+id/lbl_profile_password"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_change"
android:text="@string/btn_profile_change"
android:minWidth="155dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-paint-brush"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
android:layout_marginTop="5dp"
android:layout_alignTop="@+id/lbl_profile_password"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
<TextView
android:id="@+id/lbl_trennlinie"
android:layout_width="fill_parent"
android:layout_height="2dip"
android:background="#cc273e"
android:layout_below="@+id/btn_profile_change"
android:layout_marginTop="20dp"/>
<TextView
android:id="@+id/lbl_profile_stats"
android:text="@string/lbl_profile_stats"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="#cc273e"
android:layout_below="@+id/lbl_trennlinie"/>
android:textColor="#cc273e"/>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_profile_stats"
android:stretchColumns="1">
android:stretchColumns="1"
android:id="@+id/tableLayout">
<TableRow>
<TextView
android:id="@+id/lbl_profile_membersince"
@@ -212,20 +103,21 @@
android:layout_height="wrap_content"
android:padding="3dip"
android:textColor="#FF0099CC"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_viewposts"
android:text="@string/btn_profile_viewposts"
android:layout_weight="1"
android:minWidth="155dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-search"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"/>
</TableRow>
</TableLayout>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_viewposts"
android:text="@string/btn_profile_viewposts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-search"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
android:layout_column="0"
android:layout_below="@+id/tableLayout"
android:layout_marginTop="31dp" />
</RelativeLayout>
<ListView

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

@@ -11,10 +11,127 @@
<RelativeLayout
android:id="@+id/rl_main_content"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:orientation="vertical" >
<TextView android:text="Settings Activity!" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/lbl_settings_username"
android:text="@string/lbl_settings_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"/>
<EditText
android:id="@+id/txt_settings_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_settings_username"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_settings_name"
android:text="@string/lbl_settings_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_username" />
<TextView
android:id="@+id/lbl_settings_surname"
android:text="@string/lbl_settings_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/txt_settings_surname"
android:layout_alignLeft="@+id/txt_settings_surname"
android:layout_alignStart="@+id/txt_settings_surname"/>
<EditText
android:id="@+id/txt_settings_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_below="@+id/lbl_settings_name"
android:layout_alignLeft="@+id/lbl_settings_name"
android:layout_alignStart="@+id/lbl_settings_name"/>
<EditText
android:id="@+id/txt_settings_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_alignBottom="@+id/txt_settings_name"
android:layout_toRightOf="@+id/txt_settings_name"
android:layout_toEndOf="@+id/txt_settings_name"/>
<TextView
android:id="@+id/lbl_settings_email"
android:text="@string/lbl_settings_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_name"/>
<EditText
android:id="@+id/txt_settings_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_settings_email"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_settings_password"
android:text="@string/lbl_settings_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_email"/>
<EditText
android:id="@+id/txt_settings_password"
android:inputType="textPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="7"
android:layout_below="@+id/lbl_settings_password"/>
<TextView
android:id="@+id/lbl_settings_retype_password"
android:text="@string/lbl_settings_retype_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_password"/>
<EditText
android:id="@+id/txt_settings_retype_password"
android:inputType="textPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="7"
android:layout_below="@+id/lbl_settings_retype_password"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_change"
android:text="@string/btn_settings_change"
android:minWidth="180dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-paint-brush"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
android:layout_marginTop="46dp"
android:layout_below="@+id/txt_settings_retype_password"
android:layout_centerHorizontal="true" />
</RelativeLayout>

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

@@ -6,4 +6,5 @@
android:title="Share"
omgandroid:showAsAction="ifRoom"
omgandroid:actionProviderClass= "android.support.v7.widget.ShareActionProvider" />
</menu>

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

@@ -1,7 +1,12 @@
<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/action_about" android:title="@string/action_about"
<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

@@ -3,11 +3,13 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.deke.risk.riskahead.MapsActivity">
<item android:id="@+id/action_refresh" android:title="@string/action_refresh"
<item android:id="@+id/menu_action_refresh" android:title="@string/menu_action_refresh"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/action_settings" android:title="@string/action_settings"
<item android:id="@+id/menu_action_about" android:title="@string/menu_action_about"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/action_contact" android:title="@string/action_help"
<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"

7
app/src/main/res/menu/menu_profile.xml
View File

@@ -1,7 +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="org.deke.risk.riskahead.ProfileActivity">
<item android:id="@+id/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" app:showAsAction="never" />
</menu>

7
app/src/main/res/menu/menu_report.xml
View File

@@ -1,7 +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="org.deke.risk.riskahead.ReportActivity">
<item android:id="@+id/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" app:showAsAction="never" />
</menu>

7
app/src/main/res/menu/menu_settings.xml
View File

@@ -1,7 +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="org.deke.risk.riskahead.SettingsActivity">
<item android:id="@+id/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" app:showAsAction="never" />
</menu>

6
app/src/main/res/menu/menu_start.xml
View File

@@ -1,6 +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="org.deke.risk.riskahead.StartActivity">
</menu>

7
app/src/main/res/menu/menu_subscriptions.xml
View File

@@ -1,7 +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="org.deke.risk.riskahead.SubscriptionsActivity">
<item android:id="@+id/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" app:showAsAction="never" />
</menu>

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

@@ -29,7 +29,7 @@
<string name="title_activity_entrance">Risk Ahead</string>
<string name="btn_profile_logout">Logout</string>
<string name="btn_profile_change">Confirm changes</string>
<string name="btn_settings_change">Confirm changes</string>
<string name="lbl_profile_title">Welcome</string>
<string name="drawer_open">Open navigation drawer</string>
@@ -42,7 +42,7 @@
<string name="hint">Enter Place</string>
<string name="action_search">Search</string>
<string name="action_refresh">Refresh page</string>
<string name="menu_action_refresh">Refresh page</string>
<string name="action_help">Help &amp; Feedback</string>
<string name="title_activity_base">Base</string>
@@ -70,17 +70,21 @@
<string name="lbl_report_category">Crime Category</string>
<string name="lbl_report_time">Time (hh:mm)</string>
<string name="lbl_report_date">Date (dd-mm-yyyy) of incident</string>
<string name="lbl_profile_name">Name</string>
<string name="lbl_profile_surname">Surname</string>
<string name="lbl_profile_email">E-Mail</string>
<string name="lbl_profile_username">Username</string>
<string name="lbl_settings_name">Name</string>
<string name="lbl_settings_surname">Surname</string>
<string name="lbl_settings_email">E-Mail</string>
<string name="lbl_settings_username">Username</string>
<string name="lbl_profile_stats">Profile stats</string>
<string name="lbl_profile_member_since">member since</string>
<string name="lbl_profile_points">points</string>
<string name="lbl_profile_ranking">ranking</string>
<string name="lbl_profile_numberposts">number of posts</string>
<string name="btn_profile_viewposts">View posts</string>
<string name="lbl_profile_password">Password</string>
<string name="lbl_settings_password">Password</string>
<string name="lbl_settings_retype_password">Retype Password</string>
<string name="menu_action_about">About</string>
<string name="menu_action_help">Help</string>
<string name="menu_action_exit">Exit</string>
<string-array name="incident_categories">
<item>Personal</item>