Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ For questions, bugs, suggestions you can:
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.

## About
Family Gem is written in Java within Eclipse and Android Studio.
Project started on beginning of 2018.
Author is Michele Salvador, an Italian self-taught programmer and genealogy enthusiast.
Family Gem is written in Java within Eclipse and Android Studio.
Project started on beginning of 2018.
Author is Michele Salvador, an Italian programmer and genealogy enthusiast.
17 changes: 9 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {
minSdkVersion 19
targetSdkVersion 33
versionCode 22
versionName '0.9.1'
versionName '0.9.1.4'
vectorDrawables.useSupportLibrary = true
resConfigs 'cs', 'de', 'en', 'eo', 'es', 'fa', 'fr', 'hr', 'hu', 'in', 'it', 'iw', 'kn', 'mr', 'nb', 'nl', 'pl', 'pt', 'ru', 'sk', 'sr', 'tr', 'uk'
def utenteAruba = ""
Expand Down Expand Up @@ -69,25 +69,26 @@ android {
dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'commons-io:commons-io:2.8.0' // Versions from 2.9.0 to 2.11.0 give NoClassDefFoundError on old devices
implementation 'com.google.code.gson:gson:2.8.7'
implementation 'commons-net:commons-net:3.6'
implementation 'com.google.code.gson:gson:2.10'
implementation 'commons-net:commons-net:3.8.0'
implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
//implementation 'org.familysearch.gedcom:gedcom:1.13.0'
implementation files('libs/gedcom-1.14.0-SNAPSHOT.jar')
implementation files('libs/slf4j-api-1.7.25.jar')
implementation 'androidx.work:work-runtime:2.7.1'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
implementation 'com.android.installreferrer:installreferrer:2.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation files('libs/gedcomgraph-3.2.jar')
implementation 'joda-time:joda-time:2.10.10'
implementation 'joda-time:joda-time:2.12.1'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'com.otaliastudios:zoomlayout:1.3.0'
implementation 'com.github.AndroidDeveloperLB:FastScrollerAndRecyclerViewFixes:5'
implementation 'org.jsoup:jsoup:1.14.1'
implementation 'com.otaliastudios:zoomlayout:1.9.0'
implementation 'com.github.AndroidDeveloperLB:FastScrollerAndRecyclerViewFixes:9'
implementation 'org.jsoup:jsoup:1.15.3'
implementation files('libs/geonames-1.1.14.jar')
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'jp.wasabeef:picasso-transformations:2.2.1'
implementation 'org.jdom:jdom:1.1.3' // Don't update to version 2.x for compatibility with GeoNames
//androidTestImplementation 'androidx.test:runner:1.4.0'
}
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-keep class app.familygem.Settings, app.familygem.Chiesa, app.familygem.Podio # for R8.fullMode
-keep class app.familygem.Settings, app.familygem.list.FamiliesFragment, app.familygem.Podio # for R8.fullMode
-keepclassmembernames class app.familygem.Settings, app.familygem.Settings$Tree, app.familygem.Settings$Diagram, app.familygem.Settings$ZippedTree, app.familygem.Settings$Share { *; }
-keepclassmembers class org.folg.gedcom.model.* { *; }
#-keeppackagenames org.folg.gedcom.model # Gedcom parser lo chiama come stringa eppure funziona anche senza
Expand Down
38 changes: 19 additions & 19 deletions app/src/androidTest/java/app/familygem/ExportTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,39 +130,39 @@ void esportaGedcom() {
if( !documentsDir.exists() ) documentsDir.mkdir();

File fileGedcom = new File( documentsDir, "Küçük ağaç.ged" );
Esportatore esp = new Esportatore( appContext );
assertTrue( esp.apriAlbero( idAlbero ) );
assertNull( esp.messaggioSuccesso );
assertNull( esp.messaggioErrore );
assertTrue( esp.esportaGedcom(Uri.fromFile(fileGedcom)) );
Exporter esp = new Exporter( appContext );
assertTrue( esp.openTree( idAlbero ) );
assertNull( esp.successMessage);
assertNull( esp.errorMessage);
assertTrue( esp.exportGedcom(Uri.fromFile(fileGedcom)) );
assertTrue( fileGedcom.isFile() );
assertEquals( esp.messaggioSuccesso, appContext.getString(R.string.gedcom_exported_ok) );
s.l( esp.messaggioSuccesso );
assertEquals( esp.successMessage, appContext.getString(R.string.gedcom_exported_ok) );
s.l( esp.successMessage);

File fileGedcomZip = new File( documentsDir, "ਸੰਕੁਚਿਤ.zip" );
Esportatore esp2 = new Esportatore( appContext );
assertTrue( esp2.apriAlbero( idAlbero ) );
boolean result = esp2.esportaGedcomZippato(Uri.fromFile(fileGedcomZip));
s.l( esp2.messaggioErrore );
Exporter esp2 = new Exporter( appContext );
assertTrue( esp2.openTree( idAlbero ) );
boolean result = esp2.exportZippedGedcom(Uri.fromFile(fileGedcomZip));
s.l( esp2.errorMessage);
assertTrue( result );
assertEquals( esp2.messaggioSuccesso, appContext.getString(R.string.zip_exported_ok) );
assertEquals( esp2.successMessage, appContext.getString(R.string.zip_exported_ok) );
assertTrue( fileGedcomZip.isFile() );
s.l( esp2.messaggioSuccesso );
s.l( esp2.successMessage);
}

// Esporta in /Documents l'ultimo albero come backup ZIP
void esportaBackup() {
File documentsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS);
if( !documentsDir.exists() ) documentsDir.mkdir();
File fileBackup = new File( documentsDir, "Becàp olè.zip" );
Esportatore esp = new Esportatore( appContext );
Exporter esp = new Exporter( appContext );
Settings.Tree ultimoAlb = Global.settings.trees.get(Global.settings.trees.size()-1);
assertTrue( esp.apriAlbero( ultimoAlb.id ) );
boolean result = esp.esportaBackupZip( null, -1, Uri.fromFile(fileBackup) );
s.l( esp.messaggioErrore );
assertTrue( esp.openTree( ultimoAlb.id ) );
boolean result = esp.exportZipBackup( null, -1, Uri.fromFile(fileBackup) );
s.l( esp.errorMessage);
assertTrue( result );
assertEquals( esp.messaggioSuccesso, appContext.getString(R.string.zip_exported_ok) );
assertEquals( esp.successMessage, appContext.getString(R.string.zip_exported_ok) );
assertTrue( fileBackup.isFile() );
s.l( esp.messaggioSuccesso );
s.l( esp.successMessage);
}
}
16 changes: 8 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,38 +56,38 @@
</intent-filter>
</activity>
<activity
android:name=".Alberi"
android:name=".TreesActivity"
android:launchMode="singleTask" />
<activity
android:name=".AlberoNuovo"
android:name=".NewTreeActivity"
android:label="@string/new_tree"
android:parentActivityName=".Alberi" />
android:parentActivityName=".TreesActivity" />
<activity
android:name=".Principal"
android:theme="@style/AppTheme.NoActionBar"/>
<activity
android:name=".Opzioni"
android:label="@string/settings"
android:parentActivityName=".Alberi"/>
android:parentActivityName=".TreesActivity"/>
<activity
android:name=".Lapide"
android:label="@string/about"
android:parentActivityName=".Opzioni" />
<activity
android:name=".InfoAlbero"
android:label="@string/tree_info"
android:parentActivityName=".Alberi" />
android:parentActivityName=".TreesActivity" />
<activity
android:name=".CartelleMedia"
android:label="@string/media_folders" />
<activity
android:name=".Condivisione"
android:label="@string/share_tree"
android:parentActivityName=".Alberi" />
android:parentActivityName=".TreesActivity" />
<activity
android:name=".Compara"
android:label="@string/tree_with_news"
android:parentActivityName=".Alberi" />
android:parentActivityName=".TreesActivity" />
<activity
android:name=".Confrontatore"
android:label="@string/import_news"
Expand All @@ -101,7 +101,7 @@
android:label="@string/diagram_settings"
android:parentActivityName=".Principal" />
<activity
android:name=".Individuo"
android:name=".ProfileActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".detail.Famiglia" />
Expand Down
170 changes: 0 additions & 170 deletions app/src/main/java/app/familygem/AdattatoreGalleriaMedia.java

This file was deleted.

Loading