translation work/adjustments

marq24 · Sep 26, 2020 · 4a41bbd · 4a41bbd
1 parent 30174a6
commit 4a41bbd
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 16 deletions.
diff --git a/app/src/main/java/com/emacberry/uuid0xfd6fscan/ScannerActivity.java b/app/src/main/java/com/emacberry/uuid0xfd6fscan/ScannerActivity.java
@@ -553,17 +553,27 @@ private void setActiveBeaconCount(final int sizeTotal, final int sizeENF, final
                                 // ONLY GOOD/BAD => threshold is defined...
                                 // we might want to show additionally the number of
                                 // BAD signals?! - for now we skip this...
-                                ((PlaceholderFragment) info).setRangeInfo(null, null, null, "BAD: "+ranges[1].size);
+                                ((PlaceholderFragment) info).setRangeInfo(
+                                        null, null, null,
+                                        String.format(getString(R.string.act_BAD), ranges[1].size));
                                 break;
 
                             case 3:
                                 // NEAR|MEDIUM|FAR
-                                ((PlaceholderFragment) info).setRangeInfo("NEAR: "+ranges[0].size, "MEDIUM: "+ranges[1].size, "FAR: "+ranges[2].size, null);
+                                ((PlaceholderFragment) info).setRangeInfo(
+                                        String.format(getString(R.string.act_NEAR), ranges[0].size),
+                                        String.format(getString(R.string.act_MEDIUM), ranges[1].size),
+                                        String.format(getString(R.string.act_FAR), ranges[2].size),
+                                        null);
                                 break;
 
                             case 4:
                                 // NEAR|MEDIUM|FAR|BAD
-                                ((PlaceholderFragment) info).setRangeInfo("NEAR: "+ranges[0].size, "MEDIUM: "+ranges[1].size, "FAR: "+ranges[2].size, "BAD: "+ranges[3].size);
+                                ((PlaceholderFragment) info).setRangeInfo(
+                                        String.format(getString(R.string.act_NEAR), ranges[0].size),
+                                        String.format(getString(R.string.act_MEDIUM), ranges[1].size),
+                                        String.format(getString(R.string.act_FAR), ranges[2].size),
+                                        String.format(getString(R.string.act_BAD), ranges[3].size));
                                 break;
                         }
                     } else{

diff --git a/app/src/main/java/com/emacberry/uuid0xfd6fscan/UUIDFD6FBeacon.java b/app/src/main/java/com/emacberry/uuid0xfd6fscan/UUIDFD6FBeacon.java
@@ -59,6 +59,8 @@ public String toString() {
         b.append(" [");
         b.append(data.size());
         b.append("] ");
+        b.append(mLatestSignalStrength);
+        b.append("db ");
         b.append(sigHistory.size());
         b.append(' ');
         b.append(new Date(mLastTs));

diff --git a/app/src/main/java/com/emacberry/uuid0xfd6fscan/settings/Settings01.java b/app/src/main/java/com/emacberry/uuid0xfd6fscan/settings/Settings01.java
@@ -16,6 +16,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.SwitchPreferenceCompat;
 
@@ -122,16 +123,22 @@ public void onActivityResult(Boolean result) {
             editText.setInputType(InputType.TYPE_CLASS_NUMBER);
             //editText.addTextChangedListener(new MyTextWatcher(editText));
         };
+
+        Preference.SummaryProvider<EditTextPreference> sProvider = preference -> String.format(getString(R.string.pref01_SIGSTRENGTH_summary), preference.getText());
+
         mGroupNear = ((EditTextPreference) findPreference(getString(R.string.PKEY_GROUPNEARVAL)));
         mGroupNear.setOnBindEditTextListener(numberFilter);
+        mGroupNear.setSummaryProvider(sProvider);
         mGroupNear.setEnabled(groupBySignalStrength.isChecked());
 
         mGroupMed = ((EditTextPreference) findPreference(getString(R.string.PKEY_GROUPMEDVAL)));
         mGroupMed.setOnBindEditTextListener(numberFilter);
+        mGroupMed.setSummaryProvider(sProvider);
         mGroupMed.setEnabled(groupBySignalStrength.isChecked());
 
         mTreshold = ((EditTextPreference) findPreference(getString(R.string.PKEY_THRESHOLDVAL)));
         mTreshold.setOnBindEditTextListener(numberFilter);
+        mTreshold.setSummaryProvider(sProvider);
         mTreshold.setEnabled(treshold.isChecked());
     }
 

diff --git a/app/src/main/java/com/emacberry/uuid0xfd6fscan/ui/main/PlaceholderFragment.java b/app/src/main/java/com/emacberry/uuid0xfd6fscan/ui/main/PlaceholderFragment.java
@@ -82,13 +82,14 @@ private TextView generateTextViewAndSetInitalValueIfPresent(View root, int id, S
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        mTOTTextView = null;
-        mENFTextView = null;
-        mSCFTextView = null;
         iTOTTextOnBind = null;
         iENFTextOnBind = null;
         iSCFTextOnBind = null;
 
+        mTOTTextView = null;
+        mENFTextView = null;
+        mSCFTextView = null;
+
         mNearView = null;
         mMedView = null;
         mFarView = null;

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -90,8 +90,8 @@
         android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        app:layout_constraintTop_toBottomOf="@+id/scf_txt"
-        app:layout_constraintLeft_toRightOf="@+id/far_txt"
+        app:layout_constraintTop_toBottomOf="@+id/near_txt"
+        app:layout_constraintLeft_toLeftOf="parent"
         tools:layout_constraintLeft_creator="1"
         tools:layout_constraintTop_creator="1" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -22,6 +22,10 @@
     <string name ="act_active_beacons">Aktive Sender: %1$d</string>
     <string name ="act_active_enf_beacons">ExpNotif. Sender: %1$d</string>
     <string name ="act_active_scf_beacons">StopCovid Sender: %1$d</string>
+    <string name ="act_NEAR">NAH: %1$d</string>
+    <string name ="act_MEDIUM">MITTEL: %1$d</string>
+    <string name ="act_FAR">FERN: %1$d</string>
+    <string name ="act_BAD">IGNORIERT: %1$d</string>
 
     <string name="menu_start">Scanner Dienst starten</string>
     <string name="menu_stop">Scanner Dienst stoppen</string>
@@ -52,4 +56,16 @@
         <item name="03">UUID 0xDF6F &amp; 0xDF64: Frankreich (StopCovid France) und Alle Länder dessen App auf dem Exposure Notification Framework basiert (wie in Deutschland die CoronaWarnApp)</item>
     </string-array>
     <string name="pref01_country">Länder deren App auf dem Exposure Notification Framework basiert  (UUID 0xFD6F)</string>
+
+    <string name="pref01_SIGSTRENGTH_title">Experten Einstellungen</string>
+    <string name="pref01_SIGSTRENGTH_summary">Ausgewählter Wert ist: -%1$sdb</string>
+    <string name="pref01_GROUPBYSIGSTRENGTH_title">Nach Signalstärke gruppieren</string>
+    <string name="pref01_GROUPBYSIGSTRENGTH_off">Keine Gruppierung nach Signalstärken</string>
+    <string name="pref01_GROUPBYSIGSTRENGTH_on">Die Becons werden basierend of ihrer Signalstäre in NAH/MITTEL/FERN aufgeteilt</string>
+    <string name="pref01_GROUPNEARVAL_title">NAH [def. Wert: -82db]</string>
+    <string name="pref01_GROUPMEDVAL_title">MITTEL [def. Wert: -90db]</string>
+    <string name="pref01_USETHRESHOLD_title">Schwellenwert verwenden</string>
+    <string name="pref01_USETHRESHOLD_off">Alle gefundenen Beacons werden berücksichtigt (unabhägig von ihrer Signalstärke)</string>
+    <string name="pref01_USETHRESHOLD_on">Wenn die Signalstärke eines Beacons den angegebenen Schwellenwert unterschreitet wird dieses nicht berücksichtigt</string>
+    <string name="pref01_THRESHOLDVAL_title">Schwellenwert [def. Wert: -97db]</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -20,6 +20,10 @@
     <string name="act_active_beacons">Appareils actives: %1$d</string>
     <string name="act_active_enf_beacons">ExpNotif. actives: %1$d</string>
     <string name="act_active_scf_beacons">StopCovid actives: %1$d</string>
+    <string name ="act_NEAR">PROCHE: %1$d</string>
+    <string name ="act_MEDIUM">MOYEN: %1$d</string>
+    <string name ="act_FAR">ÉLOIGNÉ: %1$d</string>
+    <string name ="act_BAD">IGNORÉ: %1$d</string>
 
     <string name="menu_start">Démarrer le service de scan</string>
     <string name="menu_stop">Arrêter le service de scan</string>
@@ -51,4 +55,16 @@
         <item name="03">UUID 0xDF6F &amp; 0xDF64: France (StopCovid France) et tous les pays dont l\'application est basée sur le cadre de notification d\'exposition (comme CoronaWarnApp en Allemagne)</item>
     </string-array>
     <string name="pref01_country">Les pays dont l\'application est basée sur le cadre de notification d\'exposition  (UUID 0xFD6F)</string>
+
+    <string name="pref01_SIGSTRENGTH_title">Paramètres experts</string>
+    <string name="pref01_SIGSTRENGTH_summary">La valeur sélectionnée est: -%1$sdb</string>
+    <string name="pref01_GROUPBYSIGSTRENGTH_title">Regrouper par force du signal</string>
+    <string name="pref01_GROUPBYSIGSTRENGTH_off">Pas de regroupement en fonction de la force du signal</string>
+    <string name="pref01_GROUPBYSIGSTRENGTH_on">Regroupez les balises par la force de leur signal dans PROCHE/MOYEN/ÉLOIGNÉ</string>
+    <string name="pref01_GROUPNEARVAL_title">PROCHE [def valeur: -82db]</string>
+    <string name="pref01_GROUPMEDVAL_title">MOYEN [def valeur: -90db]</string>
+    <string name="pref01_USETHRESHOLD_title">Utiliser le seuil</string>
+    <string name="pref01_USETHRESHOLD_off">Toutes les balises trouvées seront répertoriées (quelle que soit la puissance du signal)</string>
+    <string name="pref01_USETHRESHOLD_on">Si la force du signal d\'une balise est inférieure au seuil spécifié, elle ne sera pas prise en compte</string>
+    <string name="pref01_THRESHOLDVAL_title">Valeur de seuil [def valeur: -97db]</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -26,6 +26,10 @@
     <string name ="act_active_scf_beacons">StopCovid Beacons: %1$d</string>
     <string name="menu_start">Start Scan Service</string>
     <string name="menu_stop">Stop Scan Service</string>
+    <string name ="act_NEAR">NEAR: %1$d</string>
+    <string name ="act_MEDIUM">MEDIUM: %1$d</string>
+    <string name ="act_FAR">FAR: %1$d</string>
+    <string name ="act_BAD">BAD: %1$d</string>
 
     <string name="menu_settings">Settings&#8230;</string>
 
@@ -83,13 +87,15 @@
     <string name="pref01_country">Countries that make use of the Exposure Notification Framework (UUID 0xFD6F)</string>
     <string translatable="false" name="pref01_countrylist">Australia, Austria, Belgium, Brazil, Brunei, Canada, Czech Republic, Croatia, Denmark, Ecuador, Estonia, Finland, Germany, Gibraltar, Ireland, Italy, Japan, Kenya, Latvia, Malta, Mexico, Netherlands, Northern Ireland, Philippines, Poland, Portugal, Saudi Arabia, Slovenia, South Africa, Spain, Switzerland, United Kingdom, Uruguay, USA [Alabama, Arizona, Nevada, New York, North Dakota, South Carolina, Virginia]</string>
 
+    <string name="pref01_SIGSTRENGTH_title">Expert Settings</string>
+    <string name="pref01_SIGSTRENGTH_summary">Selected value is: -%1$sdb</string>
     <string name="pref01_GROUPBYSIGSTRENGTH_title">Group by Signal strength</string>
-    <string name="pref01_GROUPBYSIGSTRENGTH_off">OFF</string>
-    <string name="pref01_GROUPBYSIGSTRENGTH_on">Group the Beacons by their signal strength into NEAR/MEDIUM/FAR</string>
-    <string name="pref01_GROUPNEARVAL_title">NEAR [def value -82db]</string>
-    <string name="pref01_GROUPMEDVAL_title">MEDIUM [def value -90db]</string>
+    <string name="pref01_GROUPBYSIGSTRENGTH_off">No grouping according to signal strengths</string>
+    <string name="pref01_GROUPBYSIGSTRENGTH_on">Group the beacons by their signal strength into NEAR/MEDIUM/FAR</string>
+    <string name="pref01_GROUPNEARVAL_title">NEAR [def value: -82db]</string>
+    <string name="pref01_GROUPMEDVAL_title">MEDIUM [def value: -90db]</string>
     <string name="pref01_USETHRESHOLD_title">Use Threshold</string>
-    <string name="pref01_USETHRESHOLD_off">OFF - all found beacons will be listed (no matter how weak the signal strength is)</string>
-    <string name="pref01_USETHRESHOLD_on">ON - specify a minimum db value</string>
-    <string name="pref01_THRESHOLDVAL_title">Threshold value [def value -97db]</string>
+    <string name="pref01_USETHRESHOLD_off">All found beacons will be listed (no matter how weak the signal strength is)</string>
+    <string name="pref01_USETHRESHOLD_on">If the signal strength of a beacon is below the specified threshold it will not taken into account</string>
+    <string name="pref01_THRESHOLDVAL_title">Threshold value [def value: -97db]</string>
 </resources>
diff --git a/app/src/main/res/xml/settings01.xml b/app/src/main/res/xml/settings01.xml
@@ -44,7 +44,7 @@
 	/>
 
 	<androidx.preference.PreferenceCategory
-		app:title="Expert Setting...">
+		app:title="@string/pref01_SIGSTRENGTH_title">
 		<androidx.preference.SwitchPreferenceCompat
 			app:key="@string/PKEY_GROUPBYSIGSTRENGTH"
 			app:defaultValue="@string/DVAL_GROUPBYSIGSTRENGTH"