Skip to content

Commit c0f4be4

Browse files
ADFA-4901: nits — clamp status line (maxLines/ellipsize); extract terminal colors
- Status line maxLines=2 + ellipsize so a long log line can't push the layout. - Move the terminal surface/text colors to @color/k2go_terminal_bg/_text (fixed dark in both themes) for reuse by future proot module logs.
1 parent 47f0064 commit c0f4be4

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

‎controller/app/src/main/res/layout/fragment_k2go_maps_preparing.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
android:layout_height="wrap_content"
5757
android:layout_marginTop="8dp"
5858
android:gravity="center"
59+
android:maxLines="2"
60+
android:ellipsize="end"
5961
android:text="@string/k2go_maps_phase_prepared"
6062
android:textAppearance="?attr/textAppearanceBodyLarge"
6163
android:textColor="@color/k2go_ink" />
@@ -126,15 +128,15 @@
126128
android:layout_marginTop="8dp"
127129
android:padding="10dp"
128130
android:visibility="gone"
129-
android:background="#FF0F1512">
131+
android:background="@color/k2go_terminal_bg">
130132

131133
<TextView
132134
android:id="@+id/k2go_prep_log_text"
133135
android:layout_width="match_parent"
134136
android:layout_height="wrap_content"
135137
android:fontFamily="monospace"
136138
android:textSize="11sp"
137-
android:textColor="#FF9FE1CB"
139+
android:textColor="@color/k2go_terminal_text"
138140
android:textIsSelectable="true" />
139141
</ScrollView>
140142

‎controller/app/src/main/res/values/colors_k2go.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<color name="k2go_amber_text">#B0740F</color>
2020
<color name="k2go_clay">#C4462F</color>
2121
<color name="k2go_notice_ink">#3A2320</color> <!-- fixed dark; notice bg is always light pink -->
22+
<!-- ADFA-4901: install log terminal — fixed dark surface + light-green text in both themes
23+
(reused by all proot module install logs). -->
24+
<color name="k2go_terminal_bg">#0F1512</color>
25+
<color name="k2go_terminal_text">#9FE1CB</color>
2226
<color name="k2go_muted">#5C6360</color>
2327
<color name="k2go_hairline">#D9D4C8</color>
2428
<color name="k2go_on_teal">#FBF8F3</color>

0 commit comments

Comments
 (0)