DT @01.12.2015: Kleine Bugs behoben (PositionBtn in ViewReport wurde nicht angezeigt, Menu in ProfileActivity wurde nicht angezeigt)
This commit is contained in:
@@ -3,13 +3,10 @@ package org.deke.risk.riskahead;
|
|||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.TableLayout;
|
import android.widget.TableLayout;
|
||||||
import android.widget.TableRow;
|
import android.widget.TableRow;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.android.volley.Request;
|
import com.android.volley.Request;
|
||||||
import com.android.volley.Response;
|
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
|
@Override
|
||||||
protected int getLayoutResourceId() {
|
protected int getLayoutResourceId() {
|
||||||
return R.layout.activity_profile;
|
return R.layout.activity_profile;
|
||||||
|
|||||||
@@ -51,8 +51,6 @@ public class ViewReportActivity extends BaseActivity {
|
|||||||
Intent intent = getIntent();
|
Intent intent = getIntent();
|
||||||
final String uid = intent.getStringExtra(BaseActivity.EXTRA_MESSAGE);
|
final String uid = intent.getStringExtra(BaseActivity.EXTRA_MESSAGE);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
txtTitle = (EditText) findViewById(R.id.input_viewreport_short);
|
txtTitle = (EditText) findViewById(R.id.input_viewreport_short);
|
||||||
txtDescription = (EditText) findViewById(R.id.input_viewreport_long);
|
txtDescription = (EditText) findViewById(R.id.input_viewreport_long);
|
||||||
txtCrimeCategory = (EditText) findViewById(R.id.input_viewreport_category);
|
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"))){
|
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);
|
findViewById(R.id.ll_01).setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
String errorMsg = jObj.getString("error_msg");
|
String errorMsg = jObj.getString("error_msg");
|
||||||
Log.e(TAG, "Error get incident (Server returned error): " + errorMsg);
|
Log.e(TAG, "Error get incident (Server returned error): " + errorMsg);
|
||||||
|
|||||||
@@ -150,14 +150,14 @@
|
|||||||
|
|
||||||
<com.beardedhen.androidbootstrap.BootstrapButton
|
<com.beardedhen.androidbootstrap.BootstrapButton
|
||||||
android:id="@+id/btn_viewreport_position"
|
android:id="@+id/btn_viewreport_position"
|
||||||
|
android:layout_marginTop="3dp"
|
||||||
bootstrap:bootstrapText="@string/btn_report_position"
|
bootstrap:bootstrapText="@string/btn_report_position"
|
||||||
|
android:layout_below="@+id/lbl_viewreport_position"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
bootstrap:bootstrapBrand="primary"
|
bootstrap:bootstrapBrand="primary"
|
||||||
bootstrap:roundedCorners="true"
|
bootstrap:roundedCorners="true"
|
||||||
bootstrap:bootstrapSize="lg"
|
bootstrap:bootstrapSize="lg"
|
||||||
android:layout_marginTop="3dp"
|
|
||||||
android:layout_below="@+id/lbl_viewreport_position"
|
|
||||||
android:layout_alignParentLeft="true"
|
android:layout_alignParentLeft="true"
|
||||||
android:layout_alignParentStart="true" />
|
android:layout_alignParentStart="true" />
|
||||||
|
|
||||||
@@ -168,8 +168,8 @@
|
|||||||
android:id="@+id/lbl_viewreport_position_detail"
|
android:id="@+id/lbl_viewreport_position_detail"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_below="@+id/input_viewreport_position"
|
android:layout_below="@+id/input_viewreport_position"
|
||||||
android:layout_alignParentLeft="@+id/input_viewreport_position"
|
android:layout_alignLeft="@+id/input_viewreport_position"
|
||||||
android:layout_alignParentStart="@+id/input_viewreport_position" />
|
android:layout_alignStart="@+id/input_viewreport_position" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
|
|||||||
Reference in New Issue
Block a user