X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=c29ba00ec36a099d5a3f118bd88e41c39aba4fca;hb=8002675fff4eaeeb292c4b1a1e4182bd999a548c;hp=5a616b918fd7b3f5804185351dcca97f6cb2b5ae;hpb=ed91f27a4f628ec59b0e85cdbb0319287c503f9d;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
index 5a616b9..c29ba00 100644
--- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
@@ -115,41 +115,57 @@ public class ContactDetailsRaw extends MainContentList {
 				return null;
 			}
 		});
-		// TODO: ui
+		// TODO: ui and i18n
 		actions.add(new KeyAction(Mode.ASK_USER, 'a', StringId.KEY_ACTION_ADD) {
+			private String name;
+
 			@Override
 			public boolean onAction() {
-				try{
 				new ActionListDialogBuilder()
-						.setTitle("Action List Dialog")
-						.setDescription("Choose an item")
-						.addAction("First Item", new Runnable() {
+						.setTitle("New data")
+						.setDescription("Choose a data type")
+						.addAction("Email address", new Runnable() {
+							@Override
+							public void run() {
+								name = "EMAIL";
+							}
+						})
+						.addAction("Telephone number", new Runnable() {
 							@Override
 							public void run() {
-								// Do 1st thing...
+								name = "TEL";
 							}
 						})
-						.addAction("Second Item", new Runnable() {
+						.addAction("Birthday", new Runnable() {
 							@Override
 							public void run() {
-								// Do 2nd thing...
+								name = "BDAY";
 							}
 						})
-						.addAction("Third Item", new Runnable() {
+						.addAction("[other]", new Runnable() {
 							@Override
 							public void run() {
-								// Do 3rd thing...
+								name = "";
 							}
 						})
 						.build()
 						.showDialog(
 								new MultiWindowTextGUI(TuiLauncher.getScreen()));
-				
-				return true;
-				}catch(Exception e){
-					e.printStackTrace();
-					throw e;
+
+				String name = this.name;
+				this.name = null;
+
+				if (name != null) {
+					if (name.length() > 0) {
+						Data data = new Data(null, name, "", null);
+						getContact().add(data);
+						addItem("x");
+					}
+
+					return (name.length() == 0);
 				}
+
+				return false;
 			}
 
 			@Override
@@ -160,27 +176,20 @@ public class ContactDetailsRaw extends MainContentList {
 			@Override
 			public String getQuestion() {
 				// TODO i18n
-				return "new data (xx.group = yy): ";
+				if (name == null)
+					return "Data name: ";
+
+				return null;
 			}
 
 			@Override
 			public String callback(String answer) {
-				int indexEq = answer.indexOf('=');
-				if (indexEq >= 0) {
-					String name = answer.substring(0, indexEq).trim();
-					String value = answer.substring(indexEq + 1).trim();
-					String group = null;
-
-					int indexDt = name.indexOf('.');
-					if (indexDt >= 0) {
-						group = name.substring(indexDt + 1).trim();
-						name = name.substring(0, indexDt).trim();
-					}
-
-					Data data = new Data(null, name, value, group);
+				if (answer != null & answer.length() > 0) {
+					Data data = new Data(null, answer, "", null);
 					getContact().add(data);
 					addItem("x");
 				}
+
 				return null;
 			}
 		});
@@ -348,7 +357,7 @@ public class ContactDetailsRaw extends MainContentList {
 				valueBuilder.append(data.getValue().replaceAll("\n", "\\\\n"));
 			}
 			if (data.getGroup() != null && data.getGroup().length() > 0) {
-				valueBuilder.append("(");
+				valueBuilder.append(" (");
 				valueBuilder.append(data.getGroup());
 				valueBuilder.append(")");
 			}