Skip to content
This repository was archived by the owner on May 24, 2021. It is now read-only.

added hints to import and export #13

Open
domowirth wants to merge 1 commit into
base: master
Choose a base branch
from
+49 −15
Open

added hints to import and export #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 46 additions & 12 deletions app/src/main/java/com/rubengees/vocables/utils/TransferUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,23 @@
*/
public class TransferUtils {

public static final String TAG_UNITS = "units";
public static final String TAG_UNIT = "unit";
public static final String TAG_TITLE = "title";
public static final String TAG_VOCABLES = "vocables";
public static final String TAG_VOCABLE = "vocable";
public static final String TAG_FIRST_MEANING = "first_meaning";
public static final String TAG_SECOND_MEANING = "second_meaning";
public static final String TAG_VALUE = "value";
private static final String TAG_UNITS = "units";
private static final String TAG_UNIT = "unit";
private static final String TAG_TITLE = "title";
private static final String TAG_VOCABLES = "vocables";
private static final String TAG_VOCABLE = "vocable";
private static final String TAG_FIRST_MEANING = "first_meaning";
private static final String TAG_SECOND_MEANING = "second_meaning";
private static final String TAG_VALUE = "value";
private static final String TAG_HINT = "hint";

private static final String EMPTY = "";
private static final String EXTENSION_CSV = ".csv";
private static final String EXTENSION_XML = ".xml";

public static boolean isFileSupported(@NonNull File file) {
String filename = file.getName();
return filename.endsWith(".csv") || filename.endsWith(".xml");
return filename.endsWith(EXTENSION_CSV) || filename.endsWith(EXTENSION_XML);
}

public static void export(@NonNull List<Unit> units, @NonNull File toExport)
Expand Down Expand Up @@ -74,6 +79,13 @@ private static void writeXml(@NonNull XmlSerializer serializer, @NonNull List<Un
serializer.startTag(null, TAG_SECOND_MEANING);
insertMeaning(serializer, vocable.getSecondMeaningList());
serializer.endTag(null, TAG_SECOND_MEANING);

if(vocable.getHint() != null) {
serializer.startTag(null, TAG_HINT);
serializer.text(vocable.getHint());
serializer.endTag(null, TAG_HINT);
}

serializer.endTag(null, TAG_VOCABLE);
}
serializer.endTag(null, TAG_VOCABLES);
Expand All @@ -94,9 +106,9 @@ private static void insertMeaning(@NonNull XmlSerializer serializer,

public static List<Unit> getList(@NonNull Context context, @NonNull File file)
throws FormatException, IOException {
if (file.getName().endsWith(".csv")) {
if (file.getName().endsWith(EXTENSION_CSV)) {
return parseCsv(context, file);
} else if (file.getName().endsWith(".xml")) {
} else if (file.getName().endsWith(EXTENSION_XML)) {
return parseXml(context, file);
} else {
throw new FormatException(context.getString(R.string.transfer_import_format_error));
Expand Down Expand Up @@ -204,18 +216,29 @@ private static List<Vocable> getVocablesFromXml(XmlPullParser parser, long creat
parser.require(XmlPullParser.START_TAG, null, TAG_VOCABLES);
while (parser.nextTag() != XmlPullParser.END_TAG) {
parser.require(XmlPullParser.START_TAG, null, TAG_VOCABLE);
Vocable vocable = null;
while (parser.nextTag() != XmlPullParser.END_TAG) {
MeaningList first;
MeaningList second;

if(vocable != null) {
String hint = readOptionalHint(parser);
if(hint != null) {
vocable.setHint(hint);
vocable = null;
continue;
}
}

parser.require(XmlPullParser.START_TAG, null, TAG_FIRST_MEANING);
first = getMeaningFromXml(parser);
parser.require(XmlPullParser.END_TAG, null, TAG_FIRST_MEANING);
parser.nextTag();
parser.require(XmlPullParser.START_TAG, null, TAG_SECOND_MEANING);
second = getMeaningFromXml(parser);
parser.require(XmlPullParser.END_TAG, null, TAG_SECOND_MEANING);
result.add(new Vocable(first, second, null, creationTime));
vocable = new Vocable(first, second, null, creationTime);
result.add(vocable);
}
}
parser.require(XmlPullParser.END_TAG, null, TAG_VOCABLES);
Expand All @@ -224,6 +247,17 @@ private static List<Vocable> getVocablesFromXml(XmlPullParser parser, long creat
return result;
}

private static String readOptionalHint(XmlPullParser parser) {
try {
parser.require(XmlPullParser.START_TAG, null, TAG_HINT);
String hint = parser.nextText();
parser.require(XmlPullParser.END_TAG, null, TAG_HINT);
return hint == null? EMPTY : hint;
} catch(IOException | XmlPullParserException e) {
return null;
}
}

private static MeaningList getMeaningFromXml(XmlPullParser parser)
throws IOException, XmlPullParserException {
List<String> words = new ArrayList<>();
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'io.fabric.tools:gradle:1.20.1'
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Nov 03 13:52:32 CET 2015
#Sat Mar 10 15:18:16 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip