From 7667064583fd60269099843ad18479b819230bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Thie=C3=9Fen?= Date: Sat, 12 Sep 2015 19:42:18 +0200 Subject: [PATCH] DT @12.09.2015: Refactored, report activity extended --- app/src/main/AndroidManifest.xml | 29 +++-- .../deke/risk/riskahead/LoginActivity.java | 97 +++++---------- .../org/deke/risk/riskahead/MainActivity.java | 30 ++--- .../org/deke/risk/riskahead/MapsActivity.java | 41 +------ .../deke/risk/riskahead/ProfileActivity.java | 23 ++-- .../deke/risk/riskahead/ReportActivity.java | 110 +++++++++++++++++- .../deke/risk/riskahead/SettingsActivity.java | 9 +- .../deke/risk/riskahead/StartActivity.java | 24 +--- .../risk/riskahead/SubscriptionsActivity.java | 8 +- .../fragments/TwitterButtonFragment.java | 4 +- .../risk/riskahead/helper/BaseActivity.java | 11 +- .../risk/riskahead/helper/PlaceProvider.java | 4 +- .../risk/riskahead/helper/SessionManager.java | 8 -- app/src/main/res/layout/activity_login.xml | 58 +++++---- app/src/main/res/layout/activity_main.xml | 35 +++--- app/src/main/res/layout/activity_maps.xml | 4 +- app/src/main/res/layout/activity_profile.xml | 28 ++--- app/src/main/res/layout/activity_register.xml | 53 +++++---- app/src/main/res/layout/activity_report.xml | 105 ++++++++++++++++- app/src/main/res/layout/activity_settings.xml | 2 +- app/src/main/res/layout/activity_start.xml | 12 +- .../res/layout/activity_subscriptions.xml | 2 +- app/src/main/res/values/strings.xml | 60 +++++++--- 23 files changed, 441 insertions(+), 316 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8e783e..72f62d4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,22 +2,23 @@ + + + + + + + + + + - - - - - - - - - - + @@ -49,6 +51,7 @@ > @@ -62,11 +65,13 @@ @@ -90,19 +95,23 @@ 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 d699866..1a87e7b 100644 --- a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java @@ -17,8 +17,6 @@ import android.widget.Button; import android.widget.TextView; import android.widget.Toast; -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; @@ -39,82 +37,72 @@ import java.util.Map; public class LoginActivity extends AppCompatActivity implements FacebookButtonFragment.OnFragmentInteractionListener, GooglePlusButtonFragment.OnFragmentInteractionListener, TwitterButtonFragment.OnFragmentInteractionListener{ - private static final String TAG = LoginActivity.class.getSimpleName(); - private CallbackManager callbackManager; + private final static String TAG = LoginActivity.class.getSimpleName(); + private final static String EXTRA_MESSAGE = "org.deke.risk.riskahead.MESSAGE"; + private String msg_intent; - private Button btnSignUpMY; - private String inputMsg; + private Button btn_login; private TextView input_email; private TextView input_full_name; private TextView input_password; - private ProgressDialog pDialog; - private SessionManager session; - public final static String EXTRA_MESSAGE = "com.mycompany.myfirstapp.MESSAGE"; private SQLiteHandler db; + private SessionManager session; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Intent intent = getIntent(); - inputMsg = intent.getStringExtra(StartActivity.EXTRA_MESSAGE); - callbackManager = CallbackManager.Factory.create(); + msg_intent = intent.getStringExtra(LoginActivity.EXTRA_MESSAGE); - session = new SessionManager(getApplicationContext()); - - // Progress dialog pDialog = new ProgressDialog(this); pDialog.setCancelable(false); - // SQLite database handler db = new SQLiteHandler(getApplicationContext()); + session = new SessionManager(getApplicationContext()); - // Check if user is already logged in or not - if (session.isLoggedIn()) { - // User is already logged in. Take him to main activity - intent = new Intent(LoginActivity.this,MainActivity.class); - startActivity(intent); - finish(); - } - - if(inputMsg.equals("login")){ + if(msg_intent.equals("login")){ setContentView(R.layout.activity_login); - }else if(inputMsg.equals("register")){ + input_email = (TextView) findViewById(R.id.input_register_email); + input_password = (TextView) findViewById(R.id.input_register_password); + }else if(msg_intent.equals("register")){ setContentView(R.layout.activity_register); - input_full_name = (TextView) findViewById(R.id.input_full_name); + input_full_name = (TextView) findViewById(R.id.input_register_name); + input_email = (TextView) findViewById(R.id.input_register_email); + input_password = (TextView) findViewById(R.id.input_register_password); } - input_email = (TextView) findViewById(R.id.input_email); - input_password = (TextView) findViewById(R.id.input_password); FragmentManager fragmentManager = getSupportFragmentManager(); FacebookButtonFragment fragmentFB = new FacebookButtonFragment(); GooglePlusButtonFragment fragmentGP = new GooglePlusButtonFragment(); FragmentTransaction transaction = fragmentManager.beginTransaction(); - transaction.add(R.id.fragment_btn_gp, fragmentGP); + transaction.add(R.id.frag_login_btnGP, fragmentGP); transaction.commit(); initMySigninButton(); } private void initMySigninButton() { - btnSignUpMY = (Button) findViewById(R.id.btnSignUp); - btnSignUpMY.setOnClickListener(new View.OnClickListener() { + btn_login = (Button) findViewById(R.id.btn_register); + btn_login.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (v.getId() == R.id.btnSignUp) { + if (v.getId() == R.id.btn_register) { String email = input_email.getText().toString(); String password = input_password.getText().toString(); - if (inputMsg.equals("login")) { + if (msg_intent.equals("login")) { if (isEmpty(input_email) || isEmpty(input_password)) { showMessage("Please enter all fields before logging in"); } else { checkLogin(email, password); } - } else if (inputMsg.equals("register")) { + } else if (msg_intent.equals("register")) { String name = input_full_name.getText().toString(); if (isEmpty(input_email) || isEmpty(input_password) || isEmpty(input_full_name)) { showMessage("Please enter all fields before registration"); @@ -147,13 +135,13 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == GooglePlusButtonFragment.RC_SIGN_IN) { - GooglePlusButtonFragment fragment = (GooglePlusButtonFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_btn_gp); + GooglePlusButtonFragment fragment = (GooglePlusButtonFragment) getSupportFragmentManager().findFragmentById(R.id.frag_login_btnGP); fragment.onActivityResult(requestCode, resultCode, data); } else { super.onActivityResult(requestCode, resultCode, data); } - TwitterButtonFragment twitter_fragment = (TwitterButtonFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_btn_tw); + TwitterButtonFragment twitter_fragment = (TwitterButtonFragment) getSupportFragmentManager().findFragmentById(R.id.frag_login_btnTW); if (twitter_fragment != null) { twitter_fragment.onActivityResult(requestCode, resultCode, data); } @@ -169,41 +157,23 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr finish(); } - // Tag used to cancel the request String tag_string_req = "sociallogin"; db.deleteUsers(); - pDialog.setMessage("Social Media Login ..."); showDialog(); StringRequest strReq = getStringRequestSocialMediaLogin(key, providerType, username, email); - - // Adding request to request queue AppController.getInstance().addToRequestQueue(strReq, tag_string_req); } private void checkLogin(final String email, final String password) { - // Tag used to cancel the request String tag_string_req = "req_login"; - db.deleteUsers(); - pDialog.setMessage("Logging in ..."); - showDialog(); - StringRequest strReq = getStringRequestLogin(email, password); - - // Adding request to request queue AppController.getInstance().addToRequestQueue(strReq, tag_string_req); } private void registerUser(final String username, final String email,final String password) { - // Tag used to cancel the request String tag_string_req = "req_register"; - db.deleteUsers(); - pDialog.setMessage("Registering ..."); - showDialog(); - StringRequest strReq = getStringRequestRegisterUser(username, email, password); - - // Adding request to request queue AppController.getInstance().addToRequestQueue(strReq, tag_string_req); } @@ -219,11 +189,9 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { String tag_string_req = "requestpwreset"; - StringRequest strReq = getStringRequestResetPW(input_email.getText().toString()); - - // Adding request to request queue AppController.getInstance().addToRequestQueue(strReq, tag_string_req); + showMessage("E-Mail was sent to your address"); } }) @@ -242,7 +210,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override public void onResponse(String response) { - Log.d(TAG, "Social Media Login Response: " + response.toString()); + Log.d(TAG, "Social Media Login Response: " + response); hideDialog(); try { @@ -256,7 +224,6 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr // User successfully stored in MySQL // Now store the user in sqlite String uid = jObj.getString("uid"); - JSONObject user = jObj.getJSONObject("user"); String username = user.getString("username"); String name = user.getString("name"); @@ -277,9 +244,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr startActivity(intent); finish(); } else { - - // Error occurred in registration. Get the error - // message + // Error occurred in registration. Get the error message String errorMsg = jObj.getString("error_msg"); Toast.makeText(getApplicationContext(), errorMsg, Toast.LENGTH_LONG).show(); @@ -321,7 +286,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override public void onResponse(String response) { - Log.d(TAG, "Login Response: " + response.toString()); + Log.d(TAG, "Login Response: " + response); hideDialog(); try { @@ -419,7 +384,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override public void onResponse(String response) { - Log.d(TAG, "Register Response: " + response.toString()); + Log.d(TAG, "Register Response: " + response); hideDialog(); try { @@ -487,7 +452,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override public void onResponse(String response) { - Log.d(TAG, "Resend E-Mail Response: " + response.toString()); + Log.d(TAG, "Resend E-Mail Response: " + response); hideDialog(); try { @@ -536,7 +501,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override public void onResponse(String response) { - Log.d(TAG, "Resend E-Mail Response: " + response.toString()); + Log.d(TAG, "Resend E-Mail Response: " + response); hideDialog(); try { 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 acd932b..ccd0341 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java @@ -6,7 +6,6 @@ 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; @@ -14,7 +13,6 @@ 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; @@ -28,13 +26,16 @@ import java.util.Map; public class MainActivity extends BaseActivity{ - public String inputMsg; + private final static String mActivityTitle = "RiskAhead"; + private final static String TAG = MainActivity.class.getSimpleName(); + private final static String EXTRA_MESSAGE = "org.deke.risk.riskahead.MESSAGE"; + public String msg_input; + 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; @@ -43,24 +44,21 @@ public class MainActivity extends BaseActivity{ super.onCreate(savedInstanceState); Intent intent = getIntent(); - inputMsg = intent.getStringExtra(StartActivity.EXTRA_MESSAGE); - fragmentManager = getSupportFragmentManager(); - incidentCount = (TextView) findViewById(R.id.txt_incidents); + msg_input = intent.getStringExtra(MainActivity.EXTRA_MESSAGE); + fragmentManager = getSupportFragmentManager(); db = new SQLiteHandler(getApplicationContext()); - StringRequest strReq = getStringRequestIncidentCount(db.getUserDetails().get("email")); - String tag_string_req = "req_incidents"; - AppController.getInstance().addToRequestQueue(strReq, tag_string_req); + incidentCount = (TextView) findViewById(R.id.txt_main_incidents); - findViewById(R.id.btn_report).setOnClickListener(new View.OnClickListener() { + findViewById(R.id.btn_main_report).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { gotoReportActivity(); } }); - findViewById(R.id.btn_view_map).setOnClickListener(new View.OnClickListener() { + findViewById(R.id.btn_main_viewmap).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { gotoMapActivity(); @@ -70,11 +68,13 @@ public class MainActivity extends BaseActivity{ @Override protected void onPause(){ + super.onPause(); stopRepeatingTask(); } @Override protected void onResume(){ + super.onResume(); startRepeatingTask(); } @@ -114,13 +114,13 @@ public class MainActivity extends BaseActivity{ @Override public void onResponse(String response) { - Log.d(TAG, "Incident count: " + response.toString()); + Log.d(TAG, "Incident count: " + response); try { JSONObject jObj = new JSONObject(response); boolean error = jObj.getBoolean("error"); if (!error) { - TextView count = (TextView) findViewById(R.id.txt_incidents); + TextView count = (TextView) findViewById(R.id.txt_main_incidents); count.setText(jObj.getString("msg")); } else { String errorMsg = jObj.getString("error_msg"); diff --git a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java index 07ecf83..988ec8d 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java @@ -6,7 +6,6 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.os.Bundle; -import android.provider.SyncStateContract; import android.support.v4.app.LoaderManager; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; @@ -25,8 +24,11 @@ import org.deke.risk.riskahead.helper.PlaceProvider; public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCallbacks { + + private final static String mActivityTitle = "RiskMap"; + private static final String TAG = MapsActivity.class.getSimpleName(); + private static GoogleMap mMap; - private String mActivityTitle = "RiskMap"; private LatLng myLocation; private void handleIntent(Intent intent){ @@ -106,14 +108,8 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //setContentView(R.layout.activity_maps); - // Passing harcoded values for latitude & longitude. Please change as per your need. This is just used to drop a Marker on the Map - //latitude = 53.33; - // longitude = 10.02; - - // setUpMapIfNeeded(); // For setting up the MapFragment - mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map)).getMap(); + mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.frag_maps_map)).getMap(); mMap.setMyLocationEnabled(true); mMap.getUiSettings().setZoomControlsEnabled(true); handleIntent(getIntent()); @@ -121,10 +117,8 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa @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_maps, menu); - // Get the SearchView and set the searchable configuration SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); SearchView searchView = (SearchView) menu.findItem(R.id.location_search).getActionView(); SearchableInfo searchInfo = searchManager.getSearchableInfo(getComponentName()); @@ -133,26 +127,6 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa return true; } - /***** Sets up the map if it is possible to do so *****/ - public void setUpMapIfNeeded() { - // Do a null check to confirm that we have not already instantiated the map. - if (mMap == null) { - // Try to obtain the map from the SupportMapFragment. - //mMap = ((SupportMapFragment) MainActivity.fragmentManager.findFragmentById(R.id.location_map)).getMap(); - mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map)).getMap(); - // Check if we were successful in obtaining the map. - if (mMap != null) - setUpMap(); - } - } - - /** - * This is where we can add markers or lines, add listeners or move the - * camera. - *

- * This should only be called once and when we are sure that {@link #mMap} - * is not null. - */ private void setUpMap() { // For showing a move to my loction button mMap.setMyLocationEnabled(true); @@ -163,14 +137,11 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(myLocation, 12.0f)); } - /**** The mapfragment's id must be removed from the FragmentManager - **** or else if the same it is passed on the next time then - **** app will crash ****/ @Override public void onDestroy() { super.onDestroy(); if (mMap != null) { - getSupportFragmentManager().beginTransaction().remove(getSupportFragmentManager().findFragmentById(R.id.map)).commitAllowingStateLoss(); + getSupportFragmentManager().beginTransaction().remove(getSupportFragmentManager().findFragmentById(R.id.frag_maps_map)).commitAllowingStateLoss(); mMap = null; } } diff --git a/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java index 102f4bd..9bfae96 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java @@ -9,34 +9,30 @@ import android.widget.TextView; import org.deke.risk.riskahead.helper.BaseActivity; import org.deke.risk.riskahead.helper.SQLiteHandler; -import org.deke.risk.riskahead.helper.SessionManager; 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 TextView txtTest; private Button btnLogout; + private SQLiteHandler db; public HashMap user; - private SessionManager session; - private String mActivityTitle = "User Profile"; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //setContentView(R.layout.activity_profile); - session = new SessionManager(getApplicationContext()); + txtName = (TextView) findViewById(R.id.txt_profile_name); + txtEmail = (TextView) findViewById(R.id.txt_profile_email); + btnLogout = (Button) findViewById(R.id.btn_profile_logout); - txtTest = (TextView) findViewById(R.id.test); - txtName = (TextView) findViewById(R.id.name); - txtEmail = (TextView) findViewById(R.id.email); - btnLogout = (Button) findViewById(R.id.btnLogout); - - // Logout button click event btnLogout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -44,10 +40,9 @@ public class ProfileActivity extends BaseActivity { } }); - // SqLite database handler db = new SQLiteHandler(getApplicationContext()); - // Fetching user details from sqlite user = db.getUserDetails(); + txtName.setText(user.get("username")); txtEmail.setText(user.get("email")); } 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 a1fc154..2c122a7 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java @@ -1,23 +1,121 @@ package org.deke.risk.riskahead; +import android.app.DatePickerDialog; +import android.app.Dialog; +import android.app.TimePickerDialog; import android.os.Bundle; +import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.DatePicker; +import android.widget.EditText; +import android.widget.Spinner; +import android.widget.TimePicker; + import org.deke.risk.riskahead.helper.BaseActivity; -import org.deke.risk.riskahead.helper.SQLiteHandler; + +import java.util.Calendar; public class ReportActivity extends BaseActivity { - private String mActivityTitle = "Report"; - private static final String TAG = ReportActivity.class.getSimpleName(); - private SQLiteHandler db; + private final static String mActivityTitle = "Report"; + private final static String TAG = ReportActivity.class.getSimpleName(); + private static final int DATE_DIALOG_ID = 999; + private static final int TIME_DIALOG_ID = 998; + + private EditText txtDay; + private EditText txtTime; + + private int year, month, day; + private int hour, minute; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //setContentView(R.layout.activity_report); - db = new SQLiteHandler(getApplicationContext()); + Spinner spinner = (Spinner) findViewById(R.id.dd_report_category); + ArrayAdapter adapter = ArrayAdapter.createFromResource(this, R.array.incident_categories, android.R.layout.simple_spinner_item); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + spinner.setAdapter(adapter); + + final Calendar c = Calendar.getInstance(); + year = c.get(Calendar.YEAR); + month = c.get(Calendar.MONTH); + day = c.get(Calendar.DAY_OF_MONTH); + hour = c.get(Calendar.HOUR_OF_DAY); + minute = c.get(Calendar.MINUTE); + + txtDay = (EditText) findViewById(R.id.txt_report_date); + txtTime = (EditText) findViewById(R.id.txt_report_time); + + txtDay.setText(new StringBuilder() + .append(day).append("-").append(month + 1).append("-") + .append(year).append(" ")); + + txtTime.setText(new StringBuilder().append(hour) + .append(":").append(minute).append(" ")); + + txtDay.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showDialog(DATE_DIALOG_ID); + } + }); + + txtTime.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showDialog(TIME_DIALOG_ID); + } + }); } + @Override + protected Dialog onCreateDialog(int id) { + switch (id) { + case DATE_DIALOG_ID: + // set date picker as current date + return new DatePickerDialog(this, datePickerListener, + year, month,day); + case TIME_DIALOG_ID: + // set date picker as current date + return new TimePickerDialog(this, timePickerListener, + hour,minute,true); + } + return null; + } + + private DatePickerDialog.OnDateSetListener datePickerListener + = new DatePickerDialog.OnDateSetListener() { + + // when dialog box is closed, below method will be called. + public void onDateSet(DatePicker view, int selectedYear, + int selectedMonth, int selectedDay) { + year = selectedYear; + month = selectedMonth; + day = selectedDay; + + // set selected date into textview + txtDay.setText(new StringBuilder().append(day) + .append("-").append(month + 1).append("-").append(year) + .append(" ")); + } + }; + + private TimePickerDialog.OnTimeSetListener timePickerListener + = new TimePickerDialog.OnTimeSetListener() { + + // when dialog box is closed, below method will be called. + public void onTimeSet(TimePicker view, int selectedHour, + int selectedMinute) { + hour = selectedHour; + minute = selectedMinute; + + // set selected date into textview + txtTime.setText(new StringBuilder().append(hour) + .append(":").append(minute).append(" ")); + } + }; + @Override protected int getLayoutResourceId() { return R.layout.activity_report; diff --git a/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java b/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java index 21ccc1a..b07c19c 100644 --- a/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java @@ -1,19 +1,18 @@ 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"; + + private final static String mActivityTitle = "Settings"; + private final static String TAG = SettingsActivity.class.getSimpleName(); + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //setContentView(R.layout.activity_settings); } @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 5e81bcb..0790c5e 100644 --- a/app/src/main/java/org/deke/risk/riskahead/StartActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/StartActivity.java @@ -7,35 +7,27 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button; -import android.widget.TextView; -import android.widget.Toast; import org.deke.risk.riskahead.helper.SessionManager; - public class StartActivity extends AppCompatActivity { - public final static String EXTRA_MESSAGE = "com.mycompany.myfirstapp.MESSAGE"; + private final static String EXTRA_MESSAGE = "org.deke.risk.riskahead.MESSAGE"; + private final static String TAG = StartActivity.class.getSimpleName(); Button btnLogin; Button btnRegister; - private SessionManager session; - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_start); + btnLogin = (Button) findViewById(R.id.btn_start_login); btnRegister = (Button) findViewById(R.id.btn_start_register); - // Session manager - session = new SessionManager(getApplicationContext()); - - // Check if user is already logged in or not + SessionManager session = new SessionManager(getApplicationContext()); if (session.isLoggedIn()) { - // User is already logged in. Take him to main activity Intent intent = new Intent(StartActivity.this, MainActivity.class); startActivity(intent); finish(); @@ -70,12 +62,4 @@ public class StartActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } - - private boolean isEmpty(TextView etText) { - return etText.getText().toString().trim().length() == 0; - } - - public void showMessage(String statusText){ - Toast.makeText(this, statusText, Toast.LENGTH_LONG).show(); - } } diff --git a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java index fdad8bf..43beb4c 100644 --- a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java @@ -1,20 +1,18 @@ 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"; + + private final static String mActivityTitle = "Subscriptions"; + private final static String TAG = StartActivity.class.getSimpleName(); @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //setContentView(R.layout.activity_subscriptions); } @Override diff --git a/app/src/main/java/org/deke/risk/riskahead/fragments/TwitterButtonFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragments/TwitterButtonFragment.java index 339e584..3936b50 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragments/TwitterButtonFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragments/TwitterButtonFragment.java @@ -10,8 +10,6 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; -import android.widget.ImageButton; import android.widget.Toast; import io.fabric.sdk.android.Fabric; @@ -83,7 +81,7 @@ public class TwitterButtonFragment extends Fragment { @Override public void failure(TwitterException exception) { Log.e("Debug", "onFailure wird ausgeführt"); - showMessage("Twitter Login failed with exception " + exception.getMessage().toString()); + showMessage("Twitter Login failed with exception " + exception.getMessage()); } }); } 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 85efb19..fc074d6 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 @@ -29,16 +29,19 @@ import java.util.HashMap; public abstract class BaseActivity extends AppCompatActivity { + private final static String EXTRA_MESSAGE = "org.deke.risk.riskahead.MESSAGE"; + private final static String TAG = BaseActivity.class.getSimpleName(); + private ActionBarDrawerToggle mDrawerToggle; private DrawerLayout mDrawerLayout; private ListView mDrawerList; private ArrayAdapter mAdapter; private ShareActionProvider mShareActionProvider; + private SQLiteHandler db; private SessionManager session; - public HashMap user; - public final static String EXTRA_MESSAGE = "com.mycompany.myfirstapp.MESSAGE"; + public HashMap user; @Override protected void onCreate(Bundle savedInstanceState) { @@ -55,9 +58,7 @@ public abstract class BaseActivity extends AppCompatActivity { logoutUser(); } - // Fetching user details from sqlite user = db.getUserDetails(); - // Get the SearchView and set the searchable configuration mDrawerList = (ListView)findViewById(R.id.navList); mDrawerLayout = (DrawerLayout)findViewById(R.id.drawer_layout); @@ -98,8 +99,6 @@ public abstract class BaseActivity extends AppCompatActivity { setShareIntent(); getMenuInflater().inflate(R.menu.menu_login, menu); - - return true; } diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java b/app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java index 427ee9c..1ac0876 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java @@ -92,7 +92,7 @@ public class PlaceProvider extends ContentProvider { // Finding latitude and longitude for each places using Google Places Details API for(int i=0;i hMap = (HashMap) list.get(i); + HashMap hMap = list.get(i); detailsParser =new PlaceJSONParserDetail(); @@ -135,7 +135,7 @@ public class PlaceProvider extends ContentProvider { // Creating cursor object with places for(int i=0;i hMap = (HashMap) list.get(i); + HashMap hMap = list.get(i); // Adding place details to cursor mCursor.addRow(new String[] { Integer.toString(i), hMap.get("description"), hMap.get("reference") }); diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/SessionManager.java b/app/src/main/java/org/deke/risk/riskahead/helper/SessionManager.java index cd9fdc9..74c79e9 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/SessionManager.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/SessionManager.java @@ -6,19 +6,15 @@ import android.content.SharedPreferences.Editor; import android.util.Log; public class SessionManager { - // LogCat tag private static String TAG = SessionManager.class.getSimpleName(); - // Shared Preferences SharedPreferences pref; Editor editor; Context _context; - // Shared pref mode int PRIVATE_MODE = 0; - // Shared preferences file name private static final String PREF_NAME = "AndroidHiveLogin"; private static final String KEY_IS_LOGGEDIN = "isLoggedIn"; @@ -30,12 +26,8 @@ public class SessionManager { } public void setLogin(boolean isLoggedIn) { - editor.putBoolean(KEY_IS_LOGGEDIN, isLoggedIn); - - // commit changes editor.commit(); - Log.d(TAG, "User login session modified!"); } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index f2d0134..63eb97f 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -8,20 +8,21 @@ android:orientation="vertical" tools:context=".LoginActivity"> - + android:textStyle="bold" /> + android:layout_below="@+id/lbl_login_title" /> - -