Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IDE-194 Bricksize adjust to screensize #5004

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

IDE-194 Bricksize adjust to screensize #5004

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7156c97
IDE-194 adjust bricksize to screensize
afissel Jun 12, 2024
73b2d9f
IDE-194 Update copyright dates
afissel Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 29 additions & 24 deletions catroid/src/main/res/layout/brick_for_variable_from_to.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
Expand All @@ -43,33 +42,39 @@

<include layout="@layout/icon_brick_category_control" />

<TextView
android:id="@+id/brick_for_values_from_label"
style="@style/BrickText.SingleLine"
android:text="@string/brick_loop_for_values_from">
</TextView>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<TextView
android:id="@+id/brick_loop_from_edit"
style="@style/BrickEditText">
</TextView>
<TextView
android:id="@+id/brick_for_values_from_label"
style="@style/BrickText.SingleLine"
android:text="@string/brick_loop_for_values_from">
</TextView>

<TextView
android:id="@+id/brick_to_label"
style="@style/BrickText.SingleLine"
android:text="@string/brick_loop_to">
</TextView>
<TextView
android:id="@+id/brick_loop_from_edit"
style="@style/BrickEditText">
</TextView>

<TextView
android:id="@+id/brick_loop_to_edit"
style="@style/BrickEditText">
</TextView>
<TextView
android:id="@+id/brick_to_label"
style="@style/BrickText.SingleLine"
android:text="@string/brick_loop_to">
</TextView>

<TextView
android:id="@+id/brick_in_label"
style="@style/BrickText.SingleLine"
android:text="@string/brick_loop_in">
</TextView>
<TextView
android:id="@+id/brick_loop_to_edit"
style="@style/BrickEditText">
</TextView>

<TextView
android:id="@+id/brick_in_label"
style="@style/BrickText.SingleLine"
android:text="@string/brick_loop_in">
</TextView>

</LinearLayout>

<Spinner
android:id="@+id/brick_for_variable_spinner"
Expand Down
4 changes: 1 addition & 3 deletions catroid/src/main/res/layout/brick_parameterized_assert.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
Expand Down Expand Up @@ -54,14 +53,13 @@

<TextView
android:text="@string/brick_parameterized_equals"
style="@style/BrickText.SingleLine">
style="@style/BrickText.MultipleLines">
</TextView>

<Spinner
android:id="@+id/brick_param_expected_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

</Spinner>
</org.catrobat.catroid.ui.BrickLayout>

Expand Down
3 changes: 2 additions & 1 deletion catroid/src/main/res/layout/brick_parameterized_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,15 @@
</TextView>

<TextView
app:layout_newLine="true"
android:id="@+id/brick_param_list_of_list_text"
style="@style/BrickEditText">
</TextView>

<TextView
app:layout_newLine="true"
android:id="@+id/brick_param_second_label"
style="@style/BrickText.SingleLine"
style="@style/BrickText.MultipleLines"
android:text=""
>
</TextView>
Expand Down
18 changes: 14 additions & 4 deletions catroid/src/main/res/layout/brick_running_stitch_with_length.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
Expand All @@ -43,14 +42,25 @@

<include layout="@layout/icon_brick_category_embroidery"/>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

<TextView
style="@style/BrickText.SingleLine"
android:text="@string/brick_running_stitch" />
android:text="@string/brick_running_stitch"
android:maxLines="1"
android:ellipsize="end" />

<TextView
android:id="@+id/brick_running_stitch_edit_text_length"
style="@style/BrickEditText">
</TextView>
style="@style/BrickEditText"
android:maxLines="1"
android:ellipsize="end" />

</LinearLayout>

</org.catrobat.catroid.ui.BrickLayout>

Expand Down
91 changes: 52 additions & 39 deletions catroid/src/main/res/layout/brick_set_pen_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,45 +42,58 @@

<include layout="@layout/icon_brick_category_pen" />

<TextView
android:id="@+id/brick_set_pen_color_action_label"
style="@style/BrickText.SingleLine"
android:text="@string/brick_pen_color">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_red_text_view"
style="@style/BrickText"
app:layout_newLine="true"
android:text="@string/color_red">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_action_red_edit_text"
style="@style/BrickEditText">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_green_text_view"
style="@style/BrickText"
android:text="@string/color_green">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_action_green_edit_text"
style="@style/BrickEditText">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_blue_text_view"
style="@style/BrickText"
android:text="@string/color_blue">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_action_blue_edit_text"
style="@style/BrickEditText">
</TextView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<TextView
android:id="@+id/brick_set_pen_color_action_label"
style="@style/BrickText.SingleLine"
android:text="@string/brick_pen_color">
</TextView>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<TextView
android:id="@+id/brick_set_pen_color_red_text_view"
style="@style/BrickText"
app:layout_newLine="true"
android:text="@string/color_red">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_action_red_edit_text"
style="@style/BrickEditText">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_green_text_view"
style="@style/BrickText"
android:text="@string/color_green">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_action_green_edit_text"
style="@style/BrickEditText">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_blue_text_view"
style="@style/BrickText"
android:text="@string/color_blue">
</TextView>

<TextView
android:id="@+id/brick_set_pen_color_action_blue_edit_text"
style="@style/BrickEditText">
</TextView>

</LinearLayout>

</LinearLayout>

</org.catrobat.catroid.ui.BrickLayout>

Expand Down
4 changes: 3 additions & 1 deletion catroid/src/main/res/layout/brick_wait_till_idle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
Expand All @@ -44,6 +43,9 @@

<TextView
style="@style/BrickText"
android:layout_width="0dp"
android:ellipsize="none"
android:singleLine="false"
android:text="@string/brick_wait_till_idle">
</TextView>
</org.catrobat.catroid.ui.BrickLayout>
Expand Down
48 changes: 32 additions & 16 deletions catroid/src/main/res/layout/brick_zigzag_stitch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
Expand All @@ -45,24 +44,41 @@

<include layout="@layout/icon_brick_category_embroidery" />

<TextView
style="@style/BrickText.SingleLine"
android:text="@string/brick_zigzag_stitch" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<TextView
android:id="@+id/brick_zigzag_stitch_edit_text_length"
style="@style/BrickEditText">
</TextView>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<TextView
style="@style/BrickText.SingleLine"
app:layout_newLine="true"
android:text="@string/brick_zigzag_stitch_width" />
<TextView
style="@style/BrickText.SingleLine"
android:text="@string/brick_zigzag_stitch" />

<TextView
android:id="@+id/brick_zigzag_stitch_edit_text_length"
style="@style/BrickEditText" />

</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<TextView
style="@style/BrickText.SingleLine"
android:text="@string/brick_zigzag_stitch_width" />

<TextView
android:id="@+id/brick_zigzag_stitch_edit_text_width"
style="@style/BrickEditText" />

</LinearLayout>

</LinearLayout>

<TextView
android:id="@+id/brick_zigzag_stitch_edit_text_width"
style="@style/BrickEditText">
</TextView>
</org.catrobat.catroid.ui.BrickLayout>

</LinearLayout>