Skip to content

Commit 979617d

Browse files
committedNov 5, 2024
fix empty text element and add hint.
1 parent 74fc958 commit 979617d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed
 

‎app/src/main/res/layout/text_element_view.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<variable name="element" type="fr.nuage.souvenirs.viewmodel.TextElementViewModel"/>
88
<variable name="album" type="fr.nuage.souvenirs.viewmodel.AlbumViewModel" />
99
<import type="fr.nuage.souvenirs.view.DataBindingAdapters" />
10+
<import type="android.graphics.Typeface" />
1011
</data>
1112

1213
<androidx.constraintlayout.widget.ConstraintLayout
@@ -28,9 +29,11 @@
2829
android:id="@+id/text_element"
2930
android:layout_width="match_parent"
3031
android:layout_height="match_parent"
31-
android:text="@{element.text}"
32+
android:text='@{ element.text.equals("") ? @string/text_element_hint : element.text }'
3233
android:textAlignment="center"
3334
android:textAppearance="@style/AppTheme.AlbumTextDefault"
35+
android:typeface='@{Typeface.defaultFromStyle(element.text.equals("") ? Typeface.ITALIC : Typeface.NORMAL)}'
36+
android:textColor='@{ element.text.equals("") ? @color/textHint : @color/textDefault }'
3437
app:autoSizeMinTextSize="2sp"
3538
app:autoSizeMaxTextSize="1000sp"
3639
app:autoSizeTextType="uniform"
@@ -40,7 +43,6 @@
4043
app:layout_constraintTop_toBottomOf="parent"
4144
is_selected="@{element.isSelected}"
4245
android:tag="@{element.id}"
43-
android:hint="@string/text_element_hint"
4446
tools:text="texte">
4547

4648
</fr.nuage.souvenirs.view.TextElementView>

‎app/src/main/res/values/colors.xml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<color name="secondaryTextColor">#000000</color>
1111

1212
<color name="textDefault">#595959</color>
13+
<color name="textHint">#D6D6D6</color>
1314
<color name="background">#fffefb</color>
1415
<color name="black">#000000</color>
1516
<color name="red">#FF0000</color>

0 commit comments

Comments
 (0)
Failed to load comments.