Put info on the same textview as sense

Julien LepillerMon Jul 19 13:41:44+0200 2021

e50e112

Put info on the same textview as sense

app/src/main/java/eu/lepiller/nani/MainActivity.java

99 
import androidx.appcompat.widget.Toolbar;
1010 
import androidx.preference.PreferenceManager;
1111 
12+
import android.text.Html;
1213 
import android.util.Log;
1314 
import android.view.View;
1415 
import android.view.Menu;
…
328329 
                View child = getLayoutInflater().inflate(R.layout.layout_sense, senses_view, false);
329330 
                TextView id_view = child.findViewById(R.id.id_view);
330331 
                TextView lang_view = child.findViewById(R.id.lang_view);
331-
                TextView infos_view = child.findViewById(R.id.infos_view);
332332 
                TextView sense_view = child.findViewById(R.id.definition_view);
333333 
334334 
                id_view.setText(String.format(getResources().getString(R.string.sense_number), sense_pos));
335335 
                lang_view.setText(sense.getLanguage());
336336 
337337 
                StringBuilder sb = new StringBuilder();
338+
                sb.append("<font color=\"#909090\"><i>");
338339 
                boolean separator1 = false;
339340 
                for(String s : sense.getInfos()) {
340341 
                    if (separator1)
…
343344 
                        separator1 = true;
344345 
                    sb.append(s);
345346 
                }
347+
                sb.append("</i></font>");
346348 
                if(separator1)
347-
                    infos_view.setVisibility(View.VISIBLE);
348-
                infos_view.setText(sb.toString());
349+
                    sb.append(" ");
349350 
350-
                sb = new StringBuilder();
351351 
                separator1 = false;
352352 
                for (String s : sense.getGlosses()) {
353353 
                    if (separator1)
…
356356 
                        separator1 = true;
357357 
                    sb.append(s);
358358 
                }
359-
                sense_view.setText(sb.toString());
359+
                sense_view.setText(Html.fromHtml(sb.toString()));
360360 
361361 
                senses_view.addView(child);
362362 
                sense_pos++;
app/src/main/res/layout/layout_sense.xml
2525 
        android:layout_marginStart="8dp"
2626 
        android:text="lang" />
2727 
28-
    <LinearLayout
29-
        android:layout_width="0dp"
28+
    <TextView
29+
        android:id="@+id/definition_view"
30+
        android:layout_width="match_parent"
3031 
        android:layout_height="wrap_content"
31-
        android:layout_weight="1"
32-
        android:orientation="vertical">
33-
34-
        <TextView
35-
            android:id="@+id/infos_view"
36-
            android:layout_width="match_parent"
37-
            android:layout_height="wrap_content"
38-
            android:layout_margin="8dp"
39-
            android:text="infos"
40-
            android:visibility="gone"
41-
            android:textColor="@color/colorTextGrey"
42-
            android:textStyle="italic" />
43-
44-
        <TextView
45-
            android:id="@+id/definition_view"
46-
            android:layout_width="match_parent"
47-
            android:layout_height="wrap_content"
48-
            android:layout_margin="8dp"
49-
            android:text="definition" />
50-
    </LinearLayout>
32+
        android:layout_margin="8dp"
33+
        android:text="definition" />
5134 
</LinearLayout>
5134=
5235=
\ No newline at end of file