Release Version 1.09

- Updated Achievements scoring
- Updated LeaderBoard submissions
- User can now draw in different colors
- Added color wheel type in settings
- Added Wurm-o-Meter screen with user scores
- Added Colorful Wurms achievement that unlocks color annotation

Author: jiangshen

README.md

@@ -8,6 +8,14 @@ Android drawing application for annotating the backbone of worms.
 
 ## Releases
 
+### 1.09 (2018-4-28)
+- Updated Achievements scoring
+- Updated LeaderBoard submissions
+- User can now draw in different colors
+- Added color wheel type in settings
+- Added Wurm-o-Meter screen with user scores
+- Added Colorful Wurms achievement that unlocks color annotation
+
 ### 1.08 (2018-04-23)
 - Added about screen
 - Redesigned navigation drawer layout

app/.idea/assetWizardSettings.xml

@@ -43,6 +43,8 @@ dependencies {
     testCompile 'junit:junit:4.12'
     implementation 'com.android.support:design:26.1.0'
 
+    compile 'com.github.QuadFlask:colorpicker:0.0.13'
+
     compile 'com.google.firebase:firebase-storage:15.0.0'
     compile 'com.google.firebase:firebase-auth:15.0.0'
     compile 'com.google.android.gms:play-services-auth:15.0.0'

app/.idea/caches/build_file_checksums.ser

@@ -56,6 +56,7 @@
             android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -73,11 +74,11 @@
             android:theme="@style/AppTheme" />
         <activity
             android:name=".SettingsActivity"
-            android:screenOrientation="portrait"
+            android:configChanges="locale"
             android:label="@string/title_activity_settings"
             android:parentActivityName=".DrawingActivity"
-            android:theme="@style/AppTheme.Settings"
-            android:configChanges="locale">
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Settings">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.example.caden.drawingtest.DrawingActivity" />
@@ -86,7 +87,11 @@
             android:name=".AboutActivity"
             android:label="@string/title_activity_about"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.Settings"/>
+            android:theme="@style/AppTheme.Settings" />
+        <activity android:name=".WurmMeterActivity"
+            android:label="@string/menu_wurm_meter"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.WurmMeter"/>
     </application>
 
 </manifest>

app/.idea/workspace.xml

@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
@@ -12,10 +13,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-/**
- * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
- * to be used with AppCompat.
- */
 public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
 
     private AppCompatDelegate mDelegate;
@@ -41,6 +38,7 @@ public void setSupportActionBar(@Nullable Toolbar toolbar) {
         getDelegate().setSupportActionBar(toolbar);
     }
 
+    @NonNull
     @Override
     public MenuInflater getMenuInflater() {
         return getDelegate().getMenuInflater();

app/build.gradle

@@ -25,7 +25,7 @@ public static void renderModel(Canvas canvas, DrawModel model, Paint paint, int
             //get the whole line from the model object
             DrawModel.Line line = model.getLine(i);
             //set its color
-            paint.setColor(Color.parseColor("#FF2646"));
+            paint.setColor(SharedData.lineColor);
             //get the first of many lines that make up the overall line
             int elemSize = line.getElemSize();
             //if its empty, skip