From 1686bd822817833a6d446b37df503ff142b8c198 Mon Sep 17 00:00:00 2001 From: BinLiang-Eric Date: Tue, 25 Nov 2025 12:02:36 +1100 Subject: [PATCH] fix: adjust note taking button display UI --- CHANGES.txt | 3 + aware-core/aware.gradle | 2 +- aware-core/build.gradle | 2 +- aware-phone/build.gradle | 2 +- aware-phone/src/main/AndroidManifest.xml | 3 +- .../com/aware/phone/ui/TakeNoteActivity.java | 40 ++++++- .../main/res/layout/activity_take_note.xml | 105 +++++++++--------- build.gradle | 2 +- resources/aware-phone-arm64-v8a-release.apk | 4 +- resources/aware-phone-armeabi-release.apk | 4 +- resources/aware-phone-armeabi-v7a-release.apk | 4 +- resources/aware-phone-x86-release.apk | 4 +- resources/aware-phone-x86_64-release.apk | 4 +- resources/output-metadata.json | 36 +++--- 14 files changed, 129 insertions(+), 86 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2cd02b9..0a22ee6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,7 @@ Change log for AWARE +4.7.4.beta +- Fix note taking button display UI + 4.7.3.beta - add column for record bluetooth connection status diff --git a/aware-core/aware.gradle b/aware-core/aware.gradle index 5be8ec7..6dc6e49 100644 --- a/aware-core/aware.gradle +++ b/aware-core/aware.gradle @@ -4,7 +4,7 @@ buildscript { mqtt_libs = '1.2.1' ion_libs = "2.+" google_libs = "17.0.0" - version_code = 3 + version_code = 4 version_readable = "4.7." + version_code + "." + "beta" compile_sdk = 28 target_sdk = 28 diff --git a/aware-core/build.gradle b/aware-core/build.gradle index f8e45b6..4e70271 100644 --- a/aware-core/build.gradle +++ b/aware-core/build.gradle @@ -72,7 +72,7 @@ dependencies { implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:$mqtt_libs" implementation 'com.koushikdutta.ion:ion:2.2.1' implementation 'com.google.android.material:material:1.1.0-alpha09' - implementation "org.jetbrains.anko:anko:$anko_version" +// implementation "org.jetbrains.anko:anko:$anko_version" implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.annotation:annotation:1.1.0' diff --git a/aware-phone/build.gradle b/aware-phone/build.gradle index 16677f8..2478dc7 100755 --- a/aware-phone/build.gradle +++ b/aware-phone/build.gradle @@ -115,7 +115,7 @@ if (System.getenv("storeFile") != null && System.getenv("storePassword") != null dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation "org.jetbrains.anko:anko:$anko_version" +// implementation "org.jetbrains.anko:anko:$anko_version" implementation "me.dm7.barcodescanner:zbar:1.9.8" diff --git a/aware-phone/src/main/AndroidManifest.xml b/aware-phone/src/main/AndroidManifest.xml index 2bf7f46..77c39e0 100755 --- a/aware-phone/src/main/AndroidManifest.xml +++ b/aware-phone/src/main/AndroidManifest.xml @@ -107,7 +107,8 @@ + android:exported="false" + android:windowSoftInputMode="adjustResize"> = textLength) { + scrollToBottom(); + } } @Override public void afterTextChanged(Editable editable) {} - }); - + }); + // Auto-scroll to bottom when EditText gains focus (keyboard appears) + noteEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + if (hasFocus) { + // Post the scroll action to ensure layout is complete + scrollView.post(new Runnable() { + @Override + public void run() { + scrollToBottom(); + } + }); + } + } + }); + } + private void scrollToBottom() { + scrollView.post(new Runnable() { + @Override + public void run() { + // Scroll to the absolute bottom to ensure buttons are visible + View lastChild = scrollView.getChildAt(scrollView.getChildCount() - 1); + int bottom = lastChild.getBottom() + scrollView.getPaddingBottom(); + int delta = bottom - (scrollView.getScrollY() + scrollView.getHeight()); + scrollView.smoothScrollBy(0, delta); + } + }); } private void saveNote() { diff --git a/aware-phone/src/main/res/layout/activity_take_note.xml b/aware-phone/src/main/res/layout/activity_take_note.xml index 9f94bb9..54a5e4b 100644 --- a/aware-phone/src/main/res/layout/activity_take_note.xml +++ b/aware-phone/src/main/res/layout/activity_take_note.xml @@ -1,69 +1,72 @@ - - - + android:fillViewport="true"> + android:orientation="vertical" + android:padding="16dp"> - + android:minHeight="200dp" + android:gravity="top" + android:hint="Enter your note here..." + android:inputType="textMultiLine" + android:maxLength="10000"/> - - + android:orientation="horizontal" + android:layout_marginTop="8dp"> - + -