nils/mg4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

App 2.4.3: pairing code visible on the car screen

Browse Source 
The code below the QR code was not visible on the head unit: the dialog
stacked the text, a 240 dp QR code, the code and the status, and its
content could not scroll, so on the wide, low screen the lower part
was cut off. On wide screens the QR code now sits left of the text,
the content scrolls, and the code is also part of the instruction
sentence, so it is readable wherever the text is.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
This commit is contained in:
nils
2026-10-17 21:12:21 +02:00
co-authored by Claude Opus 5.5
parent 8a5813fa16
commit 46dccee1de
3 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+2 -2
View File
@@ -34,8 +34,8 @@ android {
applicationId "com.stinnesbeck.nilsmg4"
minSdk 27
targetSdk 36
versionCode 60
versionName "2.4.2"
versionCode 61
versionName "2.4.3"
// Nothing about the server ships in the APK: its URL and ingest token are entered in
// the app's Server tab (ServerConfig), and the database is only reachable by the server.
app/src/main/java/com/evsuite/abrp/MainActivity.java
+37 -8
View File
@@ -483,10 +483,17 @@ public class MainActivity extends AppCompatActivity {
float density = getResources().getDisplayMetrics().density;
int pad = (int) (24 * density);
// On the head unit's wide, low screen the QR code sits left of the text: stacked, the
// code and status below a 240 dp QR code were cut off. Scrollable either way, so
// nothing can be clipped on any screen.
android.util.DisplayMetrics metrics = getResources().getDisplayMetrics();
boolean wide = metrics.widthPixels > metrics.heightPixels;
android.widget.LinearLayout panel = new android.widget.LinearLayout(this);
panel.setOrientation(android.widget.LinearLayout.VERTICAL);
panel.setGravity(android.view.Gravity.CENTER_HORIZONTAL);
panel.setOrientation(wide ? android.widget.LinearLayout.HORIZONTAL : android.widget.LinearLayout.VERTICAL);
panel.setGravity(wide ? android.view.Gravity.CENTER_VERTICAL : android.view.Gravity.CENTER_HORIZONTAL);
panel.setPadding(pad, pad, pad, pad);
android.widget.LinearLayout column = new android.widget.LinearLayout(this);
column.setOrientation(android.widget.LinearLayout.VERTICAL);
TextView instructions = new TextView(this);
instructions.setTextAppearance(R.style.Text_EV_Secondary);
ImageView qr = new ImageView(this);
@@ -501,17 +508,37 @@ public class MainActivity extends AppCompatActivity {
TextView status = new TextView(this);
status.setTextAppearance(R.style.Text_EV_Body);
status.setText(R.string.pair_starting);
panel.addView(instructions);
android.widget.LinearLayout.LayoutParams qrParams = new android.widget.LinearLayout.LayoutParams(qrSize, qrSize);
qrParams.topMargin = pad / 2;
android.widget.LinearLayout.LayoutParams columnParams;
if (wide) {
qrParams.rightMargin = pad;
columnParams = new android.widget.LinearLayout.LayoutParams(
0, android.view.ViewGroup.LayoutParams.WRAP_CONTENT, 1f);
panel.addView(qr, qrParams);
panel.addView(code);
panel.addView(status);
panel.addView(column, columnParams);
column.addView(instructions);
} else {
qrParams.topMargin = pad / 2;
qrParams.bottomMargin = pad / 2;
columnParams = new android.widget.LinearLayout.LayoutParams(
android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
panel.addView(instructions);
panel.addView(qr, qrParams);
panel.addView(column, columnParams);
}
android.widget.LinearLayout.LayoutParams codeParams = new android.widget.LinearLayout.LayoutParams(
android.view.ViewGroup.LayoutParams.WRAP_CONTENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
codeParams.topMargin = pad / 2;
codeParams.bottomMargin = pad / 2;
column.addView(code, codeParams);
column.addView(status);
android.widget.ScrollView scroll = new android.widget.ScrollView(this);
scroll.addView(panel);
final boolean[] cancelled = {false};
androidx.appcompat.app.AlertDialog dialog = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.pair_title)
.setView(panel)
.setView(scroll)
.setNegativeButton(R.string.pair_cancel, null)
.create();
// Shown only once the server has answered, so a failure leaves no empty QR frame.
@@ -527,7 +554,9 @@ public class MainActivity extends AppCompatActivity {
PairingClient.Request request = PairingClient.start(url, installationId);
android.graphics.Bitmap bitmap = QrCode.generate(request.verificationUriComplete, 416);
runOnUiThread(() -> {
instructions.setText(getString(R.string.pair_scan, request.verificationUri));
// The code is in the sentence as well as below it, so it is readable
// wherever the text is.
instructions.setText(getString(R.string.pair_scan, request.verificationUri, request.userCode));
if (bitmap != null) {
qr.setImageBitmap(bitmap);
qr.setVisibility(View.VISIBLE);
app/src/main/res/values/strings.xml
+1 -1
View File
@@ -58,7 +58,7 @@
<string name="btn_pair">Pair with phone</string>
<string name="pair_hint">Shows a QR code: scan it with your phone and approve with the approval password. The token below is then filled in for you.</string>
<string name="pair_title">Pair with phone</string>
<string name="pair_scan">Scan with your phone, or open %1$s and enter this code:</string>
<string name="pair_scan">Scan the QR code with your phone, or open %1$s and enter the code %2$s:</string>
<string name="pair_waiting">Waiting for approval…</string>
<string name="pair_starting">Contacting the server…</string>
<string name="pair_ok">Paired — this car now has its own token</string>