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

DT @25.11.2015: Implemented menu functions (Exit = Go to home screen), about, support and help goes to riskahead homepage

Browse Source
This commit is contained in:
Dennis Thießen
2015-11-25 22:13:50 +01:00
parent 1a358128c4
commit 23c2a84802
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,11 +153,19 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
int id = item.getItemId(); int id = item.getItemId();
if((id == R.id.menu_action_exit)){ if((id == R.id.menu_action_exit)){
finish(); Intent intent = new Intent(Intent.ACTION_MAIN);
System.exit(0); intent.addCategory(Intent.CATEGORY_HOME);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}else if((id == R.id.menu_action_about)){
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.riskahead.net/about/"));
startActivity(browserIntent);
}else if((id == R.id.menu_action_help)){
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.riskahead.net/contact/"));
startActivity(browserIntent);
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override @Override

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

@@ -21,6 +21,7 @@ public class StartActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_start); setContentView(R.layout.activity_start);
btnLogin = (Button) findViewById(R.id.btn_start_login); btnLogin = (Button) findViewById(R.id.btn_start_login);

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

@@ -3,6 +3,7 @@ package org.deke.risk.riskahead.helper;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.net.Uri;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.ActionBarDrawerToggle;
@@ -24,6 +25,7 @@ import org.deke.risk.riskahead.ReportActivity;
import org.deke.risk.riskahead.ProfileActivity; import org.deke.risk.riskahead.ProfileActivity;
import org.deke.risk.riskahead.ReportlistActivity; import org.deke.risk.riskahead.ReportlistActivity;
import org.deke.risk.riskahead.SettingsActivity; import org.deke.risk.riskahead.SettingsActivity;
import org.deke.risk.riskahead.StartActivity;
import org.deke.risk.riskahead.SubscriptionsActivity; import org.deke.risk.riskahead.SubscriptionsActivity;
import org.deke.risk.riskahead.ViewReportActivity; import org.deke.risk.riskahead.ViewReportActivity;
@@ -262,8 +264,16 @@ public abstract class BaseActivity extends AppCompatActivity {
int id = item.getItemId(); int id = item.getItemId();
if((id == R.id.menu_action_exit)){ if((id == R.id.menu_action_exit)){
finish(); Intent intent = new Intent(Intent.ACTION_MAIN);
System.exit(0); intent.addCategory(Intent.CATEGORY_HOME);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}else if((id == R.id.menu_action_about)){
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.riskahead.net/about/"));
startActivity(browserIntent);
}else if((id == R.id.menu_action_help)){
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.riskahead.net/contact/"));
startActivity(browserIntent);
} }
if (mDrawerToggle.onOptionsItemSelected(item)) { if (mDrawerToggle.onOptionsItemSelected(item)) {