Merge branch 'master' of github.com:Colladia/client

Author: Vintache Jean

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

@@ -11,6 +11,8 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
+import android.widget.TextView;
+
 import com.ia04nf28.colladia.model.Elements.Element;
 import com.ia04nf28.colladia.model.Elements.ElementFactory;
 import com.ia04nf28.colladia.model.Manager;
@@ -33,7 +35,7 @@ protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_draw);
-
+        ((TextView)findViewById(R.id.labelDraw)).setText(Manager.instance(getApplicationContext()).getCurrentDiagram().getName());
         // Change toolbar
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);

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

@@ -715,6 +715,10 @@ public void onItemClick(View view) {
                 Manager.instance(applicationCtx).autoPositioning();
                 mode = NONE;
                 break;
+            case R.id.delete_element:
+                Manager.instance(applicationCtx).removeElement(selected);
+                mode = NONE;
+                break;
         }
 
         // exit contextual menus

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

@@ -128,7 +128,7 @@ public void onClick(DialogInterface di, int i) {
             public void onClick(DialogInterface di, int i) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(WorkspacesListActivity.this);
 
-                builder.setTitle(getString(R.string.delete_title) + diagramSelected + " ?");
+                builder.setTitle(getString(R.string.delete_title) + " " + diagramSelected + " ?");
 
                 builder.setNegativeButton(R.string.delete_button, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface di, int i) {

Colladia/app/src/main/res/layout/activity_draw.xml

@@ -26,14 +26,29 @@
             <include layout="@layout/contextual_select" />
         </LinearLayout>
 
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_width="?attr/actionBarSize"
-            android:minHeight="?attr/actionBarSize"
-            android:background="?attr/colorPrimary">
-        </android.support.v7.widget.Toolbar>
+            android:orientation="horizontal">
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_height="match_parent"
+                android:layout_width="?attr/actionBarSize"
+                android:minHeight="?attr/actionBarSize"
+                android:background="?attr/colorPrimary">
+            </android.support.v7.widget.Toolbar>
+            <TextView
+                android:id="@+id/labelDraw"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="testText"
+                android:textColor="@android:color/black"
+                android:background="@android:color/holo_blue_bright"
+                android:textSize="20sp"/>
+        </LinearLayout>
+
 
     </FrameLayout>
 

Colladia/app/src/main/res/layout/contextual_select.xml

@@ -11,10 +11,10 @@
     tools:showIn="@layout/activity_draw">
     <!-- Menu items -->
     <com.szugyi.circlemenu.view.CircleImageView
-        android:id="@+id/main_calendar_image"
+        android:id="@+id/delete_element"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_home"
+        android:src="@drawable/ic_delete"
         android:background="@drawable/circle" />
 
     <com.szugyi.circlemenu.view.CircleImageView
@@ -25,32 +25,4 @@
         android:background="@drawable/circle" />
 
 
-    <com.szugyi.circlemenu.view.CircleImageView
-        android:id="@+id/main_mail_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_home"
-        android:background="@drawable/circle" />
-
-    <com.szugyi.circlemenu.view.CircleImageView
-        android:id="@+id/main_key_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_home"
-        android:background="@drawable/circle" />
-
-    <com.szugyi.circlemenu.view.CircleImageView
-        android:id="@+id/main_profile_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_home"
-        android:background="@drawable/circle" />
-
-    <com.szugyi.circlemenu.view.CircleImageView
-        android:id="@+id/main_tap_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_home"
-        android:background="@drawable/circle" />
-
 </com.szugyi.circlemenu.view.CircleLayout>