1
0
Fork 0

fixed all alignment and size issues, especially on Android 15; got rid of the ConstraintLayout

This commit is contained in:
sspanak 2025-01-31 20:13:33 +02:00 committed by Dimo Karaivanov
parent b9ce74f254
commit d23efc4e60
9 changed files with 184 additions and 100 deletions

View file

@ -1,34 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/TTheme.Numpad.FullScreenAlignmentContainer"
android:id="@+id/numpad_container">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/TTheme.FullScreenContainer"
android:id="@+id/full_screen_container">
<androidx.constraintlayout.widget.ConstraintLayout
style="@style/TTheme.Numpad.FullScreenContainer"
android:id="@+id/numpad_width_constraint_wrapper">
<LinearLayout style="@style/TTheme.FullScreenContainer.SideBumper" android:id="@+id/numpad_bumper_left" />
<LinearLayout style="@style/TTheme.Numpad" android:id="@+id/numpad_container">
<View style="@style/TTheme.Keyboard.TopSeparator" />
<include layout="@layout/panel_numpad_status_bar" />
<LinearLayout
style="@style/TTheme.Numpad"
android:id="@+id/linearLayout"
tools:ignore="MissingConstraints"> <!-- the constraints are set in the styles -->
<View style="@style/TTheme.Keyboard.TopSeparator" />
<include layout="@layout/panel_numpad_status_bar" />
<LinearLayout
android:id="@+id/main_soft_keys"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<include layout="@layout/panel_numpad_left" />
<include layout="@layout/panel_numpad_digits" />
<include layout="@layout/panel_numpad_text_editing" />
<include layout="@layout/panel_numpad_right"/>
</LinearLayout>
android:id="@+id/main_soft_keys"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<include layout="@layout/panel_numpad_left" />
<include layout="@layout/panel_numpad_digits" />
<include layout="@layout/panel_numpad_text_editing" />
<include layout="@layout/panel_numpad_right" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout style="@style/TTheme.FullScreenContainer.SideBumper" android:id="@+id/numpad_bumper_right" />
</LinearLayout>

View file

@ -139,29 +139,26 @@
Numpad
*******************************************-->
<!-- Full screen containers -->
<style name="TTheme.Numpad.FullScreenAlignmentContainer" parent="">
<style name="TTheme.FullScreenContainer" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:layoutDirection">ltr</item>
<item name="android:orientation">horizontal</item>
</style>
<style name="TTheme.Numpad.FullScreenContainer" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:maxWidth">@dimen/numpad_max_width</item>
<item name="layout_constraintStart_toStartOf">parent</item>
<item name="layout_constraintTop_toTopOf">parent</item>
<style name="TTheme.FullScreenContainer.SideBumper" parent="">
<item name="android:layout_height">1dp</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">0</item>
<item name="android:layoutDirection">ltr</item>
<item name="android:orientation">horizontal</item>
</style>
<!-- The keyboard itself -->
<style name="TTheme.Numpad" parent="TTheme.Keyboard">
<item name="layout_constraintEnd_toEndOf">parent</item>
<item name="layout_constraintStart_toStartOf">parent</item>
<item name="layout_constraintTop_toTopOf">parent</item>
<item name="android:layoutDirection">ltr</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">100</item>
<item name="android:orientation">vertical</item>
<item name="android:paddingBottom">@dimen/numpad_keys_spacing_bottom</item>
</style>