From 23c2a8480279ee67981d63e3f8f9c54cc965c36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Thie=C3=9Fen?= Date: Wed, 25 Nov 2015 22:13:50 +0100 Subject: [PATCH] DT @25.11.2015: Implemented menu functions (Exit = Go to home screen), about, support and help goes to riskahead homepage --- .../org/deke/risk/riskahead/LoginActivity.java | 14 +++++++++++--- .../org/deke/risk/riskahead/StartActivity.java | 1 + .../deke/risk/riskahead/helper/BaseActivity.java | 14 ++++++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java index c4e1c7e..4475390 100644 --- a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java @@ -153,11 +153,19 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr int id = item.getItemId(); if((id == R.id.menu_action_exit)){ - finish(); - System.exit(0); + Intent intent = new Intent(Intent.ACTION_MAIN); + 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 diff --git a/app/src/main/java/org/deke/risk/riskahead/StartActivity.java b/app/src/main/java/org/deke/risk/riskahead/StartActivity.java index 929e159..b70960a 100644 --- a/app/src/main/java/org/deke/risk/riskahead/StartActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/StartActivity.java @@ -21,6 +21,7 @@ public class StartActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.activity_start); btnLogin = (Button) findViewById(R.id.btn_start_login); diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java index f0fb8f0..226ca79 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java @@ -3,6 +3,7 @@ package org.deke.risk.riskahead.helper; import android.app.ProgressDialog; import android.content.Intent; import android.content.res.Configuration; +import android.net.Uri; import android.support.v4.widget.DrawerLayout; import android.os.Bundle; 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.ReportlistActivity; import org.deke.risk.riskahead.SettingsActivity; +import org.deke.risk.riskahead.StartActivity; import org.deke.risk.riskahead.SubscriptionsActivity; import org.deke.risk.riskahead.ViewReportActivity; @@ -262,8 +264,16 @@ public abstract class BaseActivity extends AppCompatActivity { int id = item.getItemId(); if((id == R.id.menu_action_exit)){ - finish(); - System.exit(0); + Intent intent = new Intent(Intent.ACTION_MAIN); + 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)) {