add random name generator,

ui changes

Author: defcore

.gitignore

@@ -7,7 +7,6 @@
 /build
 /captures
 .externalNativeBuild
-.idea
 libs
 .idea/compiler.xml
 .idea/copyright/

.idea/misc.xml

@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumentation test, which will execute on an Android device.

app/src/androidTest/java/io/gloop/drawed/ExampleInstrumentedTest.java

@@ -27,6 +27,7 @@
 import io.gloop.GloopOnChangeListener;
 import io.gloop.drawed.model.Board;
 import io.gloop.drawed.utils.ColorUtil;
+import io.gloop.drawed.utils.NameUtil;
 
 /**
  * An activity representing a list of Items. This activity
@@ -55,6 +56,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         showIntroOnFirstRun();
 
+        //set username
+        TextView username = (TextView) findViewById(R.id.user_name);
+        username.setText(NameUtil.randomUserName(getApplicationContext())); // TODO at the moment name is randomly generated every time the app starts
+
         View recyclerView = findViewById(R.id.item_list);
         assert recyclerView != null;
         setupRecyclerView((RecyclerView) recyclerView);
@@ -71,8 +76,10 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onClick(View view) {
 
                 Board board = new Board();
-                board.setName("Test".toUpperCase());  // TODO set name of board
-                board.setColor(ColorUtil.randomColor(getApplicationContext()));
+                String colorName = NameUtil.randomColor(getApplicationContext());
+                board.setName(NameUtil.randomAdjective(getApplicationContext()) + colorName + NameUtil.randomObject(getApplicationContext()));
+//                board.setColor(ColorUtil.randomColor(getApplicationContext()));
+                board.setColor(ColorUtil.getColorByName(getApplicationContext(), colorName));
                 board.save();
 
                 if (mTwoPane) {
@@ -171,7 +178,7 @@ public void onBindViewHolder(final ViewHolder holder, final int position) {
 
             final Board board = mValues.get(position);
 
-            holder.mContentView.setText(board.getName().toUpperCase());
+            holder.mContentView.setText(board.getName());
             if (board.isPrivateBoard())
                 holder.mImagePrivate.setVisibility(View.VISIBLE);
             else {

app/src/main/java/io/gloop/drawed/BoardListActivity.java

@@ -107,7 +107,6 @@ protected void onDraw(Canvas canvas) {
         canvas.drawPath(drawPath, drawPaint);
     }
 
-
     private List<Point> line;
 
     //register user touches as drawing action
@@ -116,8 +115,6 @@ public boolean onTouchEvent(MotionEvent event) {
         float touchX = event.getX();
         float touchY = event.getY();
 
-//        if (touchX != 0 && touchY != 0) {
-
         //respond to down, move and up events
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
@@ -142,14 +139,13 @@ public boolean onTouchEvent(MotionEvent event) {
                 }
                 GloopLogger.i("BrushSize: " + brushSize);
                 board.addLine(new Line(line, paintColor, (int) brushSize));
-                board.save();
+                board.save();   // TODO save in background
                 line = null;
                 GloopLogger.i("Action up");
                 break;
             default:
                 return false;
         }
-//        }
         //redraw
         invalidate();
         return true;

app/src/main/java/io/gloop/drawed/DrawingView.java

@@ -3,6 +3,11 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.support.v4.content.res.ResourcesCompat;
+
+import java.lang.reflect.Field;
+
+import io.gloop.drawed.R;
 
 /**
  * Util to get random generated colors.
@@ -11,6 +16,24 @@
  */
 public class ColorUtil {
 
+
+    public static int getColorByName(Context context, String name) {
+        int colorId = 0;
+
+        try {
+            Class res = R.color.class;
+            Field field = res.getField(name);
+            colorId = field.getInt(null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (colorId == 0)
+            return randomColor(context);
+        return ResourcesCompat.getColor(context.getResources(), colorId, null); //without theme
+
+    }
+
     // TODO fix does not work
     private static int previousColor;
 

app/src/main/java/io/gloop/drawed/utils/ColorUtil.java

@@ -1,32 +1,44 @@
 package io.gloop.drawed.utils;
 
+import android.content.Context;
+
+import java.util.Random;
+
+import io.gloop.drawed.R;
+
 /**
  * Created by Alex Untertrifaller on 20.02.17.
  */
 
 public class NameUtil {
 
-    public static String randomUserName() {
-        return randomAdjective() + randomColor() + randomAnimal();
-    }
+    private static final Random random = new Random();
 
-    public static String randomBoardName() {
-        return randomAdjective() + randomColor() + randomObject();
+    public static String randomUserName(Context context) {
+        return randomAdjective(context) + randomColor(context) + randomAnimal(context);
     }
 
-    private static String randomAdjective() {
-        return ""; // TODO impl
+//    public static String randomBoardName(Context context) {
+//        return randomAdjective(context) + randomColor(context) + randomObject(context);
+//    }
+
+    public static String randomAdjective(Context context) {
+        String[] myString = context.getResources().getStringArray(R.array.adjectives);
+        return  myString[random.nextInt(myString.length)];
     }
 
-    private static String randomColor() {
-        return ""; // TODO impl
+    public static String randomColor(Context context) {
+        String[] myString = context.getResources().getStringArray(R.array.colors);
+        return  myString[random.nextInt(myString.length)];
     }
 
-    private static String randomAnimal() {
-        return ""; // TODO impl
+    public static String randomAnimal(Context context) {
+        String[] myString = context.getResources().getStringArray(R.array.animals);
+        return  myString[random.nextInt(myString.length)];
     }
 
-    private static String randomObject() {
-        return ""; // TODO impl
+    public static String randomObject(Context context) {
+        String[] myString = context.getResources().getStringArray(R.array.objects);
+        return  myString[random.nextInt(myString.length)];
     }
 }

app/src/main/java/io/gloop/drawed/utils/NameUtil.java

@@ -15,4 +15,14 @@
     <color name="color4">#4251B2</color>
     <color name="color5">#79B049</color>
     <color name="color6">#D52A6D</color>
+
+
+    <color name="Blue">#4354AF</color>
+    <color name="Red">#E34346</color>
+    <color name="Green">#7BAF4F</color>
+    <color name="Yellow">#FDB12F</color>
+    <color name="Purple">#8D38B2</color>
+    <color name="Orange">#ffa100</color>
+    <color name="Pink">#D52A6D</color>
+    <color name="Violet">#6b0597</color>
 </resources>