commit ec77ec48d119b51812212b6c81db4479e247d7d6 Author: Fabio Mazza Date: Tue May 19 20:28:31 2026 +0200 Replace layout with ConstraintLayout diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/BarcodeFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/BarcodeFragment.kt index cd37b04..199a9e2 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/BarcodeFragment.kt +++ b/app/src/main/java/it/reyboz/bustorino/fragments/BarcodeFragment.kt @@ -11,6 +11,7 @@ import it.reyboz.bustorino.middleware.BarcodeScanContract import it.reyboz.bustorino.middleware.BarcodeScanOptions import it.reyboz.bustorino.middleware.BarcodeScanUtils +//TODO: This might be probably implemented as interface abstract class BarcodeFragment : ScreenBaseFragment(){ private val barcodeLauncher = registerForActivityResult(BarcodeScanContract(), ActivityResultCallback { diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/ButtonsFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/ButtonsFragment.kt index 07b8f0e..662c372 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/ButtonsFragment.kt +++ b/app/src/main/java/it/reyboz/bustorino/fragments/ButtonsFragment.kt @@ -52,7 +52,7 @@ class ButtonsFragment : BarcodeFragment() { CardMenuItem(CardAction.FAVORITES_STOPS, getString(R.string.action_favorites), R.drawable.ic_star_filled_white), CardMenuItem(CardAction.LINES, getString(R.string.lines), R.drawable.ic_moving_emph), CardMenuItem(CardAction.SETTINGS, getString(R.string.action_settings), R.drawable.ic_baseline_settings_24), - CardMenuItem(CardAction.QR_SCAN, getString(R.string.scan_qr_code_stop), R.drawable.qrcode_button_default) + CardMenuItem(CardAction.QR_SCAN, getString(R.string.scan_qr_code_stop), R.drawable.qr_code_scan) ) gridLayout = root.findViewById(R.id.homeGridLayout) diff --git a/app/src/main/res/layout/fragment_main_screen.xml b/app/src/main/res/layout/fragment_main_screen.xml index 8e450a1..b2ab7c6 100644 --- a/app/src/main/res/layout/fragment_main_screen.xml +++ b/app/src/main/res/layout/fragment_main_screen.xml @@ -1,38 +1,47 @@ - - > + android:contentDescription="@string/scan_qr_code_stop" + android:scaleType="fitCenter" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + /> + @@ -40,33 +49,36 @@ android:layout_alignParentStart="true"--> - + @@ -76,30 +88,32 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="8dp" - android:layout_alignParentEnd="true" - android:layout_alignParentStart="true" android:layout_below="@+id/QRButton" android:layout_marginTop="3dp" android:layout_marginEnd="10dp" android:layout_marginStart="10dp" android:indeterminateOnly="true" android:minWidth="10dp" - android:visibility="gone" /> - - + android:visibility="gone" + app:layout_constraintTop_toBottomOf="@id/searchButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + /> - \ No newline at end of file + \ No newline at end of file