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 7072982..6394a83 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java @@ -3,13 +3,10 @@ package org.deke.risk.riskahead; import android.graphics.Color; import android.os.Bundle; import android.util.Log; -import android.view.Menu; -import android.view.MenuItem; import android.view.View; import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Request; import com.android.volley.Response; @@ -57,19 +54,6 @@ public class ProfileActivity extends BaseActivity { }); } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_common, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - - return super.onOptionsItemSelected(item); - } - @Override protected int getLayoutResourceId() { return R.layout.activity_profile; diff --git a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java index f016807..ce003f0 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java @@ -51,8 +51,6 @@ public class ViewReportActivity extends BaseActivity { Intent intent = getIntent(); final String uid = intent.getStringExtra(BaseActivity.EXTRA_MESSAGE); - - txtTitle = (EditText) findViewById(R.id.input_viewreport_short); txtDescription = (EditText) findViewById(R.id.input_viewreport_long); txtCrimeCategory = (EditText) findViewById(R.id.input_viewreport_category); @@ -236,11 +234,9 @@ public class ViewReportActivity extends BaseActivity { }); if(!incident.getString("fid_user").equals(user.get("uid"))){ - findViewById(R.id.btn_viewreport_position).setVisibility(View.GONE); findViewById(R.id.ll_01).setVisibility(View.GONE); } - } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error get incident (Server returned error): " + errorMsg); diff --git a/app/src/main/res/layout/activity_view_report.xml b/app/src/main/res/layout/activity_view_report.xml index 201134c..1a68f1d 100644 --- a/app/src/main/res/layout/activity_view_report.xml +++ b/app/src/main/res/layout/activity_view_report.xml @@ -150,14 +150,14 @@ @@ -168,8 +168,8 @@ android:id="@+id/lbl_viewreport_position_detail" android:layout_alignParentRight="true" android:layout_below="@+id/input_viewreport_position" - android:layout_alignParentLeft="@+id/input_viewreport_position" - android:layout_alignParentStart="@+id/input_viewreport_position" /> + android:layout_alignLeft="@+id/input_viewreport_position" + android:layout_alignStart="@+id/input_viewreport_position" />