spaces are remplaced by underscores in diagram names when adding a new diagram

Author: Impellettieri Florian

Colladia/app/src/main/java/com/ia04nf28/colladia/DrawActivity.java

@@ -12,13 +12,15 @@
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.ia04nf28.colladia.model.Diagram;
 import com.ia04nf28.colladia.model.Elements.Element;
 import com.ia04nf28.colladia.model.Elements.ElementFactory;
 import com.ia04nf28.colladia.model.Manager;
 import com.szugyi.circlemenu.view.CircleLayout;
 
-public class DrawActivity extends AppCompatActivity {
+public class DrawActivity extends AppCompatActivity implements Manager.CurrentDiagramListener {
 
     private static final String TAG = "DrawActivity";
 
@@ -36,6 +38,10 @@ protected void onCreate(Bundle savedInstanceState)
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_draw);
 
+        // Register to currentDiagram listener
+        Manager.instance(getApplicationContext()).registerListener(this);
+        Manager.instance(getApplicationContext()).synchronizeDiagramState();
+
         // Change toolbar
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -152,4 +158,12 @@ protected void onDestroy() {
         super.onDestroy();
         Manager.instance(getApplicationContext()).quitWorkspace();
     }
+
+    @Override
+    public void onStateChange(Diagram currentDiagram) {
+        //Toast.makeText(getApplicationContext(), "diagram name changed", Toast.LENGTH_LONG).show();
+        try{
+            getSupportActionBar().setTitle(Manager.instance(getApplicationContext()).getCurrentDiagram().getName());
+        }catch (Throwable e) {}
+    }
 }

Colladia/app/src/main/java/com/ia04nf28/colladia/WorkspacesListActivity.java

@@ -90,7 +90,8 @@ public void onClick(View view) {
                 builder.setTitle(getString(R.string.add_diagram_title)).setView(userTextInput);
                 builder.setNegativeButton(R.string.add_diagram_button, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface di, int i) {
-                        Manager.instance(getApplicationContext()).addDiagram(userTextInput.getText().toString());
+                        String diagrameName = userTextInput.getText().toString().replaceAll(" ","_");
+                        Manager.instance(getApplicationContext()).addDiagram(diagrameName);
                     }
                 });
 

Colladia/app/src/main/java/com/ia04nf28/colladia/model/Manager.java

@@ -115,6 +115,22 @@ private Manager(Context ctx) {
         lastClock = "0";
     }
 
+    // Listener for current diagram changes
+    public interface CurrentDiagramListener {
+        void onStateChange(Diagram currentDiagram);
+    }
+
+    private CurrentDiagramListener mListener = null;
+    public void registerListener (CurrentDiagramListener listener) {
+        mListener = listener;
+    }
+
+    public void synchronizeDiagramState() {
+        // now notify if someone is interested.
+        if (mListener != null)
+            mListener.onStateChange(currentDiagram);
+    }
+
     public User getUser() {
         return user;
     }
@@ -163,11 +179,6 @@ public void quitServer(){
     }
 
 
-
-
-
-
-
     /**
      * Method that handle every response from the server
      * @param responseRequest