diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4c667d0..f8e783e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ package="org.deke.risk.riskahead" > @@ -97,6 +97,14 @@ android:name=".ReportActivity" android:label="@string/title_activity_report" > + + + + 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 24e075f..d699866 100644 --- a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java @@ -1,9 +1,7 @@ package org.deke.risk.riskahead; import android.app.AlertDialog; -import android.app.Dialog; import android.app.ProgressDialog; -import android.content.Context; import android.content.DialogInterface; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; @@ -19,13 +17,13 @@ import android.widget.Button; import android.widget.TextView; import android.widget.Toast; -import com.android.volley.Request; import com.facebook.CallbackManager; import org.deke.risk.riskahead.fragments.FacebookButtonFragment; import org.deke.risk.riskahead.fragments.GooglePlusButtonFragment; import org.deke.risk.riskahead.fragments.TwitterButtonFragment; import org.deke.risk.riskahead.helper.AppConfig; +import org.deke.risk.riskahead.helper.AppController; import org.deke.risk.riskahead.helper.SQLiteHandler; import org.deke.risk.riskahead.helper.SessionManager; import org.json.JSONException; @@ -43,12 +41,13 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr private static final String TAG = LoginActivity.class.getSimpleName(); private CallbackManager callbackManager; + private Button btnSignUpMY; private String inputMsg; private TextView input_email; private TextView input_full_name; private TextView input_password; - private Context thiscontext; + private ProgressDialog pDialog; private SessionManager session; @@ -61,8 +60,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr Intent intent = getIntent(); inputMsg = intent.getStringExtra(StartActivity.EXTRA_MESSAGE); callbackManager = CallbackManager.Factory.create(); - thiscontext = this; - // Session manager + session = new SessionManager(getApplicationContext()); // Progress dialog @@ -210,7 +208,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr } public void onClick(View view){ - if(input_email.getText().toString().isEmpty()){ + if(input_email.getText() != null && input_email.getText().toString().isEmpty()){ showMessage("Enter your E-Mail to reset your password"); return; } @@ -346,7 +344,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr String providerType = "local"; if(status.equals("0")){ - new AlertDialog.Builder(thiscontext) + new AlertDialog.Builder(getApplicationContext()) .setTitle("Activate your account") .setMessage("Your account is not activated yet. Please follow the instructions in your E-Mail. Do you want to resent the E-Mail?") .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java index 01b6ef7..acd932b 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java @@ -2,24 +2,80 @@ package org.deke.risk.riskahead; import android.content.Intent; import android.os.Bundle; +import android.os.Handler; import android.support.v4.app.FragmentManager; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; +import android.widget.Toast; +import com.android.volley.Request; +import com.android.volley.Response; +import com.android.volley.VolleyError; +import com.android.volley.toolbox.StringRequest; +import com.beardedhen.androidbootstrap.BootstrapButton; + +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; + +import java.util.HashMap; +import java.util.Map; public class MainActivity extends BaseActivity{ public String inputMsg; - private String mActivityTitle = "RiskAhead"; public static FragmentManager fragmentManager; + private static final String TAG = MainActivity.class.getSimpleName(); + Handler mHandler = new Handler(); + private SQLiteHandler db; + + private String mActivityTitle = "RiskAhead"; + private final static int INTERVAL = 1000 * 10; //10 seconds + private TextView incidentCount; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //setContentView(R.layout.activity_main); Intent intent = getIntent(); inputMsg = intent.getStringExtra(StartActivity.EXTRA_MESSAGE); fragmentManager = getSupportFragmentManager(); + incidentCount = (TextView) findViewById(R.id.txt_incidents); + + db = new SQLiteHandler(getApplicationContext()); + + StringRequest strReq = getStringRequestIncidentCount(db.getUserDetails().get("email")); + String tag_string_req = "req_incidents"; + AppController.getInstance().addToRequestQueue(strReq, tag_string_req); + + findViewById(R.id.btn_report).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + gotoReportActivity(); + } + }); + + findViewById(R.id.btn_view_map).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + gotoMapActivity(); + } + }); + } + + @Override + protected void onPause(){ + stopRepeatingTask(); + } + + @Override + protected void onResume(){ + startRepeatingTask(); } @Override @@ -31,4 +87,71 @@ public class MainActivity extends BaseActivity{ protected String getActivityName() { return mActivityTitle; } + + Runnable mHandlerTask = new Runnable() + { + @Override + public void run() { + StringRequest strReq = getStringRequestIncidentCount(db.getUserDetails().get("email")); + String tag_string_req = "req_incidents"; + AppController.getInstance().addToRequestQueue(strReq, tag_string_req); + mHandler.postDelayed(mHandlerTask, INTERVAL); + } + }; + + void startRepeatingTask() + { + mHandlerTask.run(); + } + + void stopRepeatingTask() + { + mHandler.removeCallbacks(mHandlerTask); + } + + private StringRequest getStringRequestIncidentCount(final String email) { + return new StringRequest(Request.Method.POST, AppConfig.URL_REGISTER, new Response.Listener() { + + @Override + public void onResponse(String response) { + Log.d(TAG, "Incident count: " + response.toString()); + + try { + JSONObject jObj = new JSONObject(response); + boolean error = jObj.getBoolean("error"); + if (!error) { + TextView count = (TextView) findViewById(R.id.txt_incidents); + count.setText(jObj.getString("msg")); + } else { + String errorMsg = jObj.getString("error_msg"); + Toast.makeText(getApplicationContext(), + errorMsg, Toast.LENGTH_LONG).show(); + } + } catch (JSONException e) { + e.printStackTrace(); + } + + } + }, new Response.ErrorListener() { + + @Override + public void onErrorResponse(VolleyError error) { + Log.e(TAG, "E-Mail pw resend Error: " + error.getMessage()); + Toast.makeText(getApplicationContext(), + error.getMessage(), Toast.LENGTH_LONG).show(); + + } + }) { + + @Override + protected Map getParams() { + // Posting params to register url + Map params = new HashMap(); + params.put("tag", "getincidentcount"); + params.put("email", email); + + return params; + } + }; + } } diff --git a/app/src/main/java/org/deke/risk/riskahead/UserConfigActivity.java b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java similarity index 78% rename from app/src/main/java/org/deke/risk/riskahead/UserConfigActivity.java rename to app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java index 6f0db1a..102f4bd 100644 --- a/app/src/main/java/org/deke/risk/riskahead/UserConfigActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java @@ -14,7 +14,7 @@ import org.deke.risk.riskahead.helper.SessionManager; import java.util.HashMap; -public class UserConfigActivity extends BaseActivity { +public class ProfileActivity extends BaseActivity { private TextView txtName; private TextView txtEmail; private TextView txtTest; @@ -27,7 +27,7 @@ public class UserConfigActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //setContentView(R.layout.activity_user_config); + //setContentView(R.layout.activity_profile); session = new SessionManager(getApplicationContext()); @@ -54,20 +54,14 @@ public class UserConfigActivity extends BaseActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_user_config, menu); - + getMenuInflater().inflate(R.menu.menu_profile, menu); return true; } @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; } @@ -77,7 +71,7 @@ public class UserConfigActivity extends BaseActivity { @Override protected int getLayoutResourceId() { - return R.layout.activity_user_config; + return R.layout.activity_profile; } @Override diff --git a/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java b/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java index 7ae162a..a1fc154 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java @@ -1,50 +1,33 @@ package org.deke.risk.riskahead; -import android.support.v7.app.ActionBarActivity; import android.os.Bundle; -import android.view.Menu; -import android.view.MenuItem; - import org.deke.risk.riskahead.helper.BaseActivity; - +import org.deke.risk.riskahead.helper.SQLiteHandler; public class ReportActivity extends BaseActivity { + private String mActivityTitle = "Report"; + private static final String TAG = ReportActivity.class.getSimpleName(); + private SQLiteHandler db; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_report); - } + //setContentView(R.layout.activity_report); - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_report, menu); - return true; - } - - @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; - } - - return super.onOptionsItemSelected(item); + db = new SQLiteHandler(getApplicationContext()); } @Override protected int getLayoutResourceId() { - return 0; + return R.layout.activity_report; } @Override protected String getActivityName() { - return null; + return mActivityTitle; } + + + } diff --git a/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java b/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java new file mode 100644 index 0000000..21ccc1a --- /dev/null +++ b/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java @@ -0,0 +1,26 @@ +package org.deke.risk.riskahead; + +import android.support.v7.app.ActionBarActivity; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; + +import org.deke.risk.riskahead.helper.BaseActivity; + + +public class SettingsActivity extends BaseActivity { + private String mActivityTitle = "Settings"; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + //setContentView(R.layout.activity_settings); + } + + @Override + protected int getLayoutResourceId() { + return R.layout.activity_settings; + } + + @Override + protected String getActivityName() { return mActivityTitle; } +} 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 c678db2..5e81bcb 100644 --- a/app/src/main/java/org/deke/risk/riskahead/StartActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/StartActivity.java @@ -1,6 +1,5 @@ package org.deke.risk.riskahead; -import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; diff --git a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java new file mode 100644 index 0000000..fdad8bf --- /dev/null +++ b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java @@ -0,0 +1,27 @@ +package org.deke.risk.riskahead; + +import android.support.v7.app.ActionBarActivity; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; + +import org.deke.risk.riskahead.helper.BaseActivity; + + +public class SubscriptionsActivity extends BaseActivity { + private String mActivityTitle = "Subscriptions"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + //setContentView(R.layout.activity_subscriptions); + } + + @Override + protected int getLayoutResourceId() { + return R.layout.activity_settings; + } + + @Override + protected String getActivityName() { return mActivityTitle; } +} diff --git a/app/src/main/java/org/deke/risk/riskahead/AppController.java b/app/src/main/java/org/deke/risk/riskahead/helper/AppController.java similarity index 96% rename from app/src/main/java/org/deke/risk/riskahead/AppController.java rename to app/src/main/java/org/deke/risk/riskahead/helper/AppController.java index d4a00b9..a5ff777 100644 --- a/app/src/main/java/org/deke/risk/riskahead/AppController.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/AppController.java @@ -1,4 +1,4 @@ -package org.deke.risk.riskahead; +package org.deke.risk.riskahead.helper; import android.app.Application; import android.text.TextUtils; 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 d05859c..85efb19 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 @@ -20,7 +20,10 @@ import org.deke.risk.riskahead.LoginActivity; import org.deke.risk.riskahead.MainActivity; import org.deke.risk.riskahead.MapsActivity; import org.deke.risk.riskahead.R; -import org.deke.risk.riskahead.UserConfigActivity; +import org.deke.risk.riskahead.ReportActivity; +import org.deke.risk.riskahead.ProfileActivity; +import org.deke.risk.riskahead.SettingsActivity; +import org.deke.risk.riskahead.SubscriptionsActivity; import java.util.HashMap; @@ -30,7 +33,7 @@ public abstract class BaseActivity extends AppCompatActivity { private DrawerLayout mDrawerLayout; private ListView mDrawerList; private ArrayAdapter mAdapter; - ShareActionProvider mShareActionProvider; + private ShareActionProvider mShareActionProvider; private SQLiteHandler db; private SessionManager session; public HashMap user; @@ -66,6 +69,18 @@ public abstract class BaseActivity extends AppCompatActivity { getSupportActionBar().setHomeButtonEnabled(true); } + public void logoutUser() { + session.setLogin(false); + db.deleteUsers(); + + // Launching the login activity + Intent intent = new Intent(this, LoginActivity.class); + intent.putExtra(EXTRA_MESSAGE, "login"); + startActivity(intent); + finish(); + } + + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.menu_common, menu); @@ -122,22 +137,30 @@ public abstract class BaseActivity extends AppCompatActivity { @Override public void onDrawerClosed(View drawerView) { super.onDrawerClosed(drawerView); - Intent intent; switch (position) { case 0: - intent = new Intent(getApplicationContext(), MainActivity.class); - startActivity(intent); + gotoMainActivity(); break; case 1: - intent = new Intent(getApplicationContext(), MapsActivity.class); - startActivity(intent); + gotoReportActivity(); break; case 2: - intent = new Intent(getApplicationContext(), UserConfigActivity.class); - startActivity(intent); + gotoMapActivity(); + break; + case 3: + gotoProfileActivity(); + break; + case 4: + gotoSettingsActivity(); + break; + case 5: + gotoSubscriptionsActivity(); + break; + case 6: + logoutUser(); break; default: - Log.d("switch: ", Integer.toString(position)); + Log.d("Unknown switch page: ", Integer.toString(position)); break; } } @@ -147,6 +170,42 @@ public abstract class BaseActivity extends AppCompatActivity { }); } + public void gotoMainActivity(){ + Intent intent; + intent = new Intent(getApplicationContext(), MainActivity.class); + startActivity(intent); + } + + public void gotoReportActivity(){ + Intent intent; + intent = new Intent(getApplicationContext(), ReportActivity.class); + startActivity(intent); + } + + public void gotoMapActivity(){ + Intent intent; + intent = new Intent(getApplicationContext(), MapsActivity.class); + startActivity(intent); + } + + public void gotoProfileActivity(){ + Intent intent; + intent = new Intent(getApplicationContext(), ProfileActivity.class); + startActivity(intent); + } + + public void gotoSettingsActivity(){ + Intent intent; + intent = new Intent(getApplicationContext(), SettingsActivity.class); + startActivity(intent); + } + + public void gotoSubscriptionsActivity(){ + Intent intent; + intent = new Intent(getApplicationContext(), SubscriptionsActivity.class); + startActivity(intent); + } + @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); @@ -159,21 +218,6 @@ public abstract class BaseActivity extends AppCompatActivity { mDrawerToggle.onConfigurationChanged(newConfig); } - private void setShareIntent() { - if (mShareActionProvider != null) { - - // create an Intent with the contents of the TextView - Intent shareIntent = new Intent(Intent.ACTION_SEND); - shareIntent.setType("text/plain"); - shareIntent.putExtra(Intent.EXTRA_SUBJECT, "Android Development"); - shareIntent.putExtra(Intent.EXTRA_TEXT, "Ich empfehle RiskAhead!"); - - // Make sure the provider knows - // it should work with that Intent - mShareActionProvider.setShareIntent(shareIntent); - } - } - @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -194,19 +238,19 @@ public abstract class BaseActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } - /** - * Logging out the user. Will set isLoggedIn flag to false in shared - * preferences Clears the user data from sqlite users table - * */ - public void logoutUser() { - session.setLogin(false); - db.deleteUsers(); + private void setShareIntent() { + if (mShareActionProvider != null) { - // Launching the login activity - Intent intent = new Intent(this, LoginActivity.class); - intent.putExtra(EXTRA_MESSAGE, "login"); - startActivity(intent); - finish(); + // create an Intent with the contents of the TextView + Intent shareIntent = new Intent(Intent.ACTION_SEND); + shareIntent.setType("text/plain"); + shareIntent.putExtra(Intent.EXTRA_SUBJECT, "Android Development"); + shareIntent.putExtra(Intent.EXTRA_TEXT, "Ich empfehle RiskAhead!"); + + // Make sure the provider knows + // it should work with that Intent + mShareActionProvider.setShareIntent(shareIntent); + } } protected abstract int getLayoutResourceId(); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 966836d..96c42be 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" xmlns:bootstrap="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" - android:background="@drawable/vAGZp" + android:background="@drawable/bg_main2" android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".MainActivity"> @@ -84,7 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:text="View Map" - bootstrap:bb_icon_left="fa-map" + bootstrap:bb_icon_left="fa-info" bootstrap:bb_type="primary" bootstrap:bb_roundedCorners="true"/> diff --git a/app/src/main/res/layout/activity_user_config.xml b/app/src/main/res/layout/activity_profile.xml similarity index 95% rename from app/src/main/res/layout/activity_user_config.xml rename to app/src/main/res/layout/activity_profile.xml index 8a179ea..9951b60 100644 --- a/app/src/main/res/layout/activity_user_config.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -4,7 +4,8 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="org.deke.risk.riskahead.UserConfigActivity"> + android:background="@drawable/bg_main2" + tools:context="org.deke.risk.riskahead.ProfileActivity"> + - + - + + + + + + + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml new file mode 100644 index 0000000..77f83bd --- /dev/null +++ b/app/src/main/res/layout/activity_settings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_subscriptions.xml b/app/src/main/res/layout/activity_subscriptions.xml new file mode 100644 index 0000000..09c1cc3 --- /dev/null +++ b/app/src/main/res/layout/activity_subscriptions.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_login.xml b/app/src/main/res/menu/menu_login.xml index 60ba9e3..b1b26c1 100644 --- a/app/src/main/res/menu/menu_login.xml +++ b/app/src/main/res/menu/menu_login.xml @@ -1,7 +1,7 @@ - diff --git a/app/src/main/res/menu/menu_user_config.xml b/app/src/main/res/menu/menu_profile.xml similarity index 83% rename from app/src/main/res/menu/menu_user_config.xml rename to app/src/main/res/menu/menu_profile.xml index 9ce2b09..e377adb 100644 --- a/app/src/main/res/menu/menu_user_config.xml +++ b/app/src/main/res/menu/menu_profile.xml @@ -1,7 +1,7 @@ + tools:context="org.deke.risk.riskahead.ProfileActivity"> diff --git a/app/src/main/res/menu/menu_settings.xml b/app/src/main/res/menu/menu_settings.xml new file mode 100644 index 0000000..789fb6d --- /dev/null +++ b/app/src/main/res/menu/menu_settings.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/menu/menu_subscriptions.xml b/app/src/main/res/menu/menu_subscriptions.xml new file mode 100644 index 0000000..c8d6ef7 --- /dev/null +++ b/app/src/main/res/menu/menu_subscriptions.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fc0f2de..b856b68 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ Register to RiskAhead Log-in to RiskAhead Forgot your password?\nClick here - Settings + About Terms of Service and\nPrivacy Policy Full Name E-Mail @@ -46,4 +46,6 @@ ReportActivity Hello world! + SettingsActivity + SubscriptionsActivity