Changed actionbar and added recenter to menu

Author: CharlesMenier

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

@@ -35,12 +35,19 @@ 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);
+
         getSupportActionBar().setTitle(Manager.instance(getApplicationContext()).getCurrentDiagram().getName());
 
+        if(getSupportActionBar().getTitle() == null)
+        {
+            getSupportActionBar().setTitle("Colladia");
+        }
+
+
         colladiaView = (DrawColladiaView) findViewById(R.id.draw_view);
         colladiaView.setApplicationCtx(getApplicationContext());
 
@@ -82,14 +89,23 @@ public void selectDrawerItem(MenuItem item)
                 finish();
                 break;
 
+            case R.id.nav_position:
+                Manager.instance(getApplicationContext()).autoPositioning();
+                colladiaView.setMode(0);
+                break;
+
+            case R.id.nav_center:
+                colladiaView.recenter();
+                break;
+
             default:
                 Element newElement = ElementFactory.createElement(getApplicationContext(), item.getTitle().toString());
 
                 if (newElement != null) colladiaView.insertNewElement(newElement);
-
-                drawer.closeDrawers();
                 break;
         }
+
+        drawer.closeDrawers();
     }
 
     @Override
@@ -118,14 +134,6 @@ public boolean onOptionsItemSelected(MenuItem item)
             default:
                 return true;
         }
-
-        /*if(drawerToggle.onOptionsItemSelected(item)) {
-            return true;
-        }*/
-
-        // Handle any other menu item selections...
-
-        //return super.onOptionsItemSelected(item);
     }
 
   /*  public void onBackPressed() {

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

@@ -36,7 +36,7 @@ public class DrawColladiaView extends SurfaceView implements SurfaceHolder.Callb
     private static final float TOLERANCE = 5;
 
     // ZOOM LIMITS
-    private static final float ZOOM_MIN = 0.35f;
+    private static final float ZOOM_MIN = 0.20f;
     private static final float ZOOM_MAX = 2.0f;
 
     // ALLOWED MODES
@@ -336,6 +336,19 @@ private void drawGrid(Canvas canvas)
     }
 
 
+    public void recenter()
+    {
+        Log.d(TAG, "recenter");
+        xPos = 0f;
+        yPos = 0f;
+        translateX = 0f;
+        translateY = 0f;
+        prevTranslateX = 0f;
+        prevTranslateY = 0f;
+        root.set(0, 0);
+        invalidate();
+    }
+
 
     private void startTouch(float x, float y)
     {
@@ -726,6 +739,11 @@ public void onItemClick(View view) {
         selectContextualMenu.setVisibility(GONE);
     }
 
+    public void setMode(int mode)
+    {
+        this.mode = mode;
+    }
+
     public class SimpleScaleListener extends ScaleGestureDetector.SimpleOnScaleGestureListener {
         @Override
         public boolean onScale(ScaleGestureDetector sg)

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

@@ -33,20 +33,10 @@
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_height="match_parent"
-                android:layout_width="?attr/actionBarSize"
+                android:layout_width="match_parent"
                 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>
 
 
@@ -60,6 +50,7 @@
         android:layout_marginTop="?attr/actionBarSize"
         android:layout_gravity="start"
         android:fitsSystemWindows="false"
-        app:menu="@menu/nav_view_items" >
+        app:menu="@menu/nav_view_items"
+        app:theme="@style/NavigationView">
     </android.support.design.widget.NavigationView>
 </android.support.v4.widget.DrawerLayout>

Colladia/app/src/main/res/menu/nav_view_items.xml

@@ -11,8 +11,13 @@
                         android:icon="@drawable/ic_home"
                         android:title="@string/nav_home" />
                     <item
+                        android:id="@+id/nav_position"
                         android:icon="@drawable/ic_position"
                         android:title="@string/nav_position" />
+                    <item
+                        android:id="@+id/nav_center"
+                        android:icon="@drawable/ic_menu_manage"
+                        android:title="@string/nav_center" />
                 </group>
             </menu>
         </item>

Colladia/app/src/main/res/values/strings.xml

@@ -24,6 +24,7 @@
     <string name="action_settings">Settings</string>
     <string name="nav_home">Back</string>
     <string name="nav_position">Repositionner</string>
+    <string name="nav_center">Recentrer</string>
     <string name="square">Square</string>
     <string name="circle">Circle</string>
     <string name="triangle">Triangle</string>

Colladia/app/src/main/res/values/styles.xml

@@ -20,6 +20,10 @@
 
     </style>
 
+    <style name="NavigationView">
+        <item name="android:textSize">8sp</item>
+    </style>
+
 
 
     <!-- Base application theme. -->