eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-20 04:35:32 +00:00
Code Activity

fixed Buoy AlertDialogs

Browse Source
This commit is contained in:
Peter Siegmund
2016-07-19 13:51:51 +02:00
parent ee4e9cd68c
commit 4d86e764f7
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
+4 -4
View File
@@ -1,6 +1,5 @@
package com.sap.sailing.android.buoy.positioning.app.ui.activities;
import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
@@ -9,6 +8,7 @@ import android.content.ServiceConnection;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.os.IBinder;
import android.support.v7.app.AlertDialog;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -167,16 +167,16 @@ public class RegattaActivity extends AbstractRegattaActivity {
}
private void displayCheckoutConfirmationDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.AppTheme_AlertDialog);
builder.setTitle(R.string.warning);
builder.setMessage(R.string.checkout_warning_message);
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
builder.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
checkOut();
}
});
builder.setNegativeButton(R.string.no, null);
builder.setNegativeButton(android.R.string.no, null);
builder.show();
}
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+2 -2
View File
@@ -2,7 +2,6 @@ package com.sap.sailing.android.buoy.positioning.app.ui.fragments;
import java.text.DecimalFormat;
import android.app.AlertDialog;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.BroadcastReceiver;
@@ -16,6 +15,7 @@ import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Bundle;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.app.AlertDialog;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -133,7 +133,7 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
private void checkGPS() {
if (lastKnownLocation == null) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog)
.setMessage(R.string.error_message_no_position)
.setPositiveButton(android.R.string.ok, null);
if (!LocationHelper.isGPSEnabled(getActivity())) {
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
+10 -11
View File
@@ -15,6 +15,13 @@ import org.json.JSONException;
import org.json.JSONObject;
import org.json.simple.parser.ParseException;
import android.content.Context;
import android.content.DialogInterface;
import android.net.Uri;
import android.support.v7.app.AlertDialog;
import android.util.Log;
import android.widget.Toast;
import com.sap.sailing.android.buoy.positioning.app.R;
import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData;
import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkInfo;
@@ -40,13 +47,6 @@ import com.sap.sailing.server.gateway.serialization.coursedata.impl.MarkJsonSeri
import com.sap.sailing.server.gateway.serialization.impl.FlatGPSFixJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.MarkJsonSerializerWithPosition;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.net.Uri;
import android.util.Log;
import android.widget.Toast;
public class CheckinManager {
private final static String TAG = CheckinManager.class.getName();
private BaseCheckinData checkinData;
@@ -279,10 +279,10 @@ public class CheckinManager {
* Shows a pop-up-dialog that informs the user than an API-call has failed and recommends a retry.
*/
private void displayAPIErrorRecommendRetry() {
AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
AlertDialog.Builder builder = new AlertDialog.Builder(mContext, R.style.AppTheme_AlertDialog);
builder.setMessage(mContext.getString(R.string.notify_user_api_call_failed));
builder.setCancelable(true);
builder.setPositiveButton(mContext.getString(R.string.ok), new DialogInterface.OnClickListener() {
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -290,8 +290,7 @@ public class CheckinManager {
}
});
AlertDialog alert = builder.create();
alert.show();
builder.show();
setCheckinData(null);
}