Skip to content

Commit 3abeacc

Browse files
niedevniedev
committed
Improvements on Tatoeba and Mozilla loading when changing language and settings
1 parent 58503bd commit 3abeacc

7 files changed

Lines changed: 204 additions & 333 deletions

File tree

‎app/src/main/java/nie/translator/rtranslator/Global.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,17 +472,17 @@ public void setSecondTextLanguage(CustomLocale language, @Nullable Translator.Ge
472472
loadLanguagesResources(getFirstTextLanguage(true), language, RTranslatorMode.TEXT_TRANSLATION_MODE, listener);
473473
}
474474

475-
public void switchTextLanguages() {
475+
public void switchTextLanguages(@Nullable Translator.GeneralListener listener) {
476476
CustomLocale firstLanguage = getFirstTextLanguage(true);
477477
CustomLocale secondLanguage = getSecondTextLanguage(true);
478478
this.firstTextLanguage = secondLanguage;
479479
this.secondTextLanguage = firstLanguage;
480-
loadLanguagesResources(secondLanguage, firstLanguage, RTranslatorMode.TEXT_TRANSLATION_MODE, null);
481480
SharedPreferences sharedPreferences = this.getSharedPreferences("default", Context.MODE_PRIVATE);
482481
SharedPreferences.Editor editor = sharedPreferences.edit();
483482
editor.putString("firstTextLanguage", this.firstTextLanguage.getCode());
484483
editor.putString("secondTextLanguage", this.secondTextLanguage.getCode());
485484
editor.apply();
485+
loadLanguagesResources(secondLanguage, firstLanguage, RTranslatorMode.TEXT_TRANSLATION_MODE, listener);
486486
}
487487

488488

@@ -576,6 +576,10 @@ public void setUseTatoeba(boolean useTatoeba) {
576576
SharedPreferences.Editor editor = sharedPreferences.edit();
577577
editor.putBoolean("useTatoeba", useTatoeba);
578578
editor.apply();
579+
// loading of tatoeba
580+
translator.loadTatoeba(getFirstTextLanguage(true), getSecondTextLanguage(true), RTranslatorMode.TEXT_TRANSLATION_MODE, null);
581+
translator.loadTatoeba(getFirstLanguage(true), getSecondLanguage(true), RTranslatorMode.WALKIE_TALKIE_MODE, null);
582+
//todo: add loading for Conversation mode
579583
}
580584

581585
public String getName() {

‎app/src/main/java/nie/translator/rtranslator/databases/tatoeba/TatoebaDbWrapper.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.database.Cursor;
44
import android.database.sqlite.SQLiteDatabase;
5+
import android.util.Log;
56

67
import androidx.annotation.Nullable;
78

‎app/src/main/java/nie/translator/rtranslator/databases/tatoeba/TatoebaDbWrapperOld.java‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎app/src/main/java/nie/translator/rtranslator/settings/SettingsFragment.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,7 @@ public boolean onPreferenceClick(Preference preference) {
197197
@Override
198198
public boolean onPreferenceChange(Preference preference, Object newValue) {
199199
if(global != null) {
200-
final SharedPreferences sharedPreferences = global.getSharedPreferences("default", Context.MODE_PRIVATE);
201-
SharedPreferences.Editor editor = sharedPreferences.edit();
202-
editor.putBoolean("useTatoeba", (Boolean) newValue);
203-
editor.apply();
200+
global.setUseTatoeba((Boolean) newValue);
204201
}
205202
return true;
206203
}

‎app/src/main/java/nie/translator/rtranslator/voice_translation/_text_translation/TranslationFragment.java‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
183183
//inputText.setRawInputType(InputType.TYPE_CLASS_TEXT);
184184

185185
// setting of the selected languages
186-
setFirstLanguage(global.getFirstTextLanguage(true), new Translator.GeneralListener() {
187-
@Override
188-
public void onSuccess() {
189-
setSecondLanguage(global.getSecondTextLanguage(true), null);
190-
}
191-
192-
@Override
193-
public void onFailure(int[] reasons, long value) {
194-
//todo: gestire errore
195-
}
196-
});
186+
setDisplayedFirstLanguage(global.getFirstTextLanguage(true));
187+
setDisplayedSecondLanguage(global.getSecondTextLanguage(true));
197188

198189
View.OnClickListener walkieTalkieButtonListener = new View.OnClickListener() {
199190
@Override
@@ -230,15 +221,15 @@ public void onTranslatedText(String textToTranslate, String text, long resultID,
230221

231222
@Override
232223
public void onFailure(int[] reasons, long value) {
233-
224+
activateTranslationButton();
234225
}
235226
};
236227
translateButton.setOnClickListener(new View.OnClickListener() {
237228
@Override
238229
public void onClick(View view) {
239230
String text = inputText.getText().toString();
240231

241-
if(text.length() <= 0){ //test code
232+
if(text.length() <= 0){ //test code todo: remove before release
242233
text = "Also unlike 2014, there aren’t nearly as many loopholes. You can’t just buy a 150-watt incandescent or a three-way bulb — the ban covers any normal bulb that generates less than 45 lumens per watt, which pretty much rules out both incandescent and halogen tech in their entirety.";
243234
inputText.setText(text);
244235
}
@@ -247,7 +238,7 @@ public void onClick(View view) {
247238
CustomLocale firstLanguage = global.getFirstTextLanguage(true);
248239
CustomLocale secondLanguage = global.getSecondTextLanguage(true);
249240
//we deactivate translate button
250-
deactivateTranslationButton();
241+
deactivateTranslationButton(); //todo: implement stop button instead of deactivation
251242
//we start the translation
252243
global.getTranslator().translate(text, firstLanguage, secondLanguage, global.getBeamSize(), true);
253244
}
@@ -811,11 +802,11 @@ public void onItemClick(AdapterView<?> parent, View view, final int position, lo
811802
if (languages.contains((CustomLocale) listView.getItem(position))) {
812803
switch (languageNumber) {
813804
case 1: {
814-
setFirstLanguage((CustomLocale) listView.getItem(position), null);
805+
setFirstLanguage((CustomLocale) listView.getItem(position));
815806
break;
816807
}
817808
case 2: {
818-
setSecondLanguage((CustomLocale) listView.getItem(position), null);
809+
setSecondLanguage((CustomLocale) listView.getItem(position));
819810
break;
820811
}
821812
}
@@ -842,42 +833,50 @@ public void onStop() {
842833
global.getTranslator().removeCallback(translateListener);
843834
}
844835

845-
private void setFirstLanguage(CustomLocale language, @Nullable Translator.GeneralListener listener) {
836+
private void setFirstLanguage(CustomLocale language) {
837+
deactivateTranslationButton();
846838
// save firstLanguage selected
847839
global.setFirstTextLanguage(language, new Translator.GeneralListener() {
848840
@Override
849841
public void onSuccess() {
850-
// change language displayed
851-
((AnimatedTextView) firstLanguageSelector.findViewById(R.id.firstLanguageName)).setText(language.getDisplayNameWithoutTTS(), false);
852-
if(listener != null) listener.onSuccess();
853-
}
854-
855-
@Override
856-
public void onFailure(int[] reasons, long value) {
857-
//todo: gestire errore
842+
activateTranslationButton();
858843
}
859844
});
845+
// change language displayed
846+
setDisplayedFirstLanguage(language);
860847
}
861848

862-
private void setSecondLanguage(CustomLocale language, @Nullable Translator.GeneralListener listener) {
849+
private void setSecondLanguage(CustomLocale language) {
850+
deactivateTranslationButton();
863851
// save secondLanguage selected
864852
global.setSecondTextLanguage(language, new Translator.GeneralListener() {
865853
@Override
866854
public void onSuccess() {
867-
// change language displayed
868-
((AnimatedTextView) secondLanguageSelector.findViewById(R.id.secondLanguageName)).setText(language.getDisplayNameWithoutTTS(), false);
869-
if(listener != null) listener.onSuccess();
870-
}
871-
872-
@Override
873-
public void onFailure(int[] reasons, long value) {
874-
//todo: gestire errore
855+
activateTranslationButton();
875856
}
876857
});
858+
// change language displayed
859+
setDisplayedSecondLanguage(language);
860+
}
861+
862+
private void setDisplayedFirstLanguage(CustomLocale language){
863+
// change language displayed
864+
((AnimatedTextView) firstLanguageSelector.findViewById(R.id.firstLanguageName)).setText(language.getDisplayNameWithoutTTS(), false);
865+
}
866+
867+
private void setDisplayedSecondLanguage(CustomLocale language){
868+
// change language displayed
869+
((AnimatedTextView) secondLanguageSelector.findViewById(R.id.secondLanguageName)).setText(language.getDisplayNameWithoutTTS(), false);
877870
}
878871

879872
private void switchLanguages(){
880-
global.switchTextLanguages();
873+
deactivateTranslationButton();
874+
global.switchTextLanguages(new Translator.GeneralListener() {
875+
@Override
876+
public void onSuccess() {
877+
activateTranslationButton();
878+
}
879+
});
881880
// change language displayed
882881
((AnimatedTextView) firstLanguageSelector.findViewById(R.id.firstLanguageName)).setText(global.getFirstTextLanguage(true).getDisplayNameWithoutTTS(), false);
883882
((AnimatedTextView) secondLanguageSelector.findViewById(R.id.secondLanguageName)).setText(global.getSecondTextLanguage(true).getDisplayNameWithoutTTS(), false);

‎app/src/main/java/nie/translator/rtranslator/voice_translation/_walkie_talkie_mode/_walkie_talkie/WalkieTalkieFragment.java‎

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -586,58 +586,20 @@ private void setFirstLanguage(CustomLocale language) {
586586
// new language setting in the WalkieTalkieService
587587
walkieTalkieServiceCommunicator.changeFirstLanguage(language);
588588
// save firstLanguage selected
589-
global.setFirstLanguage(language, new Translator.GeneralListener() {
590-
@Override
591-
public void onSuccess() {
592-
// change language displayed
593-
global.getTTSLanguages(true, new Global.GetLocalesListListener() {
594-
@Override
595-
public void onSuccess(ArrayList<CustomLocale> ttsLanguages) {
596-
((AnimatedTextView) firstLanguageSelector.findViewById(R.id.firstLanguageName)).setText(language.getDisplayNameWithoutTTS(), true);
597-
leftMicLanguage.setText(language.getDisplayNameWithoutTTS(), true);
598-
}
599-
600-
@Override
601-
public void onFailure(int[] reasons, long value) {
602-
//never called in this case
603-
}
604-
});
605-
}
606-
607-
@Override
608-
public void onFailure(int[] reasons, long value) {
609-
//todo: gestire errore
610-
}
611-
});
589+
global.setFirstLanguage(language, null);
590+
// change language displayed
591+
((AnimatedTextView) firstLanguageSelector.findViewById(R.id.firstLanguageName)).setText(language.getDisplayNameWithoutTTS(), true);
592+
leftMicLanguage.setText(language.getDisplayNameWithoutTTS(), true);
612593
}
613594

614595
private void setSecondLanguage(CustomLocale language) {
615596
// new language setting in the WalkieTalkieService
616597
walkieTalkieServiceCommunicator.changeSecondLanguage(language);
617598
// save secondLanguage selected
618-
global.setSecondLanguage(language, new Translator.GeneralListener() {
619-
@Override
620-
public void onSuccess() {
621-
// change language displayed
622-
global.getTTSLanguages(true, new Global.GetLocalesListListener() {
623-
@Override
624-
public void onSuccess(ArrayList<CustomLocale> ttsLanguages) {
625-
((AnimatedTextView) secondLanguageSelector.findViewById(R.id.secondLanguageName)).setText(language.getDisplayNameWithoutTTS(), true);
626-
rightMicLanguage.setText(language.getDisplayNameWithoutTTS(), true);
627-
}
628-
629-
@Override
630-
public void onFailure(int[] reasons, long value) {
631-
//never called in this case
632-
}
633-
});
634-
}
635-
636-
@Override
637-
public void onFailure(int[] reasons, long value) {
638-
//todo: gestire errore
639-
}
640-
});
599+
global.setSecondLanguage(language, null);
600+
// change language displayed
601+
((AnimatedTextView) secondLanguageSelector.findViewById(R.id.secondLanguageName)).setText(language.getDisplayNameWithoutTTS(), true);
602+
rightMicLanguage.setText(language.getDisplayNameWithoutTTS(), true);
641603
}
642604

643605
private void onFailureShowingList(int[] reasons, long value) {

0 commit comments

Comments
 (0)