0.7.14

michelesalvador · Sep 24, 2020 · eeeed4f · eeeed4f
1 parent 64bb62f
commit eeeed4f
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 38 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,10 +21,10 @@ android {
 		applicationId "app.familygem"
 		minSdkVersion 19
 		targetSdkVersion 29
-		versionCode 16
-		versionName '0.7.13'
+		versionCode 17
+		versionName '0.7.14'
 		vectorDrawables.useSupportLibrary = true
-		resConfigs "en", "es", "it", "pl", "nb-rNO"
+		resConfigs "en", "de", "es", "fr", "hr", "it", "nb-rNO", "nl-rBE", "pl", "uk"
 		def backupKey = ""
 		def utenteAruba = ""
 		def passwordAruba = ""

diff --git a/app/src/main/java/app/familygem/Alberi.java b/app/src/main/java/app/familygem/Alberi.java
@@ -75,9 +75,9 @@ protected void onCreate( Bundle bandolo ) {
 			recuperaReferrer();
 		// Se è stato memorizzato un dataid (che appena usato sarà cancellato)
 		else if( referrer != null && referrer.matches("[0-9]{14}") ) {
-			new AlertDialog.Builder(this).setTitle( "A new family tree" ) // todo traduci
-					.setMessage( "There is STILL a shared tree you can download." ) // todo traduci
-					.setPositiveButton( "Download", (dialog, id) -> { // todo traduci
+			new AlertDialog.Builder(this).setTitle( R.string.a_new_tree )
+					.setMessage( R.string.you_can_download )
+					.setPositiveButton( R.string.download, (dialog, id) -> {
 						rotella.setVisibility( View.VISIBLE );
 						Facciata.scaricaCondiviso( this, referrer );
 					}).setNeutralButton( R.string.cancel, null ).show();
@@ -297,9 +297,9 @@ public void onInstallReferrerSetupFinished( int risposta ) {
 							String referrer = dettagli.getInstallReferrer();
 							if( referrer != null && referrer.matches("[0-9]{14}") ) { // È un data-id
 								Globale.preferenze.referrer = referrer;
-								new AlertDialog.Builder( Alberi.this ).setTitle( "A new family tree" ) // todo traduci
-										.setMessage( "You can now download the tree shared with you." ) // todo traduci
-										.setPositiveButton( "Download", (dialog, id) -> { // todo traduci
+								new AlertDialog.Builder( Alberi.this ).setTitle( R.string.a_new_tree )
+										.setMessage( R.string.you_can_download )
+										.setPositiveButton( R.string.download, (dialog, id) -> {
 											rotella.setVisibility( View.VISIBLE );
 											Facciata.scaricaCondiviso(Alberi.this, referrer);
 										}).setNeutralButton( R.string.cancel, (di, id) -> mostraWelcome() )

diff --git a/app/src/main/java/app/familygem/AlberoNuovo.java b/app/src/main/java/app/familygem/AlberoNuovo.java
@@ -60,7 +60,7 @@ protected void onCreate( Bundle bandolo ) {
 		// Crea un albero vuoto
 		Button alberoVuoto = findViewById( R.id.bottone_albero_vuoto );
 		if( esisteDataId ) {
-			alberoVuoto.setText( "Download the shared tree" ); // todo traduci
+			alberoVuoto.setText( R.string.download_shared_tree );
 			alberoVuoto.setOnClickListener( v -> {
 				rotella.setVisibility( View.VISIBLE );
 				Facciata.scaricaCondiviso(this, referrer);
@@ -202,8 +202,8 @@ void scaricaEsempio() {
 				+ "/the_Simpsons.zip";
 		DownloadManager.Request richiesta = new DownloadManager.Request( Uri.parse( url ) )
 				.setTitle( getString(R.string.simpsons_tree) )
-				.setDescription( "Family Gem example" ) // todo traduci
-				.setMimeType("application/zip")
+				.setDescription( getString(R.string.family_gem_example) )
+				.setMimeType( "application/zip" )
 				.setNotificationVisibility( DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
 				.setDestinationUri( Uri.parse( "file://" + percorsoZip ) );
 		gestoreScarico.enqueue( richiesta );

diff --git a/app/src/main/java/app/familygem/Chiesa.java b/app/src/main/java/app/familygem/Chiesa.java
@@ -252,7 +252,7 @@ public void onCreateOptionsMenu( Menu menu, MenuInflater inflater ) {
 		menu.add( R.string.order_by ).setEnabled(false);
 		menu.add( 0,1,0, R.string.id );
 		menu.add( 0,2,0, R.string.surname );
-		menu.add( 0,3,0, "Number of members" ); // todo traduci
+		menu.add( 0,3,0, R.string.number_members );
 	}
 	@Override
 	public boolean onOptionsItemSelected( MenuItem item ) {

diff --git a/app/src/main/java/app/familygem/Individuo.java b/app/src/main/java/app/familygem/Individuo.java
@@ -52,6 +52,10 @@ protected void onCreate( Bundle bandolo ) {
 			Alberi.apriGedcom( Globale.preferenze.idAprendo, false );
 		}
 		uno = (Person) Memoria.getOggetto();
+		// Se l'app va in background e viene stoppata, 'Memoria' è resettata e quindi 'uno' sarà null
+		if( uno == null && bandolo != null )
+			uno = gc.getPerson( bandolo.getString("idUno") ); // In Bundle è salvato l'id dell'individuo
+		// In effetti Memoria viene resettata, ma Globale.individuo sembra vivo e vegeto.. vabbè, comunque il Bundle fa il suo lavoro
 		Globale.individuo = uno.getId();
 		setContentView(R.layout.individuo);
 
@@ -354,6 +358,12 @@ protected void onStart() {
 		});
 	}
 
+	@Override
+	public void onSaveInstanceState (Bundle bandolo) {
+		super.onSaveInstanceState( bandolo );
+		bandolo.putString( "idUno", uno.getId() );
+	}
+
 	@Override
 	public void onActivityResult( int requestCode, int resultCode, Intent data ) {
 		super.onActivityResult( requestCode, resultCode, data );

diff --git a/app/src/main/java/app/familygem/NuovoParente.java b/app/src/main/java/app/familygem/NuovoParente.java
@@ -122,7 +122,6 @@ public void onSaveInstanceState (Bundle bandolo) {
 		//Save the fragment's instance
 		if( frammento != null )
 			getActivity().getSupportFragmentManager().putFragment(bandolo, "frammento", frammento);
-
 	}
 
 	// Dice se in una famiglia c'è spazio vuoto per aggiungere uno dei due genitori

diff --git a/app/src/main/res/layout/benvenuto.xml b/app/src/main/res/layout/benvenuto.xml
@@ -15,11 +15,11 @@
 		android:paddingTop="13dp"
 		android:paddingEnd="17dp"
 		android:paddingBottom="15dp"
-		android:text="Tap to add a family tree."
+		android:text="@string/tap_add_tree"
 		android:textColor="#000000"
 		android:textSize="16sp"
 		android:layout_marginEnd="16dp"/>
-		<!-- todo traduci -->
+
 	<ImageView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/info_albero.xml b/app/src/main/res/layout/info_albero.xml
@@ -62,7 +62,7 @@
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
 			android:layout_marginTop="20dp"
-			android:text="Update header"/>
-			<!-- todo traduci -->
+			android:text="@string/update_header"/>
+
 	</LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -24,7 +24,6 @@
     <string name="empty_tree">Neuen Stammbaum anlegen</string>
     <string name="blob">Blob</string>
     <string name="given">Taufname</string>
-    <string name="downloading">Herunterladen…</string>
     <string name="cant_understand_uri">Die empfangene URI ist nicht bekannt.</string>
     <string name="something_wrong">Es ist ein Fehler aufgetreten.</string>
     <string name="repository_note">Bemerkungs-Archiv</string>
@@ -202,7 +201,6 @@
     <string name="ancestors">Vorfahren</string>
     <string name="generations_display_diagram">Wieviele Generationen in einem Diagramm dargestellt werden.</string>
     <string name="diagram_settings">Diagramm einstellungen</string>
-    <string name="person_unlinked">Die Verbindung dieser Person wurde getrennt.</string>
     <string name="child">Kind</string>
     <string name="spouse">Ehepartner</string>
     <string name="sibling">Geschwister</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -80,7 +80,6 @@
     <string name="sibling">Hermano/a</string>
     <string name="spouse">Cónyuge</string>
     <string name="child">Hijo/a</string>
-    <string name="person_unlinked">Persona desvinculada.</string>
     <string name="order_by">Ordenar por</string>
     <string name="id">ID</string>
     <string name="surname">Apellido</string>
@@ -281,7 +280,6 @@
     <string name="old_backup_overwrite">Este es un viejo tipo de copia de seguridad. Todos los árboles se sobrescribirán!\n¿Desea continuar?</string>
     <string name="move_before">Mover antes</string>
     <string name="move_after">Mover después</string>
-    <string name="downloading">Descargando…</string>
     <string name="delete_imported_tree">Eliminar el árbol importado</string>
     <string name="all_imported_delete">Todas las actualizaciones han sido importadas.\n¿Desea eliminar el árbol importado?</string>
     <string name="really_delete_family">Esta familia será eliminada, pero las personas que la componen no serán eliminadas.</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -122,7 +122,6 @@
     <string name="generations">Générations</string>
     <string name="generation">Génération</string>
     <string name="persons">Personnes</string>
-    <string name="downloading">Téléchargement…</string>
     <string name="simpsons_tree">L\'arbre généalogique des Simpson</string>
     <string name="tree">Arbre</string>
     <string name="invalid_gedcom">GEDCOM invalide.</string>

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
@@ -116,7 +116,6 @@
     <string name="days">dana</string>
     <string name="submitters">Podnositelji</string>
     <string name="ignore">Preskoči</string>
-    <string name="person_unlinked">Ova je osoba odspojena.</string>
     <string name="revert">Poništi promjene</string>
     <string name="version_name">Verzija %s</string>
     <string name="child">Dijete</string>
@@ -293,7 +292,6 @@
     <string name="new_relative">Poveži novu osobu</string>
     <string name="generations">Generacije</string>
     <string name="tagline">Stvori vlastito obiteljsko stablo</string>
-    <string name="downloading">Preuzimanje …</string>
     <string name="months">mjeseci</string>
     <string name="unlink">Odspoji</string>
     <string name="auto_save">Automatsko spremanje</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -28,6 +28,7 @@
     <string name="submitters">Autori</string>
     <!-- AlberoNuovo -->
     <string name="new_tree">Nuovo albero</string>
+    <string name="download_shared_tree">Scarica l\'albero condiviso</string>
     <string name="empty_tree">Crea un albero vuoto</string>
     <string name="download_example">Scarica un esempio</string>
     <string name="import_gedcom">Importa un file GEDCOM</string>
@@ -44,8 +45,12 @@
     <string name="invalid_gedcom">GEDCOM non valido.</string>
     <string name="tree">Albero</string>
     <string name="simpsons_tree">Albero dei Simpson</string>
-    <string name="downloading">Scaricamento in corso…</string>
+    <string name="family_gem_example">Un esempio per Family Gem</string>
     <!-- Alberi -->
+    <string name="a_new_tree">Un nuovo albero genealogico</string>
+    <string name="you_can_download">Ora puoi scaricare l\'albero condiviso con te.</string>
+    <string name="download">Scarica</string>
+    <string name="tap_add_tree">Tocca per aggiungere un albero.</string>
     <string name="persons">Persone</string>
     <string name="generation">Generazione</string>
     <string name="generations">Generazioni</string>
@@ -78,6 +83,7 @@
     <string name="refresh">Aggiorna</string>
     <string name="header">Intestazione</string>
     <string name="create_header">Crea l\'intestazione</string>
+    <string name="update_header">Aggiorna l\'intestazione</string>
     <string name="file">File</string>
     <string name="characrter_set">Codifica</string>
     <string name="version">Versione</string>
@@ -144,7 +150,6 @@
     <string name="child">Figlio/a</string>
     <string name="long_press_menu">Tieni premuto per mostrare il menu.
 \nTocca per aprire il profilo.</string>
-    <string name="person_unlinked">Persona scollegata.</string>
     <!-- Diagram settings -->
     <string name="diagram_settings">Impostazioni diagramma</string>
     <string name="generations_display_diagram">Scegli quante generazioni mostrare nel diagramma.</string>
@@ -275,6 +280,7 @@
     <string name="state">Stato/provincia</string>
     <string name="country">Nazione</string>
     <!-- Famiglia -->
+    <string name="number_members">Numero dei membri</string>
     <string name="num_children">%d figli</string>
     <string name="family">Famiglia</string>
     <string name="marriage">Matrimonio</string>

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
@@ -129,7 +129,6 @@
     <string name="generations">Generasjoner</string>
     <string name="generation">Generasjon</string>
     <string name="persons">Personer</string>
-    <string name="downloading">Laster ned…</string>
     <string name="simpsons_tree">Simpsons-familietreet</string>
     <string name="tree">Tre</string>
     <string name="invalid_gedcom">Ugyldig GEDCOM.</string>
@@ -186,7 +185,6 @@
     <string name="siblings">Søsken</string>
     <string name="ancestors">Forfedre</string>
     <string name="diagram_settings">Diagraminnstillinger</string>
-    <string name="person_unlinked">Denne personen har blitt avlenket.</string>
     <string name="long_press_menu">Trykk lenge for å vise menyen.
 \nTrykk for å åpne profilen.</string>
     <string name="sibling">Søsken</string>

diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
@@ -86,7 +86,6 @@
     <string name="uncles">Ooms</string>
     <string name="ancestors">Voorouders</string>
     <string name="generations_display_diagram">Stel in hoeveel generaties u in het diagram wilt weergeven.</string>
-    <string name="person_unlinked">Deze persoon is ontkoppeld.</string>
     <string name="long_press_menu">Lang indrukken om het menu weer te geven.
 \nTik om het profiel te openen.</string>
     <string name="child">Kind</string>
@@ -194,7 +193,6 @@
     <string name="generations">Generaties</string>
     <string name="generation">Generatie</string>
     <string name="persons">Personen</string>
-    <string name="downloading">Downloaden…</string>
     <string name="simpsons_tree">Stamboom: The Simpsons</string>
     <string name="tree">Boom</string>
     <string name="invalid_gedcom">Ongeldige GEDCOM.</string>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Family Gem</string>
     <string name="tagline">Stwórz własne drzewo genealogiczne</string>
     <string name="delete">Usuń</string>
     <string name="cancel">Anuluj</string>
@@ -44,7 +43,6 @@
     <string name="invalid_gedcom">Nieprawidłowy GEDCOM.</string>
     <string name="tree">Drzewo</string>
     <string name="simpsons_tree">Drzewo genealogiczne Simpsonów</string>
-    <string name="downloading">Pobieranie…</string>
     <string name="persons">Osoby</string>
     <string name="generation">Pokolenie</string>
     <string name="generations">Pokoleń</string>
@@ -134,7 +132,6 @@
     <string name="spouse">Małżonka</string>
     <string name="child">Dziecko</string>
     <string name="long_press_menu">Przytrzymaj dłużej, aby wyświetlić menu.\nDotknij, aby otworzyć profil.</string>
-    <string name="person_unlinked">Ta osoba została odłączona.</string>
     <string name="diagram_settings">Ustawienia diagramu</string>
     <string name="generations_display_diagram">Ustaw liczbę pokoleń do wyświetlenia na schemacie.</string>
     <string name="ancestors">Przodków</string>

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -54,7 +54,6 @@
     <string name="ancestors">Предки</string>
     <string name="generations_display_diagram">Встановіть, скільки поколінь відображати на схемі.</string>
     <string name="diagram_settings">Налаштування діаграми</string>
-    <string name="person_unlinked">Цю особу від’єднано.</string>
     <string name="long_press_menu">Тривале натискання відображає меню.
 \n Торкніться, щоб відкрити профіль.</string>
     <string name="child">Дитина</string>
@@ -150,7 +149,6 @@
     <string name="generations">Покоління</string>
     <string name="generation">Покоління</string>
     <string name="persons">Особи</string>
-    <string name="downloading">Завантаження…</string>
     <string name="simpsons_tree">Сімейне дерево Сімпсонів</string>
     <string name="tree">Дерево</string>
     <string name="invalid_gedcom">Недійсний GEDCOM.</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@
     <string name="repositories">Repositories</string>
     <string name="submitters">Submitters</string>
     <string name="new_tree">New tree</string>
+    <string name="download_shared_tree">Download the shared tree</string>
     <string name="empty_tree">Start an empty tree</string>
     <string name="download_example">Download an example</string>
     <string name="import_gedcom">Import a GEDCOM file</string>
@@ -43,7 +44,11 @@
     <string name="invalid_gedcom">Invalid GEDCOM.</string>
     <string name="tree">Tree</string>
     <string name="simpsons_tree">The Simpsons Family Tree</string>
-    <string name="downloading">Downloading…</string>
+    <string name="family_gem_example">Family Gem example</string>
+    <string name="a_new_tree">A new family tree</string>
+    <string name="you_can_download">You can now download the tree shared with you.</string>
+    <string name="download">Download</string>
+    <string name="tap_add_tree">Tap to add a family tree.</string>
     <string name="persons">Persons</string>
     <string name="generation">Generation</string>
     <string name="generations">Generations</string>
@@ -74,6 +79,7 @@
     <string name="refresh">Refresh</string>
     <string name="header">Header</string>
     <string name="create_header">Create header</string>
+    <string name="update_header">Update header</string>
     <string name="file">File</string>
     <string name="characrter_set">Charset</string>
     <string name="version">Version</string>
@@ -134,7 +140,6 @@
     <string name="spouse">Spouse</string>
     <string name="child">Child</string>
     <string name="long_press_menu">Long press to display the menu.\nTap to open the profile.</string>
-    <string name="person_unlinked">This person has been unlinked.</string>
     <string name="diagram_settings">Diagram settings</string>
     <string name="generations_display_diagram">Set how many generations to show in the diagram.</string>
     <string name="ancestors">Ancestors</string>
@@ -253,6 +258,7 @@
     <string name="city">City</string>
     <string name="state">State/province</string>
     <string name="country">Country</string>
+    <string name="number_members">Number of members</string>
     <string name="num_children">%d children</string>
     <string name="family">Family</string>
     <string name="marriage">Marriage</string>