luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-21 22:59:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed setup title text was too large on some devices & setup screen elements centered (#70)

Browse source
This commit is contained in:
Md. Rifat Hasan Jihan 2023-08-14 21:10:47 +06:00 • committed by GitHub
parent c92b663e5b
commit d0a5e0f98a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 59 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/res/layout/setup_step.xml
View file

@ -34,5 +34,8 @@
<TextView
android:id="@+id/setup_step_action_label"
style="@style/setupStepActionLabelStyle"
android:layout_marginTop="@dimen/setup_step_horizontal_line_height" />
android:layout_marginTop="@dimen/setup_step_horizontal_line_height"
android:paddingTop="@dimen/setup_step_action_padding"
android:paddingBottom="@dimen/setup_step_action_padding"
android:layout_height="wrap_content"/>
</LinearLayout>

8
app/src/main/res/layout/setup_steps_cards.xml
View file

@ -24,7 +24,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/setup_step_vertical_padding"
android:orientation="horizontal">
android:orientation="horizontal"
android:gravity="center">
<TextView
android:id="@+id/setup_step1_bullet"
style="@style/setupStepBulletStyle"
@ -65,5 +66,8 @@
android:id="@+id/setup_finish"
android:text="@string/setup_finish_action"
style="@style/setupStepActionLabelStyle"
android:layout_marginTop="@dimen/setup_step_horizontal_line_height" />
android:layout_marginTop="@dimen/setup_step_horizontal_line_height"
android:paddingTop="@dimen/setup_step_action_padding"
android:paddingBottom="@dimen/setup_step_action_padding"
android:layout_height="wrap_content"/>
</merge>

3
app/src/main/res/layout/setup_steps_screen.xml
View file

@ -21,7 +21,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:gravity="center">
<include layout="@layout/setup_steps_title" />
<include layout="@layout/setup_steps_cards" />
</LinearLayout>

1
app/src/main/res/layout/setup_steps_title.xml
View file

@ -21,5 +21,6 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
android:id="@+id/setup_title"
android:gravity="center"
style="@style/setupTitleStyle" />
</merge>

3
app/src/main/res/layout/setup_welcome_screen.xml
View file

@ -21,7 +21,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:gravity="center">
<include layout="@layout/setup_welcome_title" />
<include layout="@layout/setup_welcome_video" />
</LinearLayout>

2
app/src/main/res/layout/setup_welcome_title.xml
View file

@ -21,10 +21,12 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
android:id="@+id/setup_welcome_title"
android:gravity="center"
style="@style/setupTitleStyle" />
<TextView
android:id="@+id/setup_welcome_description"
android:text="@string/setup_welcome_additional_description"
android:layout_marginTop="@dimen/setup_welcome_description_top_margin"
android:gravity="center"
style="@style/setupWelcomeDescritpionStyle" />
</merge>

5
app/src/main/res/layout/setup_welcome_video.xml
View file

@ -25,6 +25,10 @@
android:orientation="horizontal"
android:paddingTop="@dimen/setup_welcome_video_top_padding"
android:paddingBottom="@dimen/setup_welcome_video_bottom_padding">
<View
android:layout_weight="@integer/setup_welcome_video_end_padding_weight_in_screen"
android:layout_width="0dp"
android:layout_height="0dp" />
<LinearLayout
android:layout_weight="@integer/setup_welcome_video_weight_in_screen"
android:layout_width="0dp"
@ -34,6 +38,7 @@
android:background="@color/setup_welcome_video_margin_color" >
<VideoView
android:id="@+id/setup_welcome_video"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/setup_background"

9
app/src/main/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
View file

@ -22,12 +22,13 @@
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
<dimen name="setup_step_action_text_size">24sp</dimen>
<dimen name="setup_vertical_padding">96dp</dimen>
<dimen name="setup_horizontal_padding">144dp</dimen>
<dimen name="setup_step_action_height">48dp</dimen>
<dimen name="setup_step_action_height">62dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
@ -36,6 +37,6 @@
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">24dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">70</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
<integer name="setup_welcome_video_weight_in_screen">50</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

7
app/src/main/res/values-h330dp-land/setup-dimens-large-phone-land.xml
View file

@ -25,9 +25,10 @@
<dimen name="setup_step_action_text_size">18sp</dimen>
<dimen name="setup_vertical_padding">16dp</dimen>
<dimen name="setup_horizontal_padding">16dp</dimen>
<dimen name="setup_step_action_height">48dp</dimen>
<dimen name="setup_step_action_height">54dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
@ -36,6 +37,6 @@
<dimen name="setup_welcome_description_top_margin">10dp</dimen>
<dimen name="setup_welcome_video_top_padding">0dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">70</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
<integer name="setup_welcome_video_weight_in_screen">15</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

9
app/src/main/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
View file

@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Setup wizard dimensions for small-tablet/landscape. -->
<dimen name="setup_title_text_size">60sp</dimen>
<dimen name="setup_title_text_size">50sp</dimen>
<dimen name="setup_welcome_description_text_size">32sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
@ -25,9 +25,10 @@
<dimen name="setup_step_action_text_size">20sp</dimen>
<dimen name="setup_vertical_padding">32dp</dimen>
<dimen name="setup_horizontal_padding">96dp</dimen>
<dimen name="setup_step_action_height">48dp</dimen>
<dimen name="setup_step_action_height">54dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">50</integer>
@ -36,6 +37,6 @@
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">0dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">80</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">20</integer>
<integer name="setup_welcome_video_weight_in_screen">30</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

7
app/src/main/res/values-h540dp-port/setup-dimens-large-phone-port.xml
View file

@ -25,9 +25,10 @@
<dimen name="setup_step_action_text_size">18sp</dimen>
<dimen name="setup_vertical_padding">8dp</dimen>
<dimen name="setup_horizontal_padding">16dp</dimen>
<dimen name="setup_step_action_height">48dp</dimen>
<dimen name="setup_step_action_height">54dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
@ -36,6 +37,6 @@
<dimen name="setup_welcome_description_top_margin">6dp</dimen>
<dimen name="setup_welcome_video_top_padding">12dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">70</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
<integer name="setup_welcome_video_weight_in_screen">30</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

9
app/src/main/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
View file

@ -22,12 +22,13 @@
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
<dimen name="setup_step_action_text_size">24sp</dimen>
<dimen name="setup_vertical_padding">96dp</dimen>
<dimen name="setup_horizontal_padding">160dp</dimen>
<dimen name="setup_step_action_height">48dp</dimen>
<dimen name="setup_step_action_height">62dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">50</integer>
@ -36,6 +37,6 @@
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">0dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">80</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">20</integer>
<integer name="setup_welcome_video_weight_in_screen">50</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

11
app/src/main/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
View file

@ -16,8 +16,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Setup wizard dimensions for small-tablet/portrait. -->
<dimen name="setup_title_text_size">72sp</dimen>
<dimen name="setup_welcome_description_text_size">36sp</dimen>
<dimen name="setup_title_text_size">48sp</dimen>
<dimen name="setup_welcome_description_text_size">26sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
@ -25,9 +25,10 @@
<dimen name="setup_step_action_text_size">20sp</dimen>
<dimen name="setup_vertical_padding">32dp</dimen>
<dimen name="setup_horizontal_padding">64dp</dimen>
<dimen name="setup_step_action_height">48dp</dimen>
<dimen name="setup_step_action_height">54dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
@ -36,6 +37,6 @@
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">24dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">70</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
<integer name="setup_welcome_video_weight_in_screen">40</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

5
app/src/main/res/values-land/setup-dimens-small-phone-land.xml
View file

@ -28,6 +28,7 @@
<dimen name="setup_step_action_height">42dp</dimen>
<dimen name="setup_step_horizontal_padding">20dp</dimen>
<dimen name="setup_step_horizontal_padding_half">10dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">12dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
@ -36,6 +37,6 @@
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">0dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">70</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
<integer name="setup_welcome_video_weight_in_screen">20</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

7
app/src/main/res/values-port/setup-dimens-small-phone-port.xml
View file

@ -25,9 +25,10 @@
<dimen name="setup_step_action_text_size">16sp</dimen>
<dimen name="setup_vertical_padding">2dp</dimen>
<dimen name="setup_horizontal_padding">12dp</dimen>
<dimen name="setup_step_action_height">42dp</dimen>
<dimen name="setup_step_action_height">46dp</dimen>
<dimen name="setup_step_horizontal_padding">20dp</dimen>
<dimen name="setup_step_horizontal_padding_half">10dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">12dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
@ -36,6 +37,6 @@
<dimen name="setup_welcome_description_top_margin">4dp</dimen>
<dimen name="setup_welcome_video_top_padding">12dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">70</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
<integer name="setup_welcome_video_weight_in_screen">30</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>