Merge branch 'master' of https://github.com/IA04-NF28/client

Author: CharlesMenier

Colladia/app/build.gradle

@@ -34,4 +34,5 @@ dependencies {
     compile 'com.android.support:design:23.3.0'
     compile files('libs/volley.jar')
     compile 'com.github.szugyi:Android-CircleMenu:1.1.1'
+    compile 'com.pavelsikun:vintage-chroma:1.5'
 }

Colladia/app/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/ColladiaTheme" >
+        android:theme="@style/ColladiaTheme"
+        android:screenOrientation="portrait" > <!-- disable auto-rotate -->
 
         <activity
             android:name=".LoginActivity"

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

@@ -339,13 +339,13 @@ private void drawGrid(Canvas canvas)
     public void recenter()
     {
         Log.d(TAG, "recenter");
-        xPos = 0f;
-        yPos = 0f;
-        translateX = 0f;
-        translateY = 0f;
+        xPos = this.getWidth() / 2;
+        yPos = this.getHeight() / 2;
+        translateX = xPos;
+        translateY = yPos;
         prevTranslateX = 0f;
         prevTranslateY = 0f;
-        root.set(0, 0);
+        root.set(xPos, yPos);
         invalidate();
     }
 
@@ -733,6 +733,10 @@ public void onItemClick(View view) {
                 Manager.instance(applicationCtx).autoPositioning();
                 mode = NONE;
                 break;
+            case R.id.center_view:
+                this.recenter();
+                mode = NONE;
+                break;
             case R.id.delete_element:
                 Manager.instance(applicationCtx).removeElement(selected);
                 mode = NONE;

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

@@ -7,6 +7,7 @@
 import android.content.SharedPreferences;
 import android.databinding.Observable;
 import android.databinding.ObservableList;
+import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -30,7 +31,12 @@
 import com.android.volley.toolbox.Volley;
 import com.ia04nf28.colladia.model.Manager;
 import com.ia04nf28.colladia.model.User;
+import com.pavelsikun.vintagechroma.ChromaDialog;
+import com.pavelsikun.vintagechroma.IndicatorMode;
+import com.pavelsikun.vintagechroma.OnColorSelectedListener;
+import com.pavelsikun.vintagechroma.colormode.ColorMode;
 
+import java.util.Random;
 import java.util.regex.Pattern;
 
 /**
@@ -40,17 +46,27 @@ public class LoginActivity extends AppCompatActivity {
     // UI references.
     private EditText mUserLoginView;
     private EditText mServerAddressView;
+    private Button mColorPickerButton;
     private View mProgressView;
     private View mLoginFormView;
 
+    private int color;
+    private ColorMode mode = ColorMode.RGB;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
         // Set up the login form.
         mUserLoginView = (EditText) findViewById(R.id.user_login);
         mServerAddressView = (EditText) findViewById(R.id.server_address);
-
+        mColorPickerButton = (Button) findViewById(R.id.color_picker);
+        mColorPickerButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                showColorPickerDialog();
+            }
+        });
         Button mEmailSignInButton = (Button) findViewById(R.id.validate_form_button);
         mEmailSignInButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -71,15 +87,20 @@ public void onPropertyChanged(Observable sender, int propertyId) {
             }
         });
 
+        Random rnd = new Random();
+        int rndDefaultColor = Color.argb(255, rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256));
+
         // get last stored settings
         SharedPreferences settings = getPreferences(MODE_PRIVATE);
         String lastLogin = settings.getString("login", "");
         String lastUrl = settings.getString("url", "");
-        int lastColor = settings.getInt("color", -1); // -1 == White, default value, replaced by random color
+
+
+        color = settings.getInt("color", rndDefaultColor);
         // inject in forms
         mUserLoginView.setText(lastLogin);
         mServerAddressView.setText(lastUrl);
-
+        updateColorPickerButton(color);
     }
 
     @Override
@@ -152,7 +173,7 @@ private void attemptLogin() {
             // Show a progress spinner, and kick off a background task to
             // perform the user login attempt.
             showProgress(true);
-            Manager.instance(this.getApplicationContext()).login(new User(userLogin), address);
+            Manager.instance(this.getApplicationContext()).login(new User(userLogin, color), address);
         }
         //startDrawActivity();
     }
@@ -214,5 +235,24 @@ private void validationFail(VolleyError error) {
         mServerAddressView.requestFocus();
         Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_LONG).show();
     }
+
+    private void showColorPickerDialog() {
+        new ChromaDialog.Builder()
+                .initialColor(color)
+                .colorMode(ColorMode.RGB)
+                .indicatorMode(IndicatorMode.DECIMAL) //HEX or DECIMAL;
+                .onColorSelected(new OnColorSelectedListener() {
+                    @Override public void onColorSelected(int newColor) {
+                        updateColorPickerButton(newColor);
+                        color = newColor;
+                    }
+                })
+                .create()
+                .show(getSupportFragmentManager(), "dialog");
+    }
+
+    private void updateColorPickerButton(int color){
+        mColorPickerButton.setBackgroundColor(color);
+    }
 }
 

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

@@ -68,8 +68,8 @@ public void run() {
             }
         };
     }
-    private final static long delayRequestDiagrams = 5000;
-    private final static long delayRequestElements = 1000;
+    private final static long delayRequestDiagrams = 1000;
+    private final static long delayRequestElements = 100;
 
 
     private final static String STATUS_FIELD = "status";

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

@@ -44,7 +44,7 @@
                         android:inputType="text"
                         android:maxLines="1"
                         android:singleLine="true"
-                        android:text="L'homme"/>
+                        android:text=""/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -63,11 +63,17 @@
                         android:inputType="textUri"
                         android:maxLines="1"
                         android:singleLine="true"
-                        android:text="http://172.26.25.22:8182"
+                        android:text=""
                     />
 
             </android.support.design.widget.TextInputLayout>
 
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/color_picker"
+                android:text="@string/color_picker_button_text" />
+
             <Button
                     android:id="@+id/validate_form_button"
                     style="?android:textAppearanceSmall"

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

@@ -39,6 +39,13 @@
         android:src="@drawable/ic_comment"
         android:background="@drawable/circle" />
 
+    <com.szugyi.circlemenu.view.CircleImageView
+        android:id="@+id/center_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_menu_manage"
+        android:background="@drawable/circle" />
+
     <com.szugyi.circlemenu.view.CircleImageView
         android:id="@+id/auto_layout_elements"
         android:layout_width="wrap_content"

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

@@ -48,4 +48,5 @@
     <string name="add_diagram_title">Add a new diagram</string>
     <string name="nav_menu_auto_position">Auto</string>
     <string name="nav_menu_home_back">Retour</string>
+    <string name="color_picker_button_text">Choose your color</string>
 </resources>