Update dependencies

Julien LepillerSun Jun 19 22:52:46+0200 2022

4412d68

Update dependencies

app/build.gradle

2626 
    implementation 'androidx.preference:preference:1.2.0'
2727 
    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
2828 
    implementation "androidx.viewpager2:viewpager2:1.0.0"
29-
    implementation 'com.andree-surya:moji4j:1.0.0'
29+
    implementation 'com.andree-surya:moji4j:1.2.0'
3030 
    implementation 'com.google.android.flexbox:flexbox:3.0.0'
3131 
    implementation 'com.google.android.material:material:1.6.1'
3232 
    implementation project(path: ':rubytextview')
33-
    testImplementation 'junit:junit:4.12'
33+
    testImplementation 'junit:junit:4.13.2'
3434 
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
3535 
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
3636 
}

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

169169 
        }
170170 
171171 
        private SearchResult findResults() {
172+
            boolean converted = false;
172173 
            ArrayList<String> tried = new ArrayList<>();
173174 
            tried.add(text);
174175 
…
185186 
                    tried.add(converter.convertRomajiToHiragana(text));
186187 
                    searchResult = DictionaryFactory.search(converter.convertRomajiToHiragana(text));
187188 
                    searchResult.addAll(DictionaryFactory.search(converter.convertRomajiToKatakana(text)));
189+
                    converted = true;
188190 
                } catch (DictionaryException e) {
189191 
                    return new SearchResult(e);
190192 
                }
…
232234 
                    kanjiResults.add(r);
233235 
            }
234236 
235-
            return new SearchResult(searchResult, kanjiResults, text, true);
237+
            return new SearchResult(searchResult, kanjiResults, text, converted);
236238 
        }
237239 
    }
238240 
…
278280 
        Log.d(TAG, "results. Kanjis: " + r.getKanjiResults().size());
279281 
280282 
        MojiDetector detector = new MojiDetector();
281-
        String text = r.getText();
282-
        if(searchResult != null && searchResult.size()>0 && !r.isConverted() && detector.hasLatin(text)) {
283+
        if(searchResult != null && searchResult.size()>0 && !r.isConverted() && detector.hasRomaji(r.getText())) {
283284 
            MojiConverter converter = new MojiConverter();
284285 
            final String moji = converter.convertRomajiToHiragana(r.getText());
285286 
            feedback_text.setText(String.format(getString(R.string.feedback_didyoumean), moji));
rubytextview/build.gradle
2424 
dependencies {
2525 
    implementation fileTree(dir: "libs", include: ["*.jar"])
2626 
    implementation 'androidx.appcompat:appcompat:1.4.2'
27-
    testImplementation 'junit:junit:4.12'
27+
    testImplementation 'junit:junit:4.13.2'
2828 
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
2929 
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
3030