format expected dictionary size

Julien LepillerThu Jun 04 00:56:19+0200 2020

c4113f9

format expected dictionary size

app/src/main/java/eu/lepiller/nani/dictionary/DictionariesAdapter.java

6666 
            convertView.setBackgroundColor(0);
6767 
6868 
        int size = dictionary.getExpectedFileSize();
69+
        NumberFormat nf = NumberFormat.getInstance();
6970 
        if(size < 1500)
70-
            size_view.setText(String.format(context.getString(R.string.dictionary_expected_size_b), size));
71+
            size_view.setText(String.format(context.getString(R.string.dictionary_expected_size_b), nf.format(size)));
7172 
        else if(size < 1500000)
72-
            size_view.setText(String.format(context.getString(R.string.dictionary_expected_size_kb), size/1000));
73+
            size_view.setText(String.format(context.getString(R.string.dictionary_expected_size_kb), nf.format(size/1000)));
7374 
        else
74-
            size_view.setText(String.format(context.getString(R.string.dictionary_expected_size_mb), size/1000000));
75+
            size_view.setText(String.format(context.getString(R.string.dictionary_expected_size_mb), nf.format(size/1000000)));
7576 
76-
        int entries = dictionary.getExpectedEntries();
77-
        NumberFormat nf = NumberFormat.getInstance();
78-
        String formated = nf.format(entries);
79-
        entry_count_view.setText(context.getResources().getQuantityString(R.plurals.dico_entry_count, entries, formated));
77+
        int entries = dictionary.getExpectedEntries();  
78+
        entry_count_view.setText(context.getResources().getQuantityString(R.plurals.dico_entry_count, entries, nf.format(entries)));
8079 
8180 
        // Return the completed view to render on screen
8281 
        return convertView;
app/src/main/res/values/strings.xml
4949 
        <item quantity="one">%s entry</item>
5050 
        <item quantity="other">%s entries</item>
5151 
    </plurals>
52-
    <string name="dictionary_expected_size_b">File size: %dB</string>
53-
    <string name="dictionary_expected_size_kb">File size: %dKB</string>
54-
    <string name="dictionary_expected_size_mb">File size: %dMB</string>
52+
    <string name="dictionary_expected_size_b">File size: %sB</string>
53+
    <string name="dictionary_expected_size_kb">File size: %sKB</string>
54+
    <string name="dictionary_expected_size_mb">File size: %sMB</string>
5555 
5656 
    <!-- Result view -->
5757 
    <string name="sense_number">%d.</string>