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] 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>