From 553f064ce0435da1a8c5a26888a853548fcbfac4 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Sat, 20 Nov 2021 14:42:05 +0100
Subject: [PATCH 01/19] Optimize Imports

---
 .../btools/routingapp/BInstallerActivity.java |  8 +++---
 .../btools/routingapp/BInstallerView.java     | 25 +++++--------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 9fdbc76..9b58547 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -1,8 +1,5 @@
 package btools.routingapp;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -16,9 +13,10 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
-import android.speech.tts.TextToSpeech.OnInitListener;
 import android.os.StatFs;
-import android.util.Log;
+
+import java.util.HashSet;
+import java.util.Set;
 
 public class BInstallerActivity extends Activity {
 
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index f262cfc..2752b8e 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -1,15 +1,5 @@
 package btools.routingapp;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Locale;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -20,21 +10,18 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.os.AsyncTask;
-import android.os.PowerManager;
-import android.os.StatFs;
-import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Toast;
 
-import btools.mapaccess.PhysicalFile;
-import btools.mapaccess.Rd5DiffManager;
-import btools.mapaccess.Rd5DiffTool;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Locale;
+
 import btools.router.RoutingHelper;
-import btools.util.ProgressListener;
 
 public class BInstallerView extends View {
   private static final int MASK_SELECTED_RD5 = 1;

From 89ef74f95b6c67549309588f1a721b4d52c0e33d Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Tue, 19 Oct 2021 06:00:04 +0200
Subject: [PATCH 02/19] Android Studio automatic cleanup

---
 .../btools/routingapp/BInstallerActivity.java |  29 ++--
 .../btools/routingapp/BInstallerView.java     | 125 ++++++++----------
 2 files changed, 65 insertions(+), 89 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 9b58547..e42b3d0 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -28,20 +28,7 @@ public class BInstallerActivity extends Activity {
   private PowerManager mPowerManager;
   private WakeLock mWakeLock;
   private DownloadReceiver myReceiver;
-
-
-  public class DownloadReceiver extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      if (intent.hasExtra("txt")) {
-        String txt = intent.getStringExtra("txt");
-        boolean ready = intent.getBooleanExtra("ready", false);
-        mBInstallerView.setState(txt, ready);
-      }
-    }
-  }
-
+  private final Set<Integer> dialogIds = new HashSet<Integer>();
 
   /**
    * Called when the activity is first created.
@@ -132,8 +119,6 @@ public class BInstallerActivity extends Activity {
     showDialog(DIALOG_CONFIRM_DELETE_ID);
   }
 
-  private Set<Integer> dialogIds = new HashSet<Integer>();
-
   private void showNewDialog(int id) {
     if (dialogIds.contains(Integer.valueOf(id))) {
       removeDialog(id);
@@ -142,6 +127,18 @@ public class BInstallerActivity extends Activity {
     showDialog(id);
   }
 
+  public class DownloadReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      if (intent.hasExtra("txt")) {
+        String txt = intent.getStringExtra("txt");
+        boolean ready = intent.getBooleanExtra("ready", false);
+        mBInstallerView.setState(txt, ready);
+      }
+    }
+  }
+
 
   static public long getAvailableSpace(String baseDir) {
     StatFs stat = new StatFs(baseDir);
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 2752b8e..0ba2448 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -28,50 +28,63 @@ public class BInstallerView extends View {
   private static final int MASK_DELETED_RD5 = 2;
   private static final int MASK_INSTALLED_RD5 = 4;
   private static final int MASK_CURRENT_RD5 = 8;
-
-  private int imgwOrig;
-  private int imghOrig;
-  private float scaleOrig;
-
-  private int imgw;
-  private int imgh;
-
-  private float lastDownX;
-  private float lastDownY;
-
-  private Bitmap bmp;
-
-  private float viewscale;
-
-  private float[] testVector = new float[2];
-
-  private int[] tileStatus;
-
-  private boolean tilesVisible = false;
-
-  private long availableSize;
-  private File baseDir;
-  private File segmentDir;
-
-  private boolean isDownloading = false;
   public static boolean downloadCanceled = false;
-
-  private long currentDownloadSize;
-  private String currentDownloadFile = "";
-  private volatile String currentDownloadOperation = "";
-  private String downloadAction = "";
-  private volatile String newDownloadAction = "";
-
-  private long totalSize = 0;
-  private long rd5Tiles = 0;
-  private long delTiles = 0;
-
   Paint pnt_1 = new Paint();
   Paint pnt_2 = new Paint();
   Paint paint = new Paint();
-
   Activity mActivity;
+  int btnh = 40;
+  int btnw = 160;
+  float tx, ty;
+  private final int imgwOrig;
+  private final int imghOrig;
+  private final float scaleOrig;
+  private final int imgw;
+  private final int imgh;
+  private float lastDownX;
+  private float lastDownY;
+  private Bitmap bmp;
+  private float viewscale;
+  private final float[] testVector = new float[2];
+  private int[] tileStatus;
+  private boolean tilesVisible = false;
+  private long availableSize;
+  private File baseDir;
+  private File segmentDir;
+  private boolean isDownloading = false;
+  private long currentDownloadSize;
+  private final String currentDownloadFile = "";
+  private volatile String currentDownloadOperation = "";
+  private String downloadAction = "";
+  private final String newDownloadAction = "";
+  private long totalSize = 0;
+  private long rd5Tiles = 0;
+  private long delTiles = 0;
+  private Matrix mat;
+  private final Matrix matText;
 
+  public BInstallerView(Context context) {
+    super(context);
+    mActivity = (Activity) context;
+
+    DisplayMetrics metrics = new DisplayMetrics();
+    ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(metrics);
+    imgwOrig = metrics.widthPixels;
+    imghOrig = metrics.heightPixels;
+    int im = imgwOrig > imghOrig ? imgwOrig : imghOrig;
+
+    scaleOrig = im / 480.f;
+
+    matText = new Matrix();
+    matText.preScale(scaleOrig, scaleOrig);
+
+    imgw = (int) (imgwOrig / scaleOrig);
+    imgh = (int) (imghOrig / scaleOrig);
+
+    totalSize = 0;
+    rd5Tiles = 0;
+    delTiles = 0;
+  }
 
   protected String baseNameForTile(int tileIndex) {
     int lon = (tileIndex % 72) * 5 - 180;
@@ -100,7 +113,6 @@ public class BInstallerView extends View {
     return (ilon + 180) / 5 + 72 * ((ilat + 90) / 5);
   }
 
-
   public boolean isDownloadCanceled() {
     return downloadCanceled;
   }
@@ -167,7 +179,6 @@ public class BInstallerView extends View {
     deleteRawTracks(); // invalidate raw-tracks after data update
   }
 
-
   public void downloadDone(boolean success) {
     isDownloading = false;
     if (success) {
@@ -234,7 +245,7 @@ public class BInstallerView extends View {
 
     availableSize = -1;
     try {
-      availableSize = (long) ((BInstallerActivity) getContext()).getAvailableSpace(baseDir.getAbsolutePath());
+      availableSize = ((BInstallerActivity) getContext()).getAvailableSpace(baseDir.getAbsolutePath());
       //StatFs stat = new StatFs(baseDir.getAbsolutePath ());
       //availableSize = (long)stat.getAvailableBlocksLong()*stat.getBlockSizeLong();
     } catch (Exception e) { /* ignore */ }
@@ -256,9 +267,6 @@ public class BInstallerView extends View {
     }
   }
 
-  private Matrix mat;
-  private Matrix matText;
-
   public void startInstaller() {
 
     baseDir = ConfigHelper.getBaseDir(getContext());
@@ -285,29 +293,6 @@ public class BInstallerView extends View {
     tilesVisible = false;
   }
 
-  public BInstallerView(Context context) {
-    super(context);
-    mActivity = (Activity) context;
-
-    DisplayMetrics metrics = new DisplayMetrics();
-    ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(metrics);
-    imgwOrig = metrics.widthPixels;
-    imghOrig = metrics.heightPixels;
-    int im = imgwOrig > imghOrig ? imgwOrig : imghOrig;
-
-    scaleOrig = im / 480.f;
-
-    matText = new Matrix();
-    matText.preScale(scaleOrig, scaleOrig);
-
-    imgw = (int) (imgwOrig / scaleOrig);
-    imgh = (int) (imghOrig / scaleOrig);
-
-    totalSize = 0;
-    rd5Tiles = 0;
-    delTiles = 0;
-  }
-
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     super.onSizeChanged(w, h, oldw, oldh);
@@ -411,12 +396,6 @@ public class BInstallerView extends View {
     }
   }
 
-  int btnh = 40;
-  int btnw = 160;
-
-
-  float tx, ty;
-
   private void drawSelectedTiles(Canvas canvas, Paint pnt, float fw, float fh, int status, int mask, boolean doCount, boolean cntDel, boolean doDraw) {
     for (int ix = 0; ix < 72; ix++)
       for (int iy = 0; iy < 36; iy++) {

From de7dd71a944e7120a3111b52bc288069c61bcf28 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Tue, 19 Oct 2021 06:06:34 +0200
Subject: [PATCH 03/19] Apply Quick Fixes suggested by Android Studio

---
 .../btools/routingapp/BInstallerActivity.java |  6 +--
 .../btools/routingapp/BInstallerView.java     | 48 ++-----------------
 2 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index e42b3d0..1b80c6b 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -28,7 +28,7 @@ public class BInstallerActivity extends Activity {
   private PowerManager mPowerManager;
   private WakeLock mWakeLock;
   private DownloadReceiver myReceiver;
-  private final Set<Integer> dialogIds = new HashSet<Integer>();
+  private final Set<Integer> dialogIds = new HashSet<>();
 
   /**
    * Called when the activity is first created.
@@ -120,10 +120,10 @@ public class BInstallerActivity extends Activity {
   }
 
   private void showNewDialog(int id) {
-    if (dialogIds.contains(Integer.valueOf(id))) {
+    if (dialogIds.contains(id)) {
       removeDialog(id);
     }
-    dialogIds.add(Integer.valueOf(id));
+    dialogIds.add(id);
     showDialog(id);
   }
 
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 0ba2448..a209bf7 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -13,7 +13,6 @@ import android.graphics.Paint;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.Toast;
 
 import java.io.File;
 import java.io.IOException;
@@ -52,11 +51,8 @@ public class BInstallerView extends View {
   private File baseDir;
   private File segmentDir;
   private boolean isDownloading = false;
-  private long currentDownloadSize;
-  private final String currentDownloadFile = "";
   private volatile String currentDownloadOperation = "";
   private String downloadAction = "";
-  private final String newDownloadAction = "";
   private long totalSize = 0;
   private long rd5Tiles = 0;
   private long delTiles = 0;
@@ -71,7 +67,7 @@ public class BInstallerView extends View {
     ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(metrics);
     imgwOrig = metrics.widthPixels;
     imghOrig = metrics.heightPixels;
-    int im = imgwOrig > imghOrig ? imgwOrig : imghOrig;
+    int im = Math.max(imgwOrig, imghOrig);
 
     scaleOrig = im / 480.f;
 
@@ -80,10 +76,6 @@ public class BInstallerView extends View {
 
     imgw = (int) (imgwOrig / scaleOrig);
     imgh = (int) (imghOrig / scaleOrig);
-
-    totalSize = 0;
-    rd5Tiles = 0;
-    delTiles = 0;
   }
 
   protected String baseNameForTile(int tileIndex) {
@@ -113,10 +105,6 @@ public class BInstallerView extends View {
     return (ilon + 180) / 5 + 72 * ((ilat + 90) / 5);
   }
 
-  public boolean isDownloadCanceled() {
-    return downloadCanceled;
-  }
-
   private void toggleDownload() {
     if (isDownloading) {
       downloadCanceled = true;
@@ -129,7 +117,6 @@ public class BInstallerView extends View {
       return;
     }
 
-    int tidx_min = -1;
     int min_size = Integer.MAX_VALUE;
 
     ArrayList<Integer> downloadList = new ArrayList<>();
@@ -141,7 +128,6 @@ public class BInstallerView extends View {
           int tilesize = BInstallerSizes.getRd5Size(tidx);
           downloadList.add(tidx);
           if (tilesize > 0 && tilesize < min_size) {
-            tidx_min = tidx;
             min_size = tilesize;
           }
         }
@@ -152,7 +138,7 @@ public class BInstallerView extends View {
       isDownloading = true;
       downloadAll(downloadList);
       for (Integer i : downloadList) {
-        tileStatus[i.intValue()] ^= tileStatus[i.intValue()] & MASK_SELECTED_RD5;
+        tileStatus[i] ^= tileStatus[i] & MASK_SELECTED_RD5;
       }
       downloadList.clear();
     }
@@ -161,7 +147,7 @@ public class BInstallerView extends View {
   private void downloadAll(ArrayList<Integer> downloadList) {
     ArrayList<String> urlparts = new ArrayList<>();
     for (Integer i : downloadList) {
-      urlparts.add(baseNameForTile(i.intValue()));
+      urlparts.add(baseNameForTile(i));
     }
 
     currentDownloadOperation = "Start download ...";
@@ -169,8 +155,6 @@ public class BInstallerView extends View {
     downloadCanceled = false;
     isDownloading = true;
 
-    //final DownloadBackground downloadTask = new DownloadBackground(getContext(), urlparts, baseDir);
-    //downloadTask.execute(  );
     Intent intent = new Intent(mActivity, DownloadService.class);
     intent.putExtra("dir", baseDir.getAbsolutePath() + "/brouter/");
     intent.putExtra("urlparts", urlparts);
@@ -179,15 +163,6 @@ public class BInstallerView extends View {
     deleteRawTracks(); // invalidate raw-tracks after data update
   }
 
-  public void downloadDone(boolean success) {
-    isDownloading = false;
-    if (success) {
-      scanExistingFiles();
-      toggleDownload(); // keep on if no error
-    }
-    invalidate();
-  }
-
   public void setState(String txt, boolean b) {
     currentDownloadOperation = txt;
     downloadAction = "";
@@ -245,9 +220,7 @@ public class BInstallerView extends View {
 
     availableSize = -1;
     try {
-      availableSize = ((BInstallerActivity) getContext()).getAvailableSpace(baseDir.getAbsolutePath());
-      //StatFs stat = new StatFs(baseDir.getAbsolutePath ());
-      //availableSize = (long)stat.getAvailableBlocksLong()*stat.getBlockSizeLong();
+      availableSize = BInstallerActivity.getAvailableSpace(baseDir.getAbsolutePath());
     } catch (Exception e) { /* ignore */ }
   }
 
@@ -286,7 +259,7 @@ public class BInstallerView extends View {
     float scaleX = imgwOrig / ((float) bmp.getWidth());
     float scaley = imghOrig / ((float) bmp.getHeight());
 
-    viewscale = scaleX < scaley ? scaleX : scaley;
+    viewscale = Math.min(scaleX, scaley);
 
     mat = new Matrix();
     mat.postScale(viewscale, viewscale);
@@ -298,10 +271,6 @@ public class BInstallerView extends View {
     super.onSizeChanged(w, h, oldw, oldh);
   }
 
-  private void toast(String msg) {
-    Toast.makeText(getContext(), msg, Toast.LENGTH_LONG).show();
-  }
-
   @Override
   protected void onDraw(Canvas canvas) {
     if (!isDownloading) {
@@ -359,7 +328,6 @@ public class BInstallerView extends View {
     long mb = 1024 * 1024;
 
     if (isDownloading) {
-      String sizeHint = currentDownloadSize > 0 ? " (" + ((currentDownloadSize + mb - 1) / mb) + " MB)" : "";
       paint.setTextSize(30);
       canvas.drawText(currentDownloadOperation, 30, (imgh / 3) * 2 - 30, paint);
       //  canvas.drawText( currentDownloadOperation +  " " + currentDownloadFile + sizeHint, 30, (imgh/3)*2-30, paint);
@@ -443,12 +411,6 @@ public class BInstallerView extends View {
   @Override
   public boolean onTouchEvent(MotionEvent event) {
 
-    // get pointer index from the event object
-    int pointerIndex = event.getActionIndex();
-
-    // get pointer ID
-    int pointerId = event.getPointerId(pointerIndex);
-
     // get masked (not specific to a pointer) action
     int maskedAction = event.getActionMasked();
 

From dd7a2fcd98969bf34fe3f84ecfa9e1985cf70b82 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Tue, 4 Jan 2022 12:01:57 +0100
Subject: [PATCH 04/19] More Fixes

---
 .../btools/routingapp/BInstallerActivity.java | 38 ++++++-------------
 .../btools/routingapp/BInstallerView.java     | 14 +++----
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 1b80c6b..2c27b50 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -15,26 +15,31 @@ import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.StatFs;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public class BInstallerActivity extends Activity {
 
   public static final String DOWNLOAD_ACTION = "btools.routingapp.download";
 
   private static final int DIALOG_CONFIRM_DELETE_ID = 1;
-
   private BInstallerView mBInstallerView;
   private PowerManager mPowerManager;
   private WakeLock mWakeLock;
   private DownloadReceiver myReceiver;
-  private final Set<Integer> dialogIds = new HashSet<>();
+
+  static public long getAvailableSpace(String baseDir) {
+    StatFs stat = new StatFs(baseDir);
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      return stat.getAvailableBlocksLong() * stat.getBlockSizeLong();
+    } else {
+      //noinspection deprecation
+      return (long) stat.getAvailableBlocks() * stat.getBlockSize();
+    }
+  }
 
   /**
    * Called when the activity is first created.
    */
   @Override
-  @SuppressWarnings("deprecation")
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
@@ -91,7 +96,6 @@ public class BInstallerActivity extends Activity {
   }
 
   @Override
-  @SuppressWarnings("deprecation")
   protected Dialog onCreateDialog(int id) {
     AlertDialog.Builder builder;
     switch (id) {
@@ -114,19 +118,10 @@ public class BInstallerActivity extends Activity {
     }
   }
 
-  @SuppressWarnings("deprecation")
   public void showConfirmDelete() {
     showDialog(DIALOG_CONFIRM_DELETE_ID);
   }
 
-  private void showNewDialog(int id) {
-    if (dialogIds.contains(id)) {
-      removeDialog(id);
-    }
-    dialogIds.add(id);
-    showDialog(id);
-  }
-
   public class DownloadReceiver extends BroadcastReceiver {
 
     @Override
@@ -138,15 +133,4 @@ public class BInstallerActivity extends Activity {
       }
     }
   }
-
-
-  static public long getAvailableSpace(String baseDir) {
-    StatFs stat = new StatFs(baseDir);
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      return stat.getAvailableBlocksLong() * stat.getBlockSizeLong();
-    } else {
-      return stat.getAvailableBlocks() * stat.getBlockSize();
-    }
-  }
 }
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index a209bf7..d3c3199 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -28,6 +28,13 @@ public class BInstallerView extends View {
   private static final int MASK_INSTALLED_RD5 = 4;
   private static final int MASK_CURRENT_RD5 = 8;
   public static boolean downloadCanceled = false;
+  private final int imgwOrig;
+  private final int imghOrig;
+  private final float scaleOrig;
+  private final int imgw;
+  private final int imgh;
+  private final float[] testVector = new float[2];
+  private final Matrix matText;
   Paint pnt_1 = new Paint();
   Paint pnt_2 = new Paint();
   Paint paint = new Paint();
@@ -35,16 +42,10 @@ public class BInstallerView extends View {
   int btnh = 40;
   int btnw = 160;
   float tx, ty;
-  private final int imgwOrig;
-  private final int imghOrig;
-  private final float scaleOrig;
-  private final int imgw;
-  private final int imgh;
   private float lastDownX;
   private float lastDownY;
   private Bitmap bmp;
   private float viewscale;
-  private final float[] testVector = new float[2];
   private int[] tileStatus;
   private boolean tilesVisible = false;
   private long availableSize;
@@ -57,7 +58,6 @@ public class BInstallerView extends View {
   private long rd5Tiles = 0;
   private long delTiles = 0;
   private Matrix mat;
-  private final Matrix matText;
 
   public BInstallerView(Context context) {
     super(context);

From 64a80e763ba8d8b48bd2cadda045946f1a7f6254 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Tue, 19 Oct 2021 06:13:37 +0200
Subject: [PATCH 05/19] Merge startInstaller into constructor

---
 .../btools/routingapp/BInstallerActivity.java |  7 ---
 .../btools/routingapp/BInstallerView.java     | 61 +++++++++----------
 2 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 2c27b50..4a3ef2e 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -36,9 +36,6 @@ public class BInstallerActivity extends Activity {
     }
   }
 
-  /**
-   * Called when the activity is first created.
-   */
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -52,7 +49,6 @@ public class BInstallerActivity extends Activity {
 
     setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
 
-    // instantiate our simulation view and set it as the activity's content
     mBInstallerView = new BInstallerView(this);
     setContentView(mBInstallerView);
   }
@@ -72,9 +68,6 @@ public class BInstallerActivity extends Activity {
 
     myReceiver = new DownloadReceiver();
     registerReceiver(myReceiver, filter);
-
-    // Start the download manager
-    mBInstallerView.startInstaller();
   }
 
   @Override
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index d3c3199..f86188b 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -35,6 +35,12 @@ public class BInstallerView extends View {
   private final int imgh;
   private final float[] testVector = new float[2];
   private final Matrix matText;
+  private final File baseDir;
+  private final File segmentDir;
+  private final Matrix mat;
+  private final Bitmap bmp;
+  private final float viewscale;
+  private final int[] tileStatus;
   Paint pnt_1 = new Paint();
   Paint pnt_2 = new Paint();
   Paint paint = new Paint();
@@ -44,20 +50,14 @@ public class BInstallerView extends View {
   float tx, ty;
   private float lastDownX;
   private float lastDownY;
-  private Bitmap bmp;
-  private float viewscale;
-  private int[] tileStatus;
   private boolean tilesVisible = false;
   private long availableSize;
-  private File baseDir;
-  private File segmentDir;
   private boolean isDownloading = false;
   private volatile String currentDownloadOperation = "";
   private String downloadAction = "";
   private long totalSize = 0;
   private long rd5Tiles = 0;
   private long delTiles = 0;
-  private Matrix mat;
 
   public BInstallerView(Context context) {
     super(context);
@@ -76,6 +76,29 @@ public class BInstallerView extends View {
 
     imgw = (int) (imgwOrig / scaleOrig);
     imgh = (int) (imghOrig / scaleOrig);
+
+    baseDir = ConfigHelper.getBaseDir(getContext());
+    segmentDir = new File(baseDir, "brouter/segments4");
+
+    try {
+      AssetManager assetManager = getContext().getAssets();
+      InputStream istr = assetManager.open("world.png");
+      bmp = BitmapFactory.decodeStream(istr);
+      istr.close();
+    } catch (IOException io) {
+      throw new RuntimeException("cannot read world.png from assets");
+    }
+
+    tileStatus = new int[72 * 36];
+    scanExistingFiles();
+
+    float scaleX = imgwOrig / ((float) bmp.getWidth());
+    float scaley = imghOrig / ((float) bmp.getHeight());
+
+    viewscale = Math.min(scaleX, scaley);
+
+    mat = new Matrix();
+    mat.postScale(viewscale, viewscale);
   }
 
   protected String baseNameForTile(int tileIndex) {
@@ -240,32 +263,6 @@ public class BInstallerView extends View {
     }
   }
 
-  public void startInstaller() {
-
-    baseDir = ConfigHelper.getBaseDir(getContext());
-    segmentDir = new File(baseDir, "brouter/segments4");
-    try {
-      AssetManager assetManager = getContext().getAssets();
-      InputStream istr = assetManager.open("world.png");
-      bmp = BitmapFactory.decodeStream(istr);
-      istr.close();
-    } catch (IOException io) {
-      throw new RuntimeException("cannot read world.png from assets");
-    }
-
-    tileStatus = new int[72 * 36];
-    scanExistingFiles();
-
-    float scaleX = imgwOrig / ((float) bmp.getWidth());
-    float scaley = imghOrig / ((float) bmp.getHeight());
-
-    viewscale = Math.min(scaleX, scaley);
-
-    mat = new Matrix();
-    mat.postScale(viewscale, viewscale);
-    tilesVisible = false;
-  }
-
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     super.onSizeChanged(w, h, oldw, oldh);

From 32747a1f6f99249de4b4736dafaaaf72a4d24cd8 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Fri, 15 Oct 2021 16:30:05 +0200
Subject: [PATCH 06/19] Remove wakelock from BInstallerActivity

---
 .../btools/routingapp/BInstallerActivity.java | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 4a3ef2e..1cae08b 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -11,8 +11,6 @@ import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.os.StatFs;
 
 public class BInstallerActivity extends Activity {
@@ -21,8 +19,6 @@ public class BInstallerActivity extends Activity {
 
   private static final int DIALOG_CONFIRM_DELETE_ID = 1;
   private BInstallerView mBInstallerView;
-  private PowerManager mPowerManager;
-  private WakeLock mWakeLock;
   private DownloadReceiver myReceiver;
 
   static public long getAvailableSpace(String baseDir) {
@@ -40,13 +36,6 @@ public class BInstallerActivity extends Activity {
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    // Get an instance of the PowerManager
-    mPowerManager = (PowerManager) getSystemService(POWER_SERVICE);
-
-    // Create a bright wake lock
-    mWakeLock = mPowerManager.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, getClass()
-      .getName());
-
     setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
 
     mBInstallerView = new BInstallerView(this);
@@ -56,12 +45,6 @@ public class BInstallerActivity extends Activity {
   @Override
   protected void onResume() {
     super.onResume();
-    /*
-     * when the activity is resumed, we acquire a wake-lock so that the
-     * screen stays on, since the user will likely not be fiddling with the
-     * screen or buttons.
-     */
-    mWakeLock.acquire();
 
     IntentFilter filter = new IntentFilter();
     filter.addAction(DOWNLOAD_ACTION);
@@ -73,12 +56,6 @@ public class BInstallerActivity extends Activity {
   @Override
   protected void onPause() {
     super.onPause();
-
-
-    super.onPause();
-
-    mWakeLock.release();
-
   }
 
   @Override

From e045a732fb601725069817c7a507bdc4b12a76ab Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Fri, 15 Oct 2021 16:31:13 +0200
Subject: [PATCH 07/19] Rename DownloadReceiver

---
 .../main/java/btools/routingapp/BInstallerActivity.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 1cae08b..5a787f8 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -19,7 +19,7 @@ public class BInstallerActivity extends Activity {
 
   private static final int DIALOG_CONFIRM_DELETE_ID = 1;
   private BInstallerView mBInstallerView;
-  private DownloadReceiver myReceiver;
+  private DownloadReceiver downloadReceiver;
 
   static public long getAvailableSpace(String baseDir) {
     StatFs stat = new StatFs(baseDir);
@@ -49,8 +49,8 @@ public class BInstallerActivity extends Activity {
     IntentFilter filter = new IntentFilter();
     filter.addAction(DOWNLOAD_ACTION);
 
-    myReceiver = new DownloadReceiver();
-    registerReceiver(myReceiver, filter);
+    downloadReceiver = new DownloadReceiver();
+    registerReceiver(downloadReceiver, filter);
   }
 
   @Override
@@ -61,7 +61,7 @@ public class BInstallerActivity extends Activity {
   @Override
   public void onDestroy() {
     super.onDestroy();
-    if (myReceiver != null) unregisterReceiver(myReceiver);
+    if (downloadReceiver != null) unregisterReceiver(downloadReceiver);
     System.exit(0);
   }
 

From 806ae6250e14defabd306eb3ec9019ae283149ab Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Sat, 16 Oct 2021 06:54:02 +0200
Subject: [PATCH 08/19] Draw rect using canvas

---
 .../src/main/java/btools/routingapp/BInstallerView.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index f86188b..0b9376b 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -352,11 +352,9 @@ public class BInstallerView extends View {
       RoutingHelper.hasDirectoryAnyDatafiles(segmentDir)) btnText = "Update all";
 
     if (btnText != null) {
-      canvas.drawLine(imgw - btnw, imgh - btnh, imgw - btnw, imgh - 2, paint);
-      canvas.drawLine(imgw - btnw, imgh - btnh, imgw - 2, imgh - btnh, paint);
-      canvas.drawLine(imgw - btnw, imgh - btnh, imgw - btnw, imgh - 2, paint);
-      canvas.drawLine(imgw - 2, imgh - btnh, imgw - 2, imgh - 2, paint);
-      canvas.drawLine(imgw - btnw, imgh - 2, imgw - 2, imgh - 2, paint);
+      paint.setStyle(Paint.Style.STROKE);
+      canvas.drawRect(imgw - btnw, imgh - btnh, imgw - 2, imgh - 2, paint);
+      paint.setStyle(Paint.Style.FILL);
       canvas.drawText(btnText, imgw - btnw + 5, imgh - 10, paint);
     }
   }

From 89f075fa6162d370bc30629c12ec3ec1ea95c88e Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Sun, 17 Oct 2021 07:37:00 +0200
Subject: [PATCH 09/19] Draw only available segments

---
 .../btools/routingapp/BInstallerView.java     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 0b9376b..c7e2395 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -284,24 +284,26 @@ public class BInstallerView extends View {
     boolean drawGrid = tilesVisible && !isDownloading;
 
     if (drawGrid) {
-
       pnt_1.setColor(Color.GREEN);
-
-      for (int ix = 1; ix < 72; ix++) {
-        float fx = fw * ix;
-        canvas.drawLine(fx, 0, fx, ih, pnt_1);
-      }
-      for (int iy = 1; iy < 36; iy++) {
-        float fy = fh * iy;
-        canvas.drawLine(0, fy, iw, fy, pnt_1);
+      pnt_1.setStyle(Paint.Style.STROKE);
+      for (int ix = 0; ix < 72; ix++) {
+        for (int iy = 0; iy < 36; iy++) {
+          int tidx = gridPos2Tileindex(ix, iy);
+          int tilesize = BInstallerSizes.getRd5Size(tidx);
+          if (tilesize > 0) {
+            canvas.drawRect(fw * ix, fh * (iy + 1), fw * (ix + 1), fh * iy, pnt_1);
+          }
+        }
       }
     }
+
     rd5Tiles = 0;
     delTiles = 0;
     totalSize = 0;
     int mask2 = MASK_SELECTED_RD5 | MASK_DELETED_RD5 | MASK_INSTALLED_RD5;
     int mask3 = mask2 | MASK_CURRENT_RD5;
 
+    pnt_2.setStyle(Paint.Style.STROKE);
     pnt_2.setColor(Color.GRAY);
     pnt_2.setStrokeWidth(1);
     drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_INSTALLED_RD5, mask3, false, false, drawGrid);
@@ -381,10 +383,7 @@ public class BInstallerView extends View {
             canvas.drawLine(fw * ix, fh * (iy + 1), fw * (ix + 1), fh * iy, pnt);
 
             // draw frame
-            canvas.drawLine(fw * ix, fh * iy, fw * (ix + 1), fh * iy, pnt);
-            canvas.drawLine(fw * ix, fh * (iy + 1), fw * (ix + 1), fh * (iy + 1), pnt);
-            canvas.drawLine(fw * ix, fh * iy, fw * ix, fh * (iy + 1), pnt);
-            canvas.drawLine(fw * (ix + 1), fh * iy, fw * (ix + 1), fh * (iy + 1), pnt);
+            canvas.drawRect(fw * ix, fh * (iy + 1), fw * (ix + 1), fh * iy, pnt);
           }
         }
       }

From 6045a18a610b47a5890dc10b0da126d46684901f Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Sat, 30 Oct 2021 08:05:51 +0200
Subject: [PATCH 10/19] Inflate BInstallerView from layout

---
 .../java/btools/routingapp/BInstallerActivity.java    |  4 ++--
 .../main/java/btools/routingapp/BInstallerView.java   |  5 +++--
 .../src/main/res/layout/activity_binstaller.xml       | 11 +++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 brouter-routing-app/src/main/res/layout/activity_binstaller.xml

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 5a787f8..e5565e5 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -38,8 +38,8 @@ public class BInstallerActivity extends Activity {
 
     setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
 
-    mBInstallerView = new BInstallerView(this);
-    setContentView(mBInstallerView);
+    setContentView(R.layout.activity_binstaller);
+    mBInstallerView = findViewById(R.id.BInstallerView);
   }
 
   @Override
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index c7e2395..7643050 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -10,6 +10,7 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.View;
@@ -59,8 +60,8 @@ public class BInstallerView extends View {
   private long rd5Tiles = 0;
   private long delTiles = 0;
 
-  public BInstallerView(Context context) {
-    super(context);
+  public BInstallerView(Context context, AttributeSet attrs) {
+    super(context, attrs);
     mActivity = (Activity) context;
 
     DisplayMetrics metrics = new DisplayMetrics();
diff --git a/brouter-routing-app/src/main/res/layout/activity_binstaller.xml b/brouter-routing-app/src/main/res/layout/activity_binstaller.xml
new file mode 100644
index 0000000..1fd64f7
--- /dev/null
+++ b/brouter-routing-app/src/main/res/layout/activity_binstaller.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <btools.routingapp.BInstallerView
+        android:id="@+id/BInstallerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

From 51ef5c6aad2f21479cc77ea874a170c14343699f Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Sat, 30 Oct 2021 09:25:51 +0200
Subject: [PATCH 11/19] Show download progress in different view

---
 .../btools/routingapp/BInstallerActivity.java |  71 +++++++++++-
 .../btools/routingapp/BInstallerView.java     | 106 ++++--------------
 .../btools/routingapp/DownloadService.java    |   2 +-
 .../main/res/layout/activity_binstaller.xml   |  33 +++++-
 .../src/main/res/values/strings.xml           |   3 +
 5 files changed, 124 insertions(+), 91 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index e5565e5..f2ec66b 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -12,14 +12,24 @@ import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.StatFs;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import java.io.File;
+import java.util.ArrayList;
 
 public class BInstallerActivity extends Activity {
 
   public static final String DOWNLOAD_ACTION = "btools.routingapp.download";
-
   private static final int DIALOG_CONFIRM_DELETE_ID = 1;
+  public static boolean downloadCanceled = false;
+  private File baseDir;
   private BInstallerView mBInstallerView;
   private DownloadReceiver downloadReceiver;
+  private View mDownloadInfo;
+  private TextView mDownloadInfoText;
+  private Button mButtonDownloadCancel;
 
   static public long getAvailableSpace(String baseDir) {
     StatFs stat = new StatFs(baseDir);
@@ -40,6 +50,58 @@ public class BInstallerActivity extends Activity {
 
     setContentView(R.layout.activity_binstaller);
     mBInstallerView = findViewById(R.id.BInstallerView);
+    mDownloadInfo = findViewById(R.id.view_download_progress);
+    mDownloadInfoText = findViewById(R.id.textViewDownloadProgress);
+    mButtonDownloadCancel = findViewById(R.id.buttonDownloadCancel);
+    mButtonDownloadCancel.setOnClickListener(view -> {
+      cancelDownload();
+    });
+
+    baseDir = ConfigHelper.getBaseDir(this);
+  }
+
+  private String baseNameForTile(int tileIndex) {
+    int lon = (tileIndex % 72) * 5 - 180;
+    int lat = (tileIndex / 72) * 5 - 90;
+    String slon = lon < 0 ? "W" + (-lon) : "E" + lon;
+    String slat = lat < 0 ? "S" + (-lat) : "N" + lat;
+    return slon + "_" + slat;
+  }
+
+  private void deleteRawTracks() {
+    File modeDir = new File(baseDir, "brouter/modes");
+    String[] fileNames = modeDir.list();
+    if (fileNames == null) return;
+    for (String fileName : fileNames) {
+      if (fileName.endsWith("_rawtrack.dat")) {
+        File f = new File(modeDir, fileName);
+        f.delete();
+      }
+    }
+  }
+
+  private void cancelDownload() {
+    downloadCanceled = true;
+    mDownloadInfoText.setText(getString(R.string.download_info_cancel));
+  }
+
+  public void downloadAll(ArrayList<Integer> downloadList) {
+    ArrayList<String> urlparts = new ArrayList<>();
+    for (Integer i : downloadList) {
+      urlparts.add(baseNameForTile(i));
+    }
+
+    mBInstallerView.setVisibility(View.GONE);
+    mDownloadInfo.setVisibility(View.VISIBLE);
+    downloadCanceled = false;
+    mDownloadInfoText.setText(R.string.download_info_start);
+
+    Intent intent = new Intent(this, DownloadService.class);
+    intent.putExtra("dir", baseDir.getAbsolutePath() + "/brouter/");
+    intent.putExtra("urlparts", urlparts);
+    startService(intent);
+
+    deleteRawTracks(); // invalidate raw-tracks after data update
   }
 
   @Override
@@ -99,7 +161,12 @@ public class BInstallerActivity extends Activity {
       if (intent.hasExtra("txt")) {
         String txt = intent.getStringExtra("txt");
         boolean ready = intent.getBooleanExtra("ready", false);
-        mBInstallerView.setState(txt, ready);
+        if (!ready) {
+          mBInstallerView.setVisibility(View.VISIBLE);
+          mDownloadInfo.setVisibility(View.GONE);
+          scanExistingFiles();
+        }
+        mDownloadInfoText.setText(txt);
       }
     }
   }
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 7643050..8d3a101 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -2,7 +2,6 @@ package btools.routingapp;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -28,7 +27,12 @@ public class BInstallerView extends View {
   private static final int MASK_DELETED_RD5 = 2;
   private static final int MASK_INSTALLED_RD5 = 4;
   private static final int MASK_CURRENT_RD5 = 8;
-  public static boolean downloadCanceled = false;
+  private final File baseDir;
+  private final File segmentDir;
+  private final Matrix mat;
+  private final Bitmap bmp;
+  private final float viewscale;
+  private final int[] tileStatus;
   private final int imgwOrig;
   private final int imghOrig;
   private final float scaleOrig;
@@ -36,12 +40,6 @@ public class BInstallerView extends View {
   private final int imgh;
   private final float[] testVector = new float[2];
   private final Matrix matText;
-  private final File baseDir;
-  private final File segmentDir;
-  private final Matrix mat;
-  private final Bitmap bmp;
-  private final float viewscale;
-  private final int[] tileStatus;
   Paint pnt_1 = new Paint();
   Paint pnt_2 = new Paint();
   Paint paint = new Paint();
@@ -53,9 +51,6 @@ public class BInstallerView extends View {
   private float lastDownY;
   private boolean tilesVisible = false;
   private long availableSize;
-  private boolean isDownloading = false;
-  private volatile String currentDownloadOperation = "";
-  private String downloadAction = "";
   private long totalSize = 0;
   private long rd5Tiles = 0;
   private long delTiles = 0;
@@ -130,12 +125,6 @@ public class BInstallerView extends View {
   }
 
   private void toggleDownload() {
-    if (isDownloading) {
-      downloadCanceled = true;
-      downloadAction = "Canceling...";
-      return;
-    }
-
     if (delTiles > 0) {
       ((BInstallerActivity) getContext()).showConfirmDelete();
       return;
@@ -159,8 +148,8 @@ public class BInstallerView extends View {
     }
 
     if (downloadList.size() > 0) {
-      isDownloading = true;
-      downloadAll(downloadList);
+      // isDownloading = true;
+      ((BInstallerActivity) getContext()).downloadAll(downloadList);
       for (Integer i : downloadList) {
         tileStatus[i] ^= tileStatus[i] & MASK_SELECTED_RD5;
       }
@@ -168,35 +157,6 @@ public class BInstallerView extends View {
     }
   }
 
-  private void downloadAll(ArrayList<Integer> downloadList) {
-    ArrayList<String> urlparts = new ArrayList<>();
-    for (Integer i : downloadList) {
-      urlparts.add(baseNameForTile(i));
-    }
-
-    currentDownloadOperation = "Start download ...";
-    downloadAction = "";
-    downloadCanceled = false;
-    isDownloading = true;
-
-    Intent intent = new Intent(mActivity, DownloadService.class);
-    intent.putExtra("dir", baseDir.getAbsolutePath() + "/brouter/");
-    intent.putExtra("urlparts", urlparts);
-    mActivity.startService(intent);
-
-    deleteRawTracks(); // invalidate raw-tracks after data update
-  }
-
-  public void setState(String txt, boolean b) {
-    currentDownloadOperation = txt;
-    downloadAction = "";
-    isDownloading = b;
-    if (!b) {
-      scanExistingFiles();
-    }
-    invalidate();
-  }
-
   private int tileIndex(float x, float y) {
     int ix = (int) (72.f * x / bmp.getWidth());
     int iy = (int) (36.f * y / bmp.getHeight());
@@ -220,18 +180,6 @@ public class BInstallerView extends View {
     return testVector[1] / viewscale;
   }
 
-  private void deleteRawTracks() {
-    File modeDir = new File(baseDir, "brouter/modes");
-    String[] fileNames = modeDir.list();
-    if (fileNames == null) return;
-    for (String fileName : fileNames) {
-      if (fileName.endsWith("_rawtrack.dat")) {
-        File f = new File(modeDir, fileName);
-        f.delete();
-      }
-    }
-  }
-
   private void scanExistingFiles() {
     clearTileSelection(MASK_INSTALLED_RD5 | MASK_CURRENT_RD5);
 
@@ -271,10 +219,8 @@ public class BInstallerView extends View {
 
   @Override
   protected void onDraw(Canvas canvas) {
-    if (!isDownloading) {
-      canvas.setMatrix(mat);
-      canvas.drawBitmap(bmp, 0, 0, null);
-    }
+    canvas.setMatrix(mat);
+    canvas.drawBitmap(bmp, 0, 0, null);
     // draw 5*5 lattice starting at scale=3
 
     int iw = bmp.getWidth();
@@ -282,9 +228,7 @@ public class BInstallerView extends View {
     float fw = iw / 72.f;
     float fh = ih / 36.f;
 
-    boolean drawGrid = tilesVisible && !isDownloading;
-
-    if (drawGrid) {
+    if (tilesVisible) {
       pnt_1.setColor(Color.GREEN);
       pnt_1.setStyle(Paint.Style.STROKE);
       for (int ix = 0; ix < 72; ix++) {
@@ -307,19 +251,19 @@ public class BInstallerView extends View {
     pnt_2.setStyle(Paint.Style.STROKE);
     pnt_2.setColor(Color.GRAY);
     pnt_2.setStrokeWidth(1);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_INSTALLED_RD5, mask3, false, false, drawGrid);
+    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_INSTALLED_RD5, mask3, false, false, tilesVisible);
     pnt_2.setColor(Color.BLUE);
     pnt_2.setStrokeWidth(1);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_INSTALLED_RD5 | MASK_CURRENT_RD5, mask3, false, false, drawGrid);
+    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_INSTALLED_RD5 | MASK_CURRENT_RD5, mask3, false, false, tilesVisible);
     pnt_2.setColor(Color.GREEN);
     pnt_2.setStrokeWidth(2);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_SELECTED_RD5, mask2, true, false, drawGrid);
+    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_SELECTED_RD5, mask2, true, false, tilesVisible);
     pnt_2.setColor(Color.YELLOW);
     pnt_2.setStrokeWidth(2);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_SELECTED_RD5 | MASK_INSTALLED_RD5, mask2, true, false, drawGrid);
+    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_SELECTED_RD5 | MASK_INSTALLED_RD5, mask2, true, false, tilesVisible);
     pnt_2.setColor(Color.RED);
     pnt_2.setStrokeWidth(2);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_DELETED_RD5 | MASK_INSTALLED_RD5, mask2, false, true, drawGrid);
+    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_DELETED_RD5 | MASK_INSTALLED_RD5, mask2, false, true, tilesVisible);
 
     canvas.setMatrix(matText);
 
@@ -327,13 +271,7 @@ public class BInstallerView extends View {
 
     long mb = 1024 * 1024;
 
-    if (isDownloading) {
-      paint.setTextSize(30);
-      canvas.drawText(currentDownloadOperation, 30, (imgh / 3) * 2 - 30, paint);
-      //  canvas.drawText( currentDownloadOperation +  " " + currentDownloadFile + sizeHint, 30, (imgh/3)*2-30, paint);
-      canvas.drawText(downloadAction, 30, (imgh / 3) * 2, paint);
-    }
-    if (!tilesVisible && !isDownloading) {
+    if (!this.tilesVisible) {
       paint.setTextSize(35);
       canvas.drawText("Touch region to zoom in!", 30, (imgh / 3) * 2, paint);
     }
@@ -347,10 +285,9 @@ public class BInstallerView extends View {
 
 
     String btnText = null;
-    if (isDownloading) btnText = "Cancel Download";
-    else if (delTiles > 0) btnText = "Delete " + delTiles + " tiles";
+    if (delTiles > 0) btnText = "Delete " + delTiles + " tiles";
     else if (rd5Tiles > 0) btnText = "Start Download";
-    else if (tilesVisible &&
+    else if (this.tilesVisible &&
       rd5Tiles == 0 &&
       RoutingHelper.hasDirectoryAnyDatafiles(segmentDir)) btnText = "Update all";
 
@@ -420,7 +357,6 @@ public class BInstallerView extends View {
       }
       case MotionEvent.ACTION_MOVE: { // a pointer was moved
 
-        if (isDownloading) break;
         int np = event.getPointerCount();
         int nh = event.getHistorySize();
         if (nh == 0) break;
@@ -482,7 +418,7 @@ public class BInstallerView extends View {
         }
 
         // download button?
-        if ((delTiles > 0 || rd5Tiles >= 0 || isDownloading) && event.getX() > imgwOrig - btnw * scaleOrig && event.getY() > imghOrig - btnh * scaleOrig) {
+        if ((delTiles > 0 || rd5Tiles >= 0) && event.getX() > imgwOrig - btnw * scaleOrig && event.getY() > imghOrig - btnh * scaleOrig) {
           if (rd5Tiles == 0) {
             for (int ix = 0; ix < 72; ix++) {
               for (int iy = 0; iy < 36; iy++) {
@@ -511,8 +447,6 @@ public class BInstallerView extends View {
           break;
         }
 
-        if (isDownloading) break;
-
         Matrix imat = new Matrix();
         if (mat.invert(imat)) {
           float[] touchpoint = new float[2];
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/DownloadService.java b/brouter-routing-app/src/main/java/btools/routingapp/DownloadService.java
index 2726327..7457a84 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/DownloadService.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/DownloadService.java
@@ -481,7 +481,7 @@ public class DownloadService extends Service implements ProgressListener {
 
 
   public boolean isCanceled() {
-    return BInstallerView.downloadCanceled;
+    return BInstallerActivity.downloadCanceled;
   }
 
 }
diff --git a/brouter-routing-app/src/main/res/layout/activity_binstaller.xml b/brouter-routing-app/src/main/res/layout/activity_binstaller.xml
index 1fd64f7..ccaa634 100644
--- a/brouter-routing-app/src/main/res/layout/activity_binstaller.xml
+++ b/brouter-routing-app/src/main/res/layout/activity_binstaller.xml
@@ -1,11 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <btools.routingapp.BInstallerView
         android:id="@+id/BInstallerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+
+    <LinearLayout
+        android:id="@+id/view_download_progress"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/textViewDownloadProgress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="34sp" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/buttonDownloadCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:text="@string/cancel_download" />
+
+    </LinearLayout>
+
 </LinearLayout>
diff --git a/brouter-routing-app/src/main/res/values/strings.xml b/brouter-routing-app/src/main/res/values/strings.xml
index b74d0f0..34cb83e 100644
--- a/brouter-routing-app/src/main/res/values/strings.xml
+++ b/brouter-routing-app/src/main/res/values/strings.xml
@@ -16,6 +16,9 @@
 
 <resources>
     <string name="app_name">BRouter</string>
+    <string name="cancel_download">Cancel Download</string>
     <string name="import_profile">Import Profile</string>
     <string name="profile_filename_example">filename.brf</string>
+    <string name="download_info_start">Starting download…</string>
+    <string name="download_info_cancel">Cancelling…</string>
 </resources>

From da7569b0a04a9fe5168f6bdbb59ff899ba396325 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Fri, 15 Oct 2021 17:19:32 +0200
Subject: [PATCH 12/19] Use onClick handler to start download

---
 .../btools/routingapp/BInstallerActivity.java |  70 +++++++++++-
 .../btools/routingapp/BInstallerView.java     | 101 +++++++-----------
 2 files changed, 102 insertions(+), 69 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index f2ec66b..31320dc 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -1,5 +1,10 @@
 package btools.routingapp;
 
+import static btools.routingapp.BInstallerView.MASK_CURRENT_RD5;
+import static btools.routingapp.BInstallerView.MASK_DELETED_RD5;
+import static btools.routingapp.BInstallerView.MASK_INSTALLED_RD5;
+import static btools.routingapp.BInstallerView.MASK_SELECTED_RD5;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -18,20 +23,23 @@ import android.widget.TextView;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Locale;
+
+import btools.router.RoutingHelper;
 
 public class BInstallerActivity extends Activity {
 
   public static final String DOWNLOAD_ACTION = "btools.routingapp.download";
   private static final int DIALOG_CONFIRM_DELETE_ID = 1;
   public static boolean downloadCanceled = false;
-  private File baseDir;
+  private File mBaseDir;
   private BInstallerView mBInstallerView;
   private DownloadReceiver downloadReceiver;
   private View mDownloadInfo;
   private TextView mDownloadInfoText;
   private Button mButtonDownloadCancel;
 
-  static public long getAvailableSpace(String baseDir) {
+  public static long getAvailableSpace(String baseDir) {
     StatFs stat = new StatFs(baseDir);
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
@@ -50,6 +58,9 @@ public class BInstallerActivity extends Activity {
 
     setContentView(R.layout.activity_binstaller);
     mBInstallerView = findViewById(R.id.BInstallerView);
+    mBInstallerView.setOnClickListener(
+      view -> mBInstallerView.toggleDownload()
+    );
     mDownloadInfo = findViewById(R.id.view_download_progress);
     mDownloadInfoText = findViewById(R.id.textViewDownloadProgress);
     mButtonDownloadCancel = findViewById(R.id.buttonDownloadCancel);
@@ -57,7 +68,8 @@ public class BInstallerActivity extends Activity {
       cancelDownload();
     });
 
-    baseDir = ConfigHelper.getBaseDir(this);
+    mBaseDir = ConfigHelper.getBaseDir(this);
+    scanExistingFiles();
   }
 
   private String baseNameForTile(int tileIndex) {
@@ -69,7 +81,7 @@ public class BInstallerActivity extends Activity {
   }
 
   private void deleteRawTracks() {
-    File modeDir = new File(baseDir, "brouter/modes");
+    File modeDir = new File(mBaseDir, "brouter/modes");
     String[] fileNames = modeDir.list();
     if (fileNames == null) return;
     for (String fileName : fileNames) {
@@ -97,7 +109,7 @@ public class BInstallerActivity extends Activity {
     mDownloadInfoText.setText(R.string.download_info_start);
 
     Intent intent = new Intent(this, DownloadService.class);
-    intent.putExtra("dir", baseDir.getAbsolutePath() + "/brouter/");
+    intent.putExtra("dir", mBaseDir.getAbsolutePath() + "/brouter/");
     intent.putExtra("urlparts", urlparts);
     startService(intent);
 
@@ -154,6 +166,54 @@ public class BInstallerActivity extends Activity {
     showDialog(DIALOG_CONFIRM_DELETE_ID);
   }
 
+  private void scanExistingFiles() {
+    mBInstallerView.clearAllTilesStatus(MASK_INSTALLED_RD5 | MASK_CURRENT_RD5);
+
+    scanExistingFiles(new File(mBaseDir, "brouter/segments4"));
+
+    File secondary = RoutingHelper.getSecondarySegmentDir(new File(mBaseDir, "brouter/segments4"));
+    if (secondary != null) {
+      scanExistingFiles(secondary);
+    }
+
+    long availableSize = -1;
+    try {
+      availableSize = getAvailableSpace(mBaseDir.getAbsolutePath());
+    } catch (Exception e) { /* ignore */ }
+    mBInstallerView.setAvailableSize(availableSize);
+  }
+
+  private void scanExistingFiles(File dir) {
+    String[] fileNames = dir.list();
+    if (fileNames == null) return;
+    String suffix = ".rd5";
+    for (String fileName : fileNames) {
+      if (fileName.endsWith(suffix)) {
+        String basename = fileName.substring(0, fileName.length() - suffix.length());
+        int tileIndex = tileForBaseName(basename);
+        mBInstallerView.setTileStatus(tileIndex, MASK_INSTALLED_RD5);
+
+        long age = System.currentTimeMillis() - new File(dir, fileName).lastModified();
+        if (age < 10800000) mBInstallerView.setTileStatus(tileIndex, MASK_CURRENT_RD5); // 3 hours
+      }
+    }
+  }
+
+  private int tileForBaseName(String basename) {
+    String uname = basename.toUpperCase(Locale.ROOT);
+    int idx = uname.indexOf("_");
+    if (idx < 0) return -1;
+    String slon = uname.substring(0, idx);
+    String slat = uname.substring(idx + 1);
+    int ilon = slon.charAt(0) == 'W' ? -Integer.parseInt(slon.substring(1)) :
+      (slon.charAt(0) == 'E' ? Integer.parseInt(slon.substring(1)) : -1);
+    int ilat = slat.charAt(0) == 'S' ? -Integer.parseInt(slat.substring(1)) :
+      (slat.charAt(0) == 'N' ? Integer.parseInt(slat.substring(1)) : -1);
+    if (ilon < -180 || ilon >= 180 || ilon % 5 != 0) return -1;
+    if (ilat < -90 || ilat >= 90 || ilat % 5 != 0) return -1;
+    return (ilon + 180) / 5 + 72 * ((ilat + 90) / 5);
+  }
+
   public class DownloadReceiver extends BroadcastReceiver {
 
     @Override
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 8d3a101..af90c5c 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -18,15 +18,14 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Locale;
 
 import btools.router.RoutingHelper;
 
 public class BInstallerView extends View {
-  private static final int MASK_SELECTED_RD5 = 1;
-  private static final int MASK_DELETED_RD5 = 2;
-  private static final int MASK_INSTALLED_RD5 = 4;
-  private static final int MASK_CURRENT_RD5 = 8;
+  public static final int MASK_SELECTED_RD5 = 1;
+  public static final int MASK_DELETED_RD5 = 2;
+  public static final int MASK_INSTALLED_RD5 = 4;
+  public static final int MASK_CURRENT_RD5 = 8;
   private final File baseDir;
   private final File segmentDir;
   private final Matrix mat;
@@ -54,6 +53,7 @@ public class BInstallerView extends View {
   private long totalSize = 0;
   private long rd5Tiles = 0;
   private long delTiles = 0;
+  private OnClickListener mOnClickListener;
 
   public BInstallerView(Context context, AttributeSet attrs) {
     super(context, attrs);
@@ -97,6 +97,33 @@ public class BInstallerView extends View {
     mat.postScale(viewscale, viewscale);
   }
 
+  private void scanExistingFiles() {
+
+  }
+
+  public void setAvailableSize(long availableSize) {
+    this.availableSize = availableSize;
+  }
+
+  public void setTileStatus(int tileIndex, int tileMask) {
+    tileStatus[tileIndex] |= tileMask;
+  }
+
+  public void clearAllTilesStatus(int tileMask) {
+    for (int ix = 0; ix < 72; ix++) {
+      for (int iy = 0; iy < 36; iy++) {
+        int tileIndex = gridPos2Tileindex(ix, iy);
+        tileStatus[tileIndex] ^= tileStatus[tileIndex] & tileMask;
+      }
+    }
+    invalidate();
+  }
+
+  @Override
+  public void setOnClickListener(OnClickListener listener) {
+    mOnClickListener = listener;
+  }
+
   protected String baseNameForTile(int tileIndex) {
     int lon = (tileIndex % 72) * 5 - 180;
     int lat = (tileIndex / 72) * 5 - 90;
@@ -109,22 +136,7 @@ public class BInstallerView extends View {
     return (35 - iy) * 72 + (ix >= 70 ? ix - 70 : ix + 2);
   }
 
-  private int tileForBaseName(String basename) {
-    String uname = basename.toUpperCase(Locale.ROOT);
-    int idx = uname.indexOf("_");
-    if (idx < 0) return -1;
-    String slon = uname.substring(0, idx);
-    String slat = uname.substring(idx + 1);
-    int ilon = slon.charAt(0) == 'W' ? -Integer.parseInt(slon.substring(1)) :
-      (slon.charAt(0) == 'E' ? Integer.parseInt(slon.substring(1)) : -1);
-    int ilat = slat.charAt(0) == 'S' ? -Integer.parseInt(slat.substring(1)) :
-      (slat.charAt(0) == 'N' ? Integer.parseInt(slat.substring(1)) : -1);
-    if (ilon < -180 || ilon >= 180 || ilon % 5 != 0) return -1;
-    if (ilat < -90 || ilat >= 90 || ilat % 5 != 0) return -1;
-    return (ilon + 180) / 5 + 72 * ((ilat + 90) / 5);
-  }
-
-  private void toggleDownload() {
+  public void toggleDownload() {
     if (delTiles > 0) {
       ((BInstallerActivity) getContext()).showConfirmDelete();
       return;
@@ -164,15 +176,6 @@ public class BInstallerView extends View {
     return -1;
   }
 
-  private void clearTileSelection(int mask) {
-    // clear selection if zooming out
-    for (int ix = 0; ix < 72; ix++)
-      for (int iy = 0; iy < 36; iy++) {
-        int tidx = gridPos2Tileindex(ix, iy);
-        tileStatus[tidx] ^= tileStatus[tidx] & mask;
-      }
-  }
-
   // get back the current image scale
   private float currentScale() {
     testVector[1] = 1.f;
@@ -180,38 +183,6 @@ public class BInstallerView extends View {
     return testVector[1] / viewscale;
   }
 
-  private void scanExistingFiles() {
-    clearTileSelection(MASK_INSTALLED_RD5 | MASK_CURRENT_RD5);
-
-    scanExistingFiles(new File(baseDir, "brouter/segments4"));
-
-    File secondary = RoutingHelper.getSecondarySegmentDir(new File(baseDir, "brouter/segments4"));
-    if (secondary != null) {
-      scanExistingFiles(secondary);
-    }
-
-    availableSize = -1;
-    try {
-      availableSize = BInstallerActivity.getAvailableSpace(baseDir.getAbsolutePath());
-    } catch (Exception e) { /* ignore */ }
-  }
-
-  private void scanExistingFiles(File dir) {
-    String[] fileNames = dir.list();
-    if (fileNames == null) return;
-    String suffix = ".rd5";
-    for (String fileName : fileNames) {
-      if (fileName.endsWith(suffix)) {
-        String basename = fileName.substring(0, fileName.length() - suffix.length());
-        int tidx = tileForBaseName(basename);
-        tileStatus[tidx] |= MASK_INSTALLED_RD5;
-
-        long age = System.currentTimeMillis() - new File(dir, fileName).lastModified();
-        if (age < 10800000) tileStatus[tidx] |= MASK_CURRENT_RD5; // 3 hours
-      }
-    }
-  }
-
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     super.onSizeChanged(w, h, oldw, oldh);
@@ -394,7 +365,7 @@ public class BInstallerView extends View {
 
             boolean tilesv = currentScale() >= 3.f;
             if (tilesVisible && !tilesv) {
-              clearTileSelection(MASK_SELECTED_RD5 | MASK_DELETED_RD5);
+              clearAllTilesStatus(MASK_SELECTED_RD5 | MASK_DELETED_RD5);
             }
             tilesVisible = tilesv;
           }
@@ -432,7 +403,9 @@ public class BInstallerView extends View {
               }
             }
           }
-          toggleDownload();
+          if (mOnClickListener != null) {
+            mOnClickListener.onClick(null);
+          }
           invalidate();
           break;
         }

From 7b6fce1481483f90b303cb208726c98fbd840cc2 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Fri, 15 Oct 2021 18:16:36 +0200
Subject: [PATCH 13/19] Move deleting tiles to BInstallerActivity

---
 .../btools/routingapp/BInstallerActivity.java | 33 ++++++++++++-----
 .../btools/routingapp/BInstallerView.java     | 37 +++++++------------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 31320dc..e14b800 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -59,7 +59,12 @@ public class BInstallerActivity extends Activity {
     setContentView(R.layout.activity_binstaller);
     mBInstallerView = findViewById(R.id.BInstallerView);
     mBInstallerView.setOnClickListener(
-      view -> mBInstallerView.toggleDownload()
+      view -> {
+        if (mBInstallerView.getSelectedTiles(MASK_DELETED_RD5).size() > 0) {
+          showConfirmDelete();
+        }
+        mBInstallerView.toggleDownload();
+      }
     );
     mDownloadInfo = findViewById(R.id.view_download_progress);
     mDownloadInfoText = findViewById(R.id.textViewDownloadProgress);
@@ -72,14 +77,6 @@ public class BInstallerActivity extends Activity {
     scanExistingFiles();
   }
 
-  private String baseNameForTile(int tileIndex) {
-    int lon = (tileIndex % 72) * 5 - 180;
-    int lat = (tileIndex / 72) * 5 - 90;
-    String slon = lon < 0 ? "W" + (-lon) : "E" + lon;
-    String slat = lat < 0 ? "S" + (-lat) : "N" + lat;
-    return slon + "_" + slat;
-  }
-
   private void deleteRawTracks() {
     File modeDir = new File(mBaseDir, "brouter/modes");
     String[] fileNames = modeDir.list();
@@ -149,7 +146,7 @@ public class BInstallerActivity extends Activity {
           .setTitle("Confirm Delete")
           .setMessage("Really delete?").setPositiveButton("Yes", new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int id) {
-            mBInstallerView.deleteSelectedTiles();
+            deleteSelectedTiles();
           }
         }).setNegativeButton("No", new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int id) {
@@ -199,6 +196,14 @@ public class BInstallerActivity extends Activity {
     }
   }
 
+  private void deleteSelectedTiles() {
+    ArrayList<Integer> selectedTiles = mBInstallerView.getSelectedTiles(MASK_DELETED_RD5);
+    for (int tileIndex : selectedTiles) {
+      new File(mBaseDir, "brouter/segments4/" + baseNameForTile(tileIndex) + ".rd5").delete();
+    }
+    scanExistingFiles();
+  }
+
   private int tileForBaseName(String basename) {
     String uname = basename.toUpperCase(Locale.ROOT);
     int idx = uname.indexOf("_");
@@ -214,6 +219,14 @@ public class BInstallerActivity extends Activity {
     return (ilon + 180) / 5 + 72 * ((ilat + 90) / 5);
   }
 
+  protected String baseNameForTile(int tileIndex) {
+    int lon = (tileIndex % 72) * 5 - 180;
+    int lat = (tileIndex / 72) * 5 - 90;
+    String slon = lon < 0 ? "W" + (-lon) : "E" + lon;
+    String slat = lat < 0 ? "S" + (-lat) : "N" + lat;
+    return slon + "_" + slat;
+  }
+
   public class DownloadReceiver extends BroadcastReceiver {
 
     @Override
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index af90c5c..e8d82f6 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -86,7 +86,6 @@ public class BInstallerView extends View {
     }
 
     tileStatus = new int[72 * 36];
-    scanExistingFiles();
 
     float scaleX = imgwOrig / ((float) bmp.getWidth());
     float scaley = imghOrig / ((float) bmp.getHeight());
@@ -97,10 +96,6 @@ public class BInstallerView extends View {
     mat.postScale(viewscale, viewscale);
   }
 
-  private void scanExistingFiles() {
-
-  }
-
   public void setAvailableSize(long availableSize) {
     this.availableSize = availableSize;
   }
@@ -119,6 +114,20 @@ public class BInstallerView extends View {
     invalidate();
   }
 
+  public ArrayList<Integer> getSelectedTiles(int tileMask) {
+    ArrayList<Integer> selectedTiles = new ArrayList<>();
+    for (int ix = 0; ix < 72; ix++) {
+      for (int iy = 0; iy < 36; iy++) {
+        int tileIndex = gridPos2Tileindex(ix, iy);
+        if ((tileStatus[tileIndex] & tileMask) != 0 && BInstallerSizes.getRd5Size(tileIndex) > 0) {
+          selectedTiles.add(tileIndex);
+        }
+      }
+    }
+
+    return selectedTiles;
+  }
+
   @Override
   public void setOnClickListener(OnClickListener listener) {
     mOnClickListener = listener;
@@ -137,11 +146,6 @@ public class BInstallerView extends View {
   }
 
   public void toggleDownload() {
-    if (delTiles > 0) {
-      ((BInstallerActivity) getContext()).showConfirmDelete();
-      return;
-    }
-
     int min_size = Integer.MAX_VALUE;
 
     ArrayList<Integer> downloadList = new ArrayList<>();
@@ -298,19 +302,6 @@ public class BInstallerView extends View {
       }
   }
 
-  public void deleteSelectedTiles() {
-    for (int ix = 0; ix < 72; ix++) {
-      for (int iy = 0; iy < 36; iy++) {
-        int tidx = gridPos2Tileindex(ix, iy);
-        if ((tileStatus[tidx] & MASK_DELETED_RD5) != 0) {
-          new File(baseDir, "brouter/segments4/" + baseNameForTile(tidx) + ".rd5").delete();
-        }
-      }
-    }
-    scanExistingFiles();
-    invalidate();
-  }
-
   @Override
   public boolean onTouchEvent(MotionEvent event) {
 

From 0eba6cb34568014457344d64db1d890f8c4ebe14 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Fri, 15 Oct 2021 19:10:26 +0200
Subject: [PATCH 14/19] Move all download handling to BInstallerActivity

---
 .../btools/routingapp/BInstallerActivity.java | 18 +++++++-
 .../btools/routingapp/BInstallerView.java     | 41 +------------------
 2 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index e14b800..ca09c6b 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -62,8 +62,11 @@ public class BInstallerActivity extends Activity {
       view -> {
         if (mBInstallerView.getSelectedTiles(MASK_DELETED_RD5).size() > 0) {
           showConfirmDelete();
+        } else if (mBInstallerView.getSelectedTiles(MASK_SELECTED_RD5).size() > 0) {
+          downloadSelectedTiles();
+        } else {
+          downloadInstalledTiles();
         }
-        mBInstallerView.toggleDownload();
       }
     );
     mDownloadInfo = findViewById(R.id.view_download_progress);
@@ -204,6 +207,17 @@ public class BInstallerActivity extends Activity {
     scanExistingFiles();
   }
 
+  private void downloadSelectedTiles() {
+    ArrayList<Integer> selectedTiles = mBInstallerView.getSelectedTiles(MASK_SELECTED_RD5);
+    downloadAll(selectedTiles);
+    mBInstallerView.clearAllTilesStatus(MASK_SELECTED_RD5);
+  }
+
+  private void downloadInstalledTiles() {
+    ArrayList<Integer> selectedTiles = mBInstallerView.getSelectedTiles(MASK_INSTALLED_RD5);
+    downloadAll(selectedTiles);
+  }
+
   private int tileForBaseName(String basename) {
     String uname = basename.toUpperCase(Locale.ROOT);
     int idx = uname.indexOf("_");
@@ -219,7 +233,7 @@ public class BInstallerActivity extends Activity {
     return (ilon + 180) / 5 + 72 * ((ilat + 90) / 5);
   }
 
-  protected String baseNameForTile(int tileIndex) {
+  private String baseNameForTile(int tileIndex) {
     int lon = (tileIndex % 72) * 5 - 180;
     int lat = (tileIndex / 72) * 5 - 90;
     String slon = lon < 0 ? "W" + (-lon) : "E" + lon;
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index e8d82f6..50cd5a3 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -26,7 +26,6 @@ public class BInstallerView extends View {
   public static final int MASK_DELETED_RD5 = 2;
   public static final int MASK_INSTALLED_RD5 = 4;
   public static final int MASK_CURRENT_RD5 = 8;
-  private final File baseDir;
   private final File segmentDir;
   private final Matrix mat;
   private final Bitmap bmp;
@@ -42,7 +41,6 @@ public class BInstallerView extends View {
   Paint pnt_1 = new Paint();
   Paint pnt_2 = new Paint();
   Paint paint = new Paint();
-  Activity mActivity;
   int btnh = 40;
   int btnw = 160;
   float tx, ty;
@@ -57,7 +55,6 @@ public class BInstallerView extends View {
 
   public BInstallerView(Context context, AttributeSet attrs) {
     super(context, attrs);
-    mActivity = (Activity) context;
 
     DisplayMetrics metrics = new DisplayMetrics();
     ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(metrics);
@@ -73,7 +70,7 @@ public class BInstallerView extends View {
     imgw = (int) (imgwOrig / scaleOrig);
     imgh = (int) (imghOrig / scaleOrig);
 
-    baseDir = ConfigHelper.getBaseDir(getContext());
+    File baseDir = ConfigHelper.getBaseDir(getContext());
     segmentDir = new File(baseDir, "brouter/segments4");
 
     try {
@@ -133,46 +130,10 @@ public class BInstallerView extends View {
     mOnClickListener = listener;
   }
 
-  protected String baseNameForTile(int tileIndex) {
-    int lon = (tileIndex % 72) * 5 - 180;
-    int lat = (tileIndex / 72) * 5 - 90;
-    String slon = lon < 0 ? "W" + (-lon) : "E" + lon;
-    String slat = lat < 0 ? "S" + (-lat) : "N" + lat;
-    return slon + "_" + slat;
-  }
-
   private int gridPos2Tileindex(int ix, int iy) {
     return (35 - iy) * 72 + (ix >= 70 ? ix - 70 : ix + 2);
   }
 
-  public void toggleDownload() {
-    int min_size = Integer.MAX_VALUE;
-
-    ArrayList<Integer> downloadList = new ArrayList<>();
-    // prepare download list
-    for (int ix = 0; ix < 72; ix++) {
-      for (int iy = 0; iy < 36; iy++) {
-        int tidx = gridPos2Tileindex(ix, iy);
-        if ((tileStatus[tidx] & MASK_SELECTED_RD5) != 0) {
-          int tilesize = BInstallerSizes.getRd5Size(tidx);
-          downloadList.add(tidx);
-          if (tilesize > 0 && tilesize < min_size) {
-            min_size = tilesize;
-          }
-        }
-      }
-    }
-
-    if (downloadList.size() > 0) {
-      // isDownloading = true;
-      ((BInstallerActivity) getContext()).downloadAll(downloadList);
-      for (Integer i : downloadList) {
-        tileStatus[i] ^= tileStatus[i] & MASK_SELECTED_RD5;
-      }
-      downloadList.clear();
-    }
-  }
-
   private int tileIndex(float x, float y) {
     int ix = (int) (72.f * x / bmp.getWidth());
     int iy = (int) (36.f * y / bmp.getHeight());

From 50a7c2244f47a6ab87378b88d2604ba6c12906e1 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Sat, 1 Jan 2022 12:29:29 +0100
Subject: [PATCH 15/19] Clear all flags when scanning files

---
 .../src/main/java/btools/routingapp/BInstallerActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index ca09c6b..35eef43 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -167,7 +167,7 @@ public class BInstallerActivity extends Activity {
   }
 
   private void scanExistingFiles() {
-    mBInstallerView.clearAllTilesStatus(MASK_INSTALLED_RD5 | MASK_CURRENT_RD5);
+    mBInstallerView.clearAllTilesStatus(MASK_CURRENT_RD5 | MASK_INSTALLED_RD5 | MASK_DELETED_RD5 | MASK_SELECTED_RD5);
 
     scanExistingFiles(new File(mBaseDir, "brouter/segments4"));
 

From b8496ffe5e1637c554d714a0412aa98a498839de Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Wed, 20 Oct 2021 07:54:08 +0200
Subject: [PATCH 16/19] Use View dimensions instead of display dimensions

---
 .../btools/routingapp/BInstallerView.java     | 55 +++++++++----------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 50cd5a3..c1ca7df 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -1,6 +1,5 @@
 package btools.routingapp;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
@@ -10,7 +9,6 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.util.AttributeSet;
-import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -29,13 +27,7 @@ public class BInstallerView extends View {
   private final File segmentDir;
   private final Matrix mat;
   private final Bitmap bmp;
-  private final float viewscale;
   private final int[] tileStatus;
-  private final int imgwOrig;
-  private final int imghOrig;
-  private final float scaleOrig;
-  private final int imgw;
-  private final int imgh;
   private final float[] testVector = new float[2];
   private final Matrix matText;
   Paint pnt_1 = new Paint();
@@ -44,8 +36,14 @@ public class BInstallerView extends View {
   int btnh = 40;
   int btnw = 160;
   float tx, ty;
+  private int imgwOrig;
+  private int imghOrig;
+  private float scaleOrig;
+  private int imgw;
+  private int imgh;
   private float lastDownX;
   private float lastDownY;
+  private float viewscale;
   private boolean tilesVisible = false;
   private long availableSize;
   private long totalSize = 0;
@@ -56,20 +54,6 @@ public class BInstallerView extends View {
   public BInstallerView(Context context, AttributeSet attrs) {
     super(context, attrs);
 
-    DisplayMetrics metrics = new DisplayMetrics();
-    ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(metrics);
-    imgwOrig = metrics.widthPixels;
-    imghOrig = metrics.heightPixels;
-    int im = Math.max(imgwOrig, imghOrig);
-
-    scaleOrig = im / 480.f;
-
-    matText = new Matrix();
-    matText.preScale(scaleOrig, scaleOrig);
-
-    imgw = (int) (imgwOrig / scaleOrig);
-    imgh = (int) (imghOrig / scaleOrig);
-
     File baseDir = ConfigHelper.getBaseDir(getContext());
     segmentDir = new File(baseDir, "brouter/segments4");
 
@@ -83,14 +67,8 @@ public class BInstallerView extends View {
     }
 
     tileStatus = new int[72 * 36];
-
-    float scaleX = imgwOrig / ((float) bmp.getWidth());
-    float scaley = imghOrig / ((float) bmp.getHeight());
-
-    viewscale = Math.min(scaleX, scaley);
-
+    matText = new Matrix();
     mat = new Matrix();
-    mat.postScale(viewscale, viewscale);
   }
 
   public void setAvailableSize(long availableSize) {
@@ -151,6 +129,25 @@ public class BInstallerView extends View {
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     super.onSizeChanged(w, h, oldw, oldh);
+
+    imgwOrig = getWidth();
+    imghOrig = getHeight();
+    int im = Math.max(imgwOrig, imghOrig);
+
+    scaleOrig = im / 480.f;
+
+    matText.preScale(scaleOrig, scaleOrig);
+
+    imgw = (int) (imgwOrig / scaleOrig);
+    imgh = (int) (imghOrig / scaleOrig);
+
+    float scaleX = imgwOrig / ((float) bmp.getWidth());
+    float scaley = imghOrig / ((float) bmp.getHeight());
+
+    viewscale = Math.min(scaleX, scaley);
+
+    mat.postScale(viewscale, viewscale);
+    tilesVisible = false;
   }
 
   @Override

From 712bff8459b4bdd2653195ad4bc9e15d2a4a5c54 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Wed, 20 Oct 2021 07:59:04 +0200
Subject: [PATCH 17/19] Use GestureDetector to handle touch events

---
 .../btools/routingapp/BInstallerView.java     | 234 ++++++++----------
 1 file changed, 108 insertions(+), 126 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index c1ca7df..3f5f76d 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -1,5 +1,6 @@
 package btools.routingapp;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
@@ -9,7 +10,9 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.util.AttributeSet;
+import android.view.GestureDetector;
 import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
 import android.view.View;
 
 import java.io.File;
@@ -24,25 +27,25 @@ public class BInstallerView extends View {
   public static final int MASK_DELETED_RD5 = 2;
   public static final int MASK_INSTALLED_RD5 = 4;
   public static final int MASK_CURRENT_RD5 = 8;
+  private static final float SCALE_GRID_VISIBLE = 3;
+  private final Bitmap bmp;
+  private final float[] testVector = new float[2];
+  private final int[] tileStatus;
   private final File segmentDir;
   private final Matrix mat;
-  private final Bitmap bmp;
-  private final int[] tileStatus;
-  private final float[] testVector = new float[2];
   private final Matrix matText;
+  private final GestureDetector mGestureDetector;
+  private final ScaleGestureDetector mScaleGestureDetector;
   Paint pnt_1 = new Paint();
   Paint pnt_2 = new Paint();
   Paint paint = new Paint();
   int btnh = 40;
   int btnw = 160;
-  float tx, ty;
   private int imgwOrig;
   private int imghOrig;
   private float scaleOrig;
   private int imgw;
   private int imgh;
-  private float lastDownX;
-  private float lastDownY;
   private float viewscale;
   private boolean tilesVisible = false;
   private long availableSize;
@@ -69,6 +72,21 @@ public class BInstallerView extends View {
     tileStatus = new int[72 * 36];
     matText = new Matrix();
     mat = new Matrix();
+    mGestureDetector = new GestureDetector(context, new GestureListener());
+    mScaleGestureDetector = new ScaleGestureDetector(context, new ScaleGestureListener());
+  }
+
+  private void setRatio(float ratio, float focusX, float focusY) {
+    mat.postScale(ratio, ratio, focusX, focusY);
+    fitBounds();
+    tilesVisible = currentScale() >= SCALE_GRID_VISIBLE;
+
+    invalidate();
+  }
+
+  private void setScale(float scale, float focusX, float focusY) {
+    float ratio = scale / currentScale();
+    setRatio(ratio, focusX, focusY);
   }
 
   public void setAvailableSize(long availableSize) {
@@ -142,9 +160,9 @@ public class BInstallerView extends View {
     imgh = (int) (imghOrig / scaleOrig);
 
     float scaleX = imgwOrig / ((float) bmp.getWidth());
-    float scaley = imghOrig / ((float) bmp.getHeight());
+    float scaleY = imghOrig / ((float) bmp.getHeight());
 
-    viewscale = Math.min(scaleX, scaley);
+    viewscale = Math.min(scaleX, scaleY);
 
     mat.postScale(viewscale, viewscale);
     tilesVisible = false;
@@ -260,120 +278,55 @@ public class BInstallerView extends View {
       }
   }
 
+  private void fitBounds() {
+    float[] srcPoints = new float[]{
+      0, 0,
+      bmp.getWidth(), bmp.getHeight()
+    };
+    float[] dstPoints = new float[srcPoints.length];
+    float transX = 0;
+    float transY = 0;
+    mat.mapPoints(dstPoints, srcPoints);
+    if (dstPoints[0] > 0) {
+      transX = -dstPoints[0];
+    } else if (dstPoints[2] < getWidth()) {
+      transX = getWidth() - dstPoints[2];
+    }
+    if (dstPoints[1] > 0) {
+      transY = -dstPoints[1];
+    } else if (dstPoints[3] < getHeight()) {
+      transY = getHeight() - dstPoints[3];
+    }
+    if (transX != 0 || transY != 0) {
+      mat.postTranslate(transX, transY);
+    }
+  }
+
+  @SuppressLint("ClickableViewAccessibility")
   @Override
   public boolean onTouchEvent(MotionEvent event) {
+    boolean retVal = mScaleGestureDetector.onTouchEvent(event);
+    retVal = mGestureDetector.onTouchEvent(event) || retVal;
+    return retVal || super.onTouchEvent(event);
+  }
 
-    // get masked (not specific to a pointer) action
-    int maskedAction = event.getActionMasked();
+  class GestureListener extends GestureDetector.SimpleOnGestureListener {
 
-    switch (maskedAction) {
-
-      case MotionEvent.ACTION_DOWN:
-      case MotionEvent.ACTION_POINTER_DOWN: {
-        lastDownX = event.getX();
-        lastDownY = event.getY();
-
-        break;
+    @Override
+    public boolean onSingleTapConfirmed(MotionEvent e) {
+      // Download Button
+      if ((delTiles > 0 || rd5Tiles >= 0) && e.getX() > imgwOrig - btnw * scaleOrig && e.getY() > imghOrig - btnh * scaleOrig) {
+        if (mOnClickListener != null) {
+          mOnClickListener.onClick(null);
+        }
+        invalidate();
+        return true;
       }
-      case MotionEvent.ACTION_MOVE: { // a pointer was moved
-
-        int np = event.getPointerCount();
-        int nh = event.getHistorySize();
-        if (nh == 0) break;
-
-        float x0 = event.getX(0);
-        float y0 = event.getY(0);
-        float hx0 = event.getHistoricalX(0, 0);
-        float hy0 = event.getHistoricalY(0, 0);
-
-        if (np > 1) // multi-touch
-        {
-          float x1 = event.getX(1);
-          float y1 = event.getY(1);
-          float hx1 = event.getHistoricalX(1, 0);
-          float hy1 = event.getHistoricalY(1, 0);
-
-          float r = (float) Math.sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0));
-          float hr = (float) Math.sqrt((hx1 - hx0) * (hx1 - hx0) + (hy1 - hy0) * (hy1 - hy0));
-
-          if (hr > 0.) {
-            float ratio = r / hr;
-
-            float mx = (x1 + x0) / 2.f;
-            float my = (y1 + y0) / 2.f;
-
-            float scale = currentScale();
-            float newscale = scale * ratio;
-
-            if (newscale > 10.f) ratio *= (10.f / newscale);
-            if (newscale < 0.5f) ratio *= (0.5f / newscale);
-
-            mat.postScale(ratio, ratio, mx, my);
-
-            mat.postScale(ratio, ratio, mx, my);
-
-            boolean tilesv = currentScale() >= 3.f;
-            if (tilesVisible && !tilesv) {
-              clearAllTilesStatus(MASK_SELECTED_RD5 | MASK_DELETED_RD5);
-            }
-            tilesVisible = tilesv;
-          }
-
-          break;
-        }
-        mat.postTranslate(x0 - hx0, y0 - hy0);
-
-        break;
-      }
-      case MotionEvent.ACTION_UP:
-
-        long downTime = event.getEventTime() - event.getDownTime();
-
-        if (downTime < 5 || downTime > 500) {
-          break;
-        }
-
-        if (Math.abs(lastDownX - event.getX()) > 10 || Math.abs(lastDownY - event.getY()) > 10) {
-          break;
-        }
-
-        // download button?
-        if ((delTiles > 0 || rd5Tiles >= 0) && event.getX() > imgwOrig - btnw * scaleOrig && event.getY() > imghOrig - btnh * scaleOrig) {
-          if (rd5Tiles == 0) {
-            for (int ix = 0; ix < 72; ix++) {
-              for (int iy = 0; iy < 36; iy++) {
-                int tidx = gridPos2Tileindex(ix, iy);
-                if (tidx != -1) {
-                  if ((tileStatus[tidx] & MASK_INSTALLED_RD5) != 0) {
-                    tileStatus[tidx] |= MASK_SELECTED_RD5;
-                  }
-                }
-
-              }
-            }
-          }
-          if (mOnClickListener != null) {
-            mOnClickListener.onClick(null);
-          }
-          invalidate();
-          break;
-        }
-
-        if (!tilesVisible) {
-          float scale = currentScale();
-          if (scale > 0f && scale < 5f) {
-            float ratio = 5f / scale;
-            mat.postScale(ratio, ratio, event.getX(), event.getY());
-            tilesVisible = true;
-          }
-          break;
-        }
 
+      if (tilesVisible) {
         Matrix imat = new Matrix();
         if (mat.invert(imat)) {
-          float[] touchpoint = new float[2];
-          touchpoint[0] = event.getX();
-          touchpoint[1] = event.getY();
+          float[] touchpoint = {e.getX(), e.getY()};
           imat.mapPoints(touchpoint);
 
           int tidx = tileIndex(touchpoint[0], touchpoint[1]);
@@ -389,23 +342,52 @@ public class BInstallerView extends View {
               tileStatus[tidx] ^= MASK_SELECTED_RD5;
             }
           }
-
-          tx = touchpoint[0];
-          ty = touchpoint[1];
         }
-
-
-        break;
-      case MotionEvent.ACTION_POINTER_UP:
-      case MotionEvent.ACTION_CANCEL: {
-        // TODO use data
-        break;
+        invalidate();
       }
+      return true;
     }
-    invalidate();
 
-    return true;
+    @Override
+    public boolean onDoubleTap(MotionEvent e) {
+      if (!tilesVisible) {
+        setScale(5, e.getX(), e.getY());
+      } else {
+        setScale(1, e.getX(), e.getY());
+      }
+      return true;
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+      mat.postTranslate(-distanceX, -distanceY);
+      fitBounds();
+      invalidate();
+      return true;
+    }
   }
 
+  class ScaleGestureListener implements ScaleGestureDetector.OnScaleGestureListener {
+
+    @Override
+    public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
+      return true;
+    }
+
+    @Override
+    public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
+      float focusX = scaleGestureDetector.getFocusX();
+      float focusY = scaleGestureDetector.getFocusY();
+      float ratio = scaleGestureDetector.getScaleFactor();
+
+      setRatio(ratio, focusX, focusY);
+
+      return true;
+    }
+
+    @Override
+    public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
+    }
+  }
 
 }

From 31e7c4ebbd278803e8cf47fe0fa03bbbad490b25 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Fri, 7 Jan 2022 08:20:47 +0100
Subject: [PATCH 18/19] Move info and button to own views

---
 brouter-routing-app/build.gradle              |   1 +
 .../btools/routingapp/BInstallerActivity.java |  56 +++++-
 .../btools/routingapp/BInstallerView.java     | 190 ++++++------------
 .../main/res/layout/activity_binstaller.xml   |  39 +++-
 .../src/main/res/values/strings.xml           |   9 +
 5 files changed, 152 insertions(+), 143 deletions(-)

diff --git a/brouter-routing-app/build.gradle b/brouter-routing-app/build.gradle
index 58dde91..2a01ef2 100644
--- a/brouter-routing-app/build.gradle
+++ b/brouter-routing-app/build.gradle
@@ -93,6 +93,7 @@ android {
 dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
 
     implementation project(':brouter-mapaccess')
     implementation project(':brouter-core')
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
index 35eef43..286142e 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerActivity.java
@@ -14,9 +14,11 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.StatFs;
+import android.text.format.Formatter;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -38,6 +40,9 @@ public class BInstallerActivity extends Activity {
   private View mDownloadInfo;
   private TextView mDownloadInfoText;
   private Button mButtonDownloadCancel;
+  private Button mButtonDownload;
+  private TextView mSummaryInfo;
+  private View mSegmentsView;
 
   public static long getAvailableSpace(String baseDir) {
     StatFs stat = new StatFs(baseDir);
@@ -57,8 +62,16 @@ public class BInstallerActivity extends Activity {
     setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
 
     setContentView(R.layout.activity_binstaller);
+    mSummaryInfo = findViewById(R.id.textViewSegmentSummary);
+    mSegmentsView = findViewById(R.id.view_segments);
     mBInstallerView = findViewById(R.id.BInstallerView);
-    mBInstallerView.setOnClickListener(
+    mBInstallerView.setOnSelectListener(
+      () -> {
+        updateDownloadButton();
+      }
+    );
+    mButtonDownload = findViewById(R.id.buttonDownload);
+    mButtonDownload.setOnClickListener(
       view -> {
         if (mBInstallerView.getSelectedTiles(MASK_DELETED_RD5).size() > 0) {
           showConfirmDelete();
@@ -80,6 +93,37 @@ public class BInstallerActivity extends Activity {
     scanExistingFiles();
   }
 
+  private String getSegmentsPlural(int count) {
+    Resources res = getResources();
+    return res.getQuantityString(R.plurals.numberOfSegments, count, count);
+  }
+
+  private void updateDownloadButton() {
+    final ArrayList<Integer> selectedTilesDownload = mBInstallerView.getSelectedTiles(MASK_SELECTED_RD5);
+    final ArrayList<Integer> selectedTilesUpdate = mBInstallerView.getSelectedTiles(MASK_INSTALLED_RD5);
+    final ArrayList<Integer> selectedTilesDelete = mBInstallerView.getSelectedTiles(MASK_DELETED_RD5);
+    mSummaryInfo.setText("");
+
+    if (selectedTilesDelete.size() > 0) {
+      mButtonDownload.setText(getString(R.string.action_delete, getSegmentsPlural(selectedTilesDelete.size())));
+      mButtonDownload.setEnabled(true);
+    } else if (selectedTilesDownload.size() > 0) {
+      long tileSize = 0;
+      for (int tileIndex : selectedTilesDownload) {
+        tileSize += BInstallerSizes.getRd5Size(tileIndex);
+      }
+      mButtonDownload.setText(getString(R.string.action_download, getSegmentsPlural(selectedTilesDownload.size())));
+      mButtonDownload.setEnabled(true);
+      mSummaryInfo.setText(getString(R.string.summary_segments, Formatter.formatFileSize(this, tileSize), Formatter.formatFileSize(this, getAvailableSpace(mBaseDir.getAbsolutePath()))));
+    } else if (selectedTilesUpdate.size() > 0) {
+      mButtonDownload.setText(getString(R.string.action_update, getSegmentsPlural(selectedTilesUpdate.size())));
+      mButtonDownload.setEnabled(true);
+    } else {
+      mButtonDownload.setText(getString(R.string.action_select));
+      mButtonDownload.setEnabled(false);
+    }
+  }
+
   private void deleteRawTracks() {
     File modeDir = new File(mBaseDir, "brouter/modes");
     String[] fileNames = modeDir.list();
@@ -103,7 +147,7 @@ public class BInstallerActivity extends Activity {
       urlparts.add(baseNameForTile(i));
     }
 
-    mBInstallerView.setVisibility(View.GONE);
+    mSegmentsView.setVisibility(View.GONE);
     mDownloadInfo.setVisibility(View.VISIBLE);
     downloadCanceled = false;
     mDownloadInfoText.setText(R.string.download_info_start);
@@ -175,12 +219,6 @@ public class BInstallerActivity extends Activity {
     if (secondary != null) {
       scanExistingFiles(secondary);
     }
-
-    long availableSize = -1;
-    try {
-      availableSize = getAvailableSpace(mBaseDir.getAbsolutePath());
-    } catch (Exception e) { /* ignore */ }
-    mBInstallerView.setAvailableSize(availableSize);
   }
 
   private void scanExistingFiles(File dir) {
@@ -249,7 +287,7 @@ public class BInstallerActivity extends Activity {
         String txt = intent.getStringExtra("txt");
         boolean ready = intent.getBooleanExtra("ready", false);
         if (!ready) {
-          mBInstallerView.setVisibility(View.VISIBLE);
+          mSegmentsView.setVisibility(View.VISIBLE);
           mDownloadInfo.setVisibility(View.GONE);
           scanExistingFiles();
         }
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 3f5f76d..8a41b41 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -15,13 +15,10 @@ import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.View;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 
-import btools.router.RoutingHelper;
-
 public class BInstallerView extends View {
   public static final int MASK_SELECTED_RD5 = 1;
   public static final int MASK_DELETED_RD5 = 2;
@@ -31,35 +28,18 @@ public class BInstallerView extends View {
   private final Bitmap bmp;
   private final float[] testVector = new float[2];
   private final int[] tileStatus;
-  private final File segmentDir;
   private final Matrix mat;
-  private final Matrix matText;
   private final GestureDetector mGestureDetector;
   private final ScaleGestureDetector mScaleGestureDetector;
-  Paint pnt_1 = new Paint();
-  Paint pnt_2 = new Paint();
-  Paint paint = new Paint();
-  int btnh = 40;
-  int btnw = 160;
-  private int imgwOrig;
-  private int imghOrig;
-  private float scaleOrig;
-  private int imgw;
-  private int imgh;
+  Paint paintGrid = new Paint();
+  Paint paintTiles = new Paint();
   private float viewscale;
   private boolean tilesVisible = false;
-  private long availableSize;
-  private long totalSize = 0;
-  private long rd5Tiles = 0;
-  private long delTiles = 0;
-  private OnClickListener mOnClickListener;
+  private OnSelectListener mOnSelectListener;
 
   public BInstallerView(Context context, AttributeSet attrs) {
     super(context, attrs);
 
-    File baseDir = ConfigHelper.getBaseDir(getContext());
-    segmentDir = new File(baseDir, "brouter/segments4");
-
     try {
       AssetManager assetManager = getContext().getAssets();
       InputStream istr = assetManager.open("world.png");
@@ -70,12 +50,15 @@ public class BInstallerView extends View {
     }
 
     tileStatus = new int[72 * 36];
-    matText = new Matrix();
     mat = new Matrix();
     mGestureDetector = new GestureDetector(context, new GestureListener());
     mScaleGestureDetector = new ScaleGestureDetector(context, new ScaleGestureListener());
   }
 
+  public void setOnSelectListener(OnSelectListener listener) {
+    mOnSelectListener = listener;
+  }
+
   private void setRatio(float ratio, float focusX, float focusY) {
     mat.postScale(ratio, ratio, focusX, focusY);
     fitBounds();
@@ -89,12 +72,20 @@ public class BInstallerView extends View {
     setRatio(ratio, focusX, focusY);
   }
 
-  public void setAvailableSize(long availableSize) {
-    this.availableSize = availableSize;
-  }
-
   public void setTileStatus(int tileIndex, int tileMask) {
     tileStatus[tileIndex] |= tileMask;
+    if (mOnSelectListener != null) {
+      mOnSelectListener.onSelect();
+    }
+    invalidate();
+  }
+
+  public void toggleTileStatus(int tileIndex, int tileMask) {
+    tileStatus[tileIndex] ^= tileMask;
+    if (mOnSelectListener != null) {
+      mOnSelectListener.onSelect();
+    }
+    invalidate();
   }
 
   public void clearAllTilesStatus(int tileMask) {
@@ -104,6 +95,9 @@ public class BInstallerView extends View {
         tileStatus[tileIndex] ^= tileStatus[tileIndex] & tileMask;
       }
     }
+    if (mOnSelectListener != null) {
+      mOnSelectListener.onSelect();
+    }
     invalidate();
   }
 
@@ -121,11 +115,6 @@ public class BInstallerView extends View {
     return selectedTiles;
   }
 
-  @Override
-  public void setOnClickListener(OnClickListener listener) {
-    mOnClickListener = listener;
-  }
-
   private int gridPos2Tileindex(int ix, int iy) {
     return (35 - iy) * 72 + (ix >= 70 ? ix - 70 : ix + 2);
   }
@@ -139,30 +128,22 @@ public class BInstallerView extends View {
 
   // get back the current image scale
   private float currentScale() {
-    testVector[1] = 1.f;
+    testVector[0] = 1.f;
     mat.mapVectors(testVector);
-    return testVector[1] / viewscale;
+    return testVector[0] / viewscale;
   }
 
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     super.onSizeChanged(w, h, oldw, oldh);
 
-    imgwOrig = getWidth();
-    imghOrig = getHeight();
-    int im = Math.max(imgwOrig, imghOrig);
-
-    scaleOrig = im / 480.f;
-
-    matText.preScale(scaleOrig, scaleOrig);
-
-    imgw = (int) (imgwOrig / scaleOrig);
-    imgh = (int) (imghOrig / scaleOrig);
+    int imgwOrig = getWidth();
+    int imghOrig = getHeight();
 
     float scaleX = imgwOrig / ((float) bmp.getWidth());
     float scaleY = imghOrig / ((float) bmp.getHeight());
 
-    viewscale = Math.min(scaleX, scaleY);
+    viewscale = Math.max(scaleX, scaleY);
 
     mat.postScale(viewscale, viewscale);
     tilesVisible = false;
@@ -180,93 +161,47 @@ public class BInstallerView extends View {
     float fh = ih / 36.f;
 
     if (tilesVisible) {
-      pnt_1.setColor(Color.GREEN);
-      pnt_1.setStyle(Paint.Style.STROKE);
+      paintGrid.setColor(Color.GREEN);
+      paintGrid.setStyle(Paint.Style.STROKE);
       for (int ix = 0; ix < 72; ix++) {
         for (int iy = 0; iy < 36; iy++) {
           int tidx = gridPos2Tileindex(ix, iy);
           int tilesize = BInstallerSizes.getRd5Size(tidx);
           if (tilesize > 0) {
-            canvas.drawRect(fw * ix, fh * (iy + 1), fw * (ix + 1), fh * iy, pnt_1);
+            canvas.drawRect(fw * ix, fh * (iy + 1), fw * (ix + 1), fh * iy, paintGrid);
           }
         }
       }
-    }
 
-    rd5Tiles = 0;
-    delTiles = 0;
-    totalSize = 0;
-    int mask2 = MASK_SELECTED_RD5 | MASK_DELETED_RD5 | MASK_INSTALLED_RD5;
-    int mask3 = mask2 | MASK_CURRENT_RD5;
+      int mask2 = MASK_SELECTED_RD5 | MASK_DELETED_RD5 | MASK_INSTALLED_RD5;
+      int mask3 = mask2 | MASK_CURRENT_RD5;
 
-    pnt_2.setStyle(Paint.Style.STROKE);
-    pnt_2.setColor(Color.GRAY);
-    pnt_2.setStrokeWidth(1);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_INSTALLED_RD5, mask3, false, false, tilesVisible);
-    pnt_2.setColor(Color.BLUE);
-    pnt_2.setStrokeWidth(1);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_INSTALLED_RD5 | MASK_CURRENT_RD5, mask3, false, false, tilesVisible);
-    pnt_2.setColor(Color.GREEN);
-    pnt_2.setStrokeWidth(2);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_SELECTED_RD5, mask2, true, false, tilesVisible);
-    pnt_2.setColor(Color.YELLOW);
-    pnt_2.setStrokeWidth(2);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_SELECTED_RD5 | MASK_INSTALLED_RD5, mask2, true, false, tilesVisible);
-    pnt_2.setColor(Color.RED);
-    pnt_2.setStrokeWidth(2);
-    drawSelectedTiles(canvas, pnt_2, fw, fh, MASK_DELETED_RD5 | MASK_INSTALLED_RD5, mask2, false, true, tilesVisible);
-
-    canvas.setMatrix(matText);
-
-    paint.setColor(Color.RED);
-
-    long mb = 1024 * 1024;
-
-    if (!this.tilesVisible) {
-      paint.setTextSize(35);
-      canvas.drawText("Touch region to zoom in!", 30, (imgh / 3) * 2, paint);
-    }
-    paint.setTextSize(20);
-
-
-    String totmb = ((totalSize + mb - 1) / mb) + " MB";
-    String freemb = availableSize >= 0 ? ((availableSize + mb - 1) / mb) + " MB" : "?";
-    canvas.drawText("Selected segments=" + rd5Tiles, 10, 25, paint);
-    canvas.drawText("Size=" + totmb + " Free=" + freemb, 10, 45, paint);
-
-
-    String btnText = null;
-    if (delTiles > 0) btnText = "Delete " + delTiles + " tiles";
-    else if (rd5Tiles > 0) btnText = "Start Download";
-    else if (this.tilesVisible &&
-      rd5Tiles == 0 &&
-      RoutingHelper.hasDirectoryAnyDatafiles(segmentDir)) btnText = "Update all";
-
-    if (btnText != null) {
-      paint.setStyle(Paint.Style.STROKE);
-      canvas.drawRect(imgw - btnw, imgh - btnh, imgw - 2, imgh - 2, paint);
-      paint.setStyle(Paint.Style.FILL);
-      canvas.drawText(btnText, imgw - btnw + 5, imgh - 10, paint);
+      paintTiles.setStyle(Paint.Style.STROKE);
+      paintTiles.setColor(Color.GRAY);
+      paintTiles.setStrokeWidth(1);
+      drawSelectedTiles(canvas, paintTiles, fw, fh, MASK_INSTALLED_RD5, mask3);
+      paintTiles.setColor(Color.BLUE);
+      paintTiles.setStrokeWidth(1);
+      drawSelectedTiles(canvas, paintTiles, fw, fh, MASK_INSTALLED_RD5 | MASK_CURRENT_RD5, mask3);
+      paintTiles.setColor(Color.GREEN);
+      paintTiles.setStrokeWidth(2);
+      drawSelectedTiles(canvas, paintTiles, fw, fh, MASK_SELECTED_RD5, mask2);
+      paintTiles.setColor(Color.YELLOW);
+      paintTiles.setStrokeWidth(2);
+      drawSelectedTiles(canvas, paintTiles, fw, fh, MASK_SELECTED_RD5 | MASK_INSTALLED_RD5, mask2);
+      paintTiles.setColor(Color.RED);
+      paintTiles.setStrokeWidth(2);
+      drawSelectedTiles(canvas, paintTiles, fw, fh, MASK_DELETED_RD5 | MASK_INSTALLED_RD5, mask2);
     }
   }
 
-  private void drawSelectedTiles(Canvas canvas, Paint pnt, float fw, float fh, int status, int mask, boolean doCount, boolean cntDel, boolean doDraw) {
+  private void drawSelectedTiles(Canvas canvas, Paint pnt, float fw, float fh, int status, int mask) {
     for (int ix = 0; ix < 72; ix++)
       for (int iy = 0; iy < 36; iy++) {
         int tidx = gridPos2Tileindex(ix, iy);
         if ((tileStatus[tidx] & mask) == status) {
           int tilesize = BInstallerSizes.getRd5Size(tidx);
           if (tilesize > 0) {
-            if (doCount) {
-              rd5Tiles++;
-              totalSize += BInstallerSizes.getRd5Size(tidx);
-            }
-            if (cntDel) {
-              delTiles++;
-              totalSize += BInstallerSizes.getRd5Size(tidx);
-            }
-            if (!doDraw)
-              continue;
             // draw cross
             canvas.drawLine(fw * ix, fh * iy, fw * (ix + 1), fh * (iy + 1), pnt);
             canvas.drawLine(fw * ix, fh * (iy + 1), fw * (ix + 1), fh * iy, pnt);
@@ -310,36 +245,31 @@ public class BInstallerView extends View {
     return retVal || super.onTouchEvent(event);
   }
 
+  interface OnSelectListener {
+    void onSelect();
+  }
+
   class GestureListener extends GestureDetector.SimpleOnGestureListener {
 
     @Override
     public boolean onSingleTapConfirmed(MotionEvent e) {
-      // Download Button
-      if ((delTiles > 0 || rd5Tiles >= 0) && e.getX() > imgwOrig - btnw * scaleOrig && e.getY() > imghOrig - btnh * scaleOrig) {
-        if (mOnClickListener != null) {
-          mOnClickListener.onClick(null);
-        }
-        invalidate();
-        return true;
-      }
-
       if (tilesVisible) {
         Matrix imat = new Matrix();
         if (mat.invert(imat)) {
-          float[] touchpoint = {e.getX(), e.getY()};
-          imat.mapPoints(touchpoint);
+          float[] touchPoint = {e.getX(), e.getY()};
+          imat.mapPoints(touchPoint);
 
-          int tidx = tileIndex(touchpoint[0], touchpoint[1]);
+          int tidx = tileIndex(touchPoint[0], touchPoint[1]);
           if (tidx != -1) {
             if ((tileStatus[tidx] & MASK_SELECTED_RD5) != 0) {
-              tileStatus[tidx] ^= MASK_SELECTED_RD5;
+              toggleTileStatus(tidx, MASK_SELECTED_RD5);
               if ((tileStatus[tidx] & MASK_INSTALLED_RD5) != 0) {
-                tileStatus[tidx] |= MASK_DELETED_RD5;
+                setTileStatus(tidx, MASK_DELETED_RD5);
               }
             } else if ((tileStatus[tidx] & MASK_DELETED_RD5) != 0) {
-              tileStatus[tidx] ^= MASK_DELETED_RD5;
+              toggleTileStatus(tidx, MASK_DELETED_RD5);
             } else {
-              tileStatus[tidx] ^= MASK_SELECTED_RD5;
+              toggleTileStatus(tidx, MASK_SELECTED_RD5);
             }
           }
         }
diff --git a/brouter-routing-app/src/main/res/layout/activity_binstaller.xml b/brouter-routing-app/src/main/res/layout/activity_binstaller.xml
index ccaa634..11e4a84 100644
--- a/brouter-routing-app/src/main/res/layout/activity_binstaller.xml
+++ b/brouter-routing-app/src/main/res/layout/activity_binstaller.xml
@@ -1,13 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <btools.routingapp.BInstallerView
-        android:id="@+id/BInstallerView"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/view_segments"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent">
+
+        <btools.routingapp.BInstallerView
+            android:id="@+id/BInstallerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+            android:id="@+id/buttonDownload"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/action_select"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <TextView
+            android:id="@+id/textViewSegmentSummary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginBottom="8dp"
+            android:textColor="@android:color/primary_text_light"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
         android:id="@+id/view_download_progress"
@@ -21,7 +52,7 @@
             android:id="@+id/textViewDownloadProgress"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="34sp" />
+            android:textSize="20sp" />
 
         <Space
             android:layout_width="match_parent"
diff --git a/brouter-routing-app/src/main/res/values/strings.xml b/brouter-routing-app/src/main/res/values/strings.xml
index 34cb83e..b7d0d46 100644
--- a/brouter-routing-app/src/main/res/values/strings.xml
+++ b/brouter-routing-app/src/main/res/values/strings.xml
@@ -15,10 +15,19 @@
 -->
 
 <resources>
+    <plurals name="numberOfSegments">
+        <item quantity="one">%d segment</item>
+        <item quantity="other">%d segments</item>
+    </plurals>
     <string name="app_name">BRouter</string>
     <string name="cancel_download">Cancel Download</string>
     <string name="import_profile">Import Profile</string>
     <string name="profile_filename_example">filename.brf</string>
     <string name="download_info_start">Starting download…</string>
     <string name="download_info_cancel">Cancelling…</string>
+    <string name="action_download">Download %s</string>
+    <string name="action_delete">Delete %s</string>
+    <string name="action_update">Update %s</string>
+    <string name="action_select">Select segments</string>
+    <string name="summary_segments">Size=%s\nFree=%s</string>
 </resources>

From 1a3a77de7242aba418baa2d8d03081e07c763132 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Tue, 11 Jan 2022 21:46:13 +0100
Subject: [PATCH 19/19] Use initial view as minimal zoom level

---
 .../main/java/btools/routingapp/BInstallerView.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 8a41b41..ffe75c2 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -60,11 +60,13 @@ public class BInstallerView extends View {
   }
 
   private void setRatio(float ratio, float focusX, float focusY) {
-    mat.postScale(ratio, ratio, focusX, focusY);
-    fitBounds();
-    tilesVisible = currentScale() >= SCALE_GRID_VISIBLE;
+    if (currentScale() * ratio >= 1) {
+      mat.postScale(ratio, ratio, focusX, focusY);
+      fitBounds();
+      tilesVisible = currentScale() >= SCALE_GRID_VISIBLE;
 
-    invalidate();
+      invalidate();
+    }
   }
 
   private void setScale(float scale, float focusX, float focusY) {