Show dictionary actual size in appropriate units

Julien LepillerMon May 18 23:01:05+0200 2020

8ca36ba

Show dictionary actual size in appropriate units

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

8585 
        remove_layout.setVisibility(d.isDownloaded()? View.VISIBLE: View.INVISIBLE);
8686 
8787 
        TextView size_view = findViewById(R.id.size_view);
88-
        size_view.setText(String.format(getResources().getString(R.string.dictionary_size), d.getSize()));
88+
        int size = d.getSize();
89+
        if(size < 1500)
90+
            size_view.setText(String.format(getResources().getString(R.string.dictionary_size_b), size));
91+
        else if(size < 1500000)
92+
            size_view.setText(String.format(getResources().getString(R.string.dictionary_size_kb), size/1000));
93+
        else
94+
            size_view.setText(String.format(getResources().getString(R.string.dictionary_size_mb), size/1000000));
8995 
9096 
        download_button.setOnClickListener(new View.OnClickListener() {
9197 
            @Override
app/src/main/java/eu/lepiller/nani/dictionary/FileDictionary.java
7575 
        if(!isDownloaded())
7676 
            return 0;
7777 
78-
        return (int)(getFile().length() / 1000000);
78+
        return (int)(getFile().length());
7979 
    }
8080 
8181 
    String getString(RandomAccessFile file) throws IOException {
app/src/main/res/values-fr/strings.xml
2222 
    <string name="kanji_description">??criture</string>
2323 
    <string name="close">fermer</string>
2424 
25-
    <string name="dictionary_size">Taille r??elle : %d???Mo</string>
25+
    <string name="dictionary_size_mb">Taille r??elle : %d???Mo</string>
26+
    <string name="dictionary_size_kb">Taille r??elle : %d???Ko</string>
27+
    <string name="dictionary_size_b">Taille r??elle : %d???o</string>
2628 
    <string name="feedback_no_result">Pas de r??sultat</string>
2729 
    <string name="feedback_progress">Recherche???</string>
2830 
    <string name="feedback_didyoumean">Vouliez-vous dire ?? %s ?? ?</string>
app/src/main/res/values/strings.xml
1818 
    <string name="kanji_description">Writing</string>
1919 
    <string name="close">close</string>
2020 
21-
    <string name="dictionary_size">Actual size: %dMB</string>
21+
    <string name="dictionary_size_mb">Actual size: %dMB</string>
22+
    <string name="dictionary_size_kb">Actual size: %dKB</string>
23+
    <string name="dictionary_size_b">Actual size: %dB</string>
2224 
    <string name="feedback_no_result">No result</string>
23-
    <string name="feedback_progress">Searching...</string>
25+
    <string name="feedback_progress">Searching???</string>
2426 
    <string name="feedback_didyoumean">Did you mean "%s"?</string>
2527 
2628 
    <!-- Dictionnary descriptions -->