From 304e2a476c78eccf42cc9229c55909ca1e26f727 Mon Sep 17 00:00:00 2001 From: Bennet Brunsen Date: Thu, 14 Jul 2016 17:01:39 +0200 Subject: [PATCH 01/10] Store team image for each competitor --- .../app/ui/activities/RegattaActivity.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java index 533eee2d5bf..6e8298d2a8a 100755 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java @@ -233,7 +233,7 @@ public class RegattaActivity extends AbstractRegattaActivity } private void setTeamImage(ImageView imageView, int width, int height) { - String fileName = getLeaderboardImageFileName(leaderboard.name); + String fileName = getTeamImageFileName(leaderboard.name, competitor.name); Bitmap storedImage = getStoredImage(fileName, width, height); if (storedImage == null) { askServerAboutTeamImageUrl(imageView); @@ -303,7 +303,7 @@ public class RegattaActivity extends AbstractRegattaActivity * @param bitmap */ public void updateLeaderboardPictureChosenByUser(final Bitmap bitmap) { - storeImageAndSendToServer(bitmap, getLeaderboardImageFileName(leaderboard.name), true); + storeImageAndSendToServer(bitmap, getTeamImageFileName(leaderboard.name, competitor.name), true); runOnUiThread(new Runnable() { @Override public void run() { @@ -435,8 +435,8 @@ public class RegattaActivity extends AbstractRegattaActivity setUpView(); } - private String getLeaderboardImageFileName(String leaderboardName) { - return LEADERBOARD_IMAGE_FILENAME_PREFIX + leaderboardName; + private String getTeamImageFileName(String leaderboardName, String competitorName) { + return LEADERBOARD_IMAGE_FILENAME_PREFIX + leaderboardName + "_" + competitorName; } private String getFlagImageFileName(String countryCode) { @@ -486,7 +486,7 @@ public class RegattaActivity extends AbstractRegattaActivity public void performAction(JSONObject response) { DatabaseHelper.getInstance().deleteRegattaFromDatabase(RegattaActivity.this, event.checkinDigest); - deleteImageFile(getLeaderboardImageFileName(leaderboard.name)); + deleteImageFile(getTeamImageFileName(leaderboard.name, competitor.name)); dismissProgressDialog(); finish(); } @@ -546,7 +546,7 @@ public class RegattaActivity extends AbstractRegattaActivity public void retryUpload(View view) { if (prefs.hasFailedUpload(leaderboard.name)) { - pictureFile = getImageFile(getLeaderboardImageFileName(leaderboard.name)); + pictureFile = getImageFile(getTeamImageFileName(leaderboard.name, competitor.name)); } if (pictureFile != null) { sendTeamImageToServer(pictureFile); @@ -608,7 +608,7 @@ public class RegattaActivity extends AbstractRegattaActivity FileOutputStream outputStream = null; try { in = new java.net.URL(downloadUrl).openStream(); - imageFile = getImageFile(getLeaderboardImageFileName(leaderboard.name)); + imageFile = getImageFile(getTeamImageFileName(leaderboard.name, competitor.name)); if (!imageFile.exists()) { imageFile.createNewFile(); } From 39473822514a58dae899466541bd94d0d1f1789c Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 19 Jul 2016 08:40:10 +0200 Subject: [PATCH 02/10] fixed "No QR Code" alertDialog (positivButton was invisible) --- .../ui/activities/AbstractBaseActivity.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractBaseActivity.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractBaseActivity.java index a9650547d2f..2e26a8e7ea1 100644 --- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractBaseActivity.java +++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractBaseActivity.java @@ -1,11 +1,11 @@ package com.sap.sailing.android.shared.ui.activities; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.DialogInterface; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.support.v7.app.AlertDialog; import com.sap.sailing.android.shared.logging.ExLog; @@ -54,18 +54,17 @@ public abstract class AbstractBaseActivity extends SendingServiceAwareActivity { } public void showErrorPopup(String title, String message) { - AlertDialog dialog = new AlertDialog.Builder(this).setTitle(title).setMessage(message) - .setIcon(android.R.drawable.ic_dialog_alert) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + new AlertDialog.Builder(this) + .setTitle(title) + .setMessage(message) + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { dialog.dismiss(); } - }).create(); - - dialog.show(); + }).show(); } - public void showErrorPopup(int string1Id, int string2Id) { - showErrorPopup(getString(string1Id), getString(string2Id)); + public void showErrorPopup(int title, int message) { + showErrorPopup(getString(title), getString(message)); } } From 22831672e5fc8be0b8d4ee7172358a4568bc9bf8 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 19 Jul 2016 08:55:01 +0200 Subject: [PATCH 03/10] switched AlertDialog to support lib for correct styling --- .../app/ui/activities/RegattaActivity.java | 2 +- .../app/ui/fragments/BuoyFragment.java | 2 +- .../positioning/app/util/CheckinManager.java | 17 ++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java index 3f6434adb0f..65b5263d3c5 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java @@ -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; diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java index 481b5fb247e..d15ab5463ad 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java @@ -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; diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java index 9af0673f32a..8c34f760ab6 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java @@ -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; @@ -290,8 +290,7 @@ public class CheckinManager { } }); - AlertDialog alert = builder.create(); - alert.show(); + builder.show(); setCheckinData(null); } From a423a580add12683c49fcee1d2373d832860b098 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 19 Jul 2016 08:55:35 +0200 Subject: [PATCH 04/10] used system default button texts on AlertDialog --- .../buoy/positioning/app/ui/activities/RegattaActivity.java | 4 ++-- .../android/buoy/positioning/app/util/CheckinManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java index 65b5263d3c5..fffb9421a9e 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java @@ -170,13 +170,13 @@ public class RegattaActivity extends AbstractRegattaActivity { AlertDialog.Builder builder = new AlertDialog.Builder(this); 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.ok, 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(); } diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java index 8c34f760ab6..f189e729159 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java @@ -282,7 +282,7 @@ public class CheckinManager { AlertDialog.Builder builder = new AlertDialog.Builder(mContext); 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) { From 1122dbe85b169ef918af83662dabd40024d377c3 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 19 Jul 2016 08:56:21 +0200 Subject: [PATCH 05/10] set minHeight for list view row of marks --- .../res/layout/mark_listview_row.xml | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml index c7c2e979ad6..8663f78eeac 100644 --- a/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml +++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml @@ -1,24 +1,26 @@ + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + android:layout_height="wrap_content" + android:background="@color/list_item_background_color" + android:minHeight="@dimen/list_row_height"> + android:textColor="@color/fiori_text_color" /> + android:maxLines="1" + android:textColor="@color/fiori_text_color" + android:textSize="20sp" /> + android:maxLines="1" + android:textColor="@color/fiori_text_color" + android:textSize="14sp" /> From 6a995e79da4379d3134e9c37b20806210822a984 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 19 Jul 2016 09:53:24 +0200 Subject: [PATCH 06/10] fixed mark details fragment for huge fonts --- .../res/values/dimens.xml | 1 + .../layout/fragment_buoy_postion_detail.xml | 61 ++++++++++--------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/mobile/com.sap.sailing.android.shared/res/values/dimens.xml b/mobile/com.sap.sailing.android.shared/res/values/dimens.xml index 14e742df84d..ec8dcb461d3 100644 --- a/mobile/com.sap.sailing.android.shared/res/values/dimens.xml +++ b/mobile/com.sap.sailing.android.shared/res/values/dimens.xml @@ -37,6 +37,7 @@ 50dp 80dp 10dp + 5dp 10dp diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml index 6da4dc2b485..8930f7bf9e3 100644 --- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml +++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml @@ -1,18 +1,16 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/fiori_main_background" + android:orientation="vertical"> + android:layout_weight="1" /> @@ -20,16 +18,19 @@ - + android:background="@color/list_item_background_color" + android:orientation="vertical"> + + android:paddingTop="@dimen/list_side_margin"> + android:textSize="20sp" /> + tools:text="ca. 13m" /> + android:layout_marginStart="@dimen/signal_quality_indicator_left_margin" /> - + + android:layout_height="wrap_content" + android:background="@color/list_item_background_color" + android:orientation="vertical"> + android:paddingTop="@dimen/list_side_margin"> + android:textSize="20sp" /> + tools:text="11,4m" /> - + @@ -109,6 +114,6 @@ android:background="@drawable/position_send_button" android:textAllCaps="false" android:textSize="18sp" - android:textStyle="bold"/> + android:textStyle="bold" /> \ No newline at end of file From ca1fdb0ec50819bdfe2c600add580382f4117f88 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 19 Jul 2016 11:26:06 +0200 Subject: [PATCH 07/10] optimized screens for huge fonts (small devices) --- .../res/layout-land/fragment_home.xml | 29 ++++----- .../res/layout/fragment_home.xml | 19 +++--- .../res/values-land/dimens.xml | 1 + .../fragment_buoy_postion_detail.xml | 65 +++++++++---------- .../layout/fragment_buoy_postion_overview.xml | 23 +++---- 5 files changed, 63 insertions(+), 74 deletions(-) diff --git a/mobile/com.sap.sailing.android.shared/res/layout-land/fragment_home.xml b/mobile/com.sap.sailing.android.shared/res/layout-land/fragment_home.xml index 6d1436f151d..69fde6d5383 100644 --- a/mobile/com.sap.sailing.android.shared/res/layout-land/fragment_home.xml +++ b/mobile/com.sap.sailing.android.shared/res/layout-land/fragment_home.xml @@ -1,8 +1,8 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/fiori_main_background"> - + android:src="@drawable/working_title" /> + android:textColor="@color/fiori_text_color" /> + android:orientation="horizontal">