Cleaned up -> Removed unused imports / files

particlelab/src/main/java/de/frajul/particlelab/entities/Entity.java

@@ -1,8 +1,8 @@
 package de.frajul.particlelab.entities;
 
 import de.frajul.particlelab.data.Color;
-import de.frajul.particlelab.entities.textures.Texture;
 import de.frajul.particlelab.data.Vector;
+import de.frajul.particlelab.entities.textures.Texture;
 
 /**
  * Created by Julian on 20.11.2015.

particlelab/src/main/java/de/frajul/particlelab/entities/particles/Particle.java

@@ -1,15 +1,14 @@
 package de.frajul.particlelab.entities.particles;
 
+import java.util.Random;
+
 import de.frajul.particlelab.data.Vector;
 import de.frajul.particlelab.entities.Entity;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.Range;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.Timeline;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.TintTimeline;
-import de.frajul.particlelab.main.GameLog;
 import de.frajul.particlelab.rendering.Timer;
 
-import java.util.Random;
-
 /**
  * Created by Julian on 02.08.2016.
  */

particlelab/src/main/java/de/frajul/particlelab/entities/particles/ParticleData.java

@@ -4,7 +4,6 @@ import de.frajul.particlelab.entities.particles.attributes.attributeValues.Range
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.Timeline;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.TimelineRange;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.TintTimeline;
-import de.frajul.particlelab.entities.textures.Texture;
 
 /**
  * Created by Julian on 03.08.2016.

particlelab/src/main/java/de/frajul/particlelab/entities/particles/ParticleEffect.java

@@ -1,5 +1,9 @@
 package de.frajul.particlelab.entities.particles;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.Options;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.Range;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.SpawnShape;
@@ -9,10 +13,6 @@ import de.frajul.particlelab.entities.particles.attributes.attributeValues.TintT
 import de.frajul.particlelab.entities.textures.Texture;
 import de.frajul.particlelab.rendering.Timer;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 /**
  * Created by Julian on 05.08.2016.
  */

particlelab/src/main/java/de/frajul/particlelab/entities/particles/ParticleReader.java

@@ -2,6 +2,12 @@ package de.frajul.particlelab.entities.particles;
 
 import android.content.Context;
 
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
 import de.frajul.particlelab.entities.particles.attributes.Attribute;
 import de.frajul.particlelab.entities.particles.attributes.AttributeValueReader;
 import de.frajul.particlelab.entities.particles.attributes.ParticleAttributeType;
@@ -13,13 +19,6 @@ import de.frajul.particlelab.entities.particles.attributes.attributeValues.Spawn
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.Timeline;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.TimelineRange;
 import de.frajul.particlelab.entities.particles.attributes.attributeValues.TintTimeline;
-import de.frajul.particlelab.main.GameLog;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Created by Julian on 02.08.2016.

particlelab/src/main/java/de/frajul/particlelab/entities/particles/ParticleSource.java

@@ -1,16 +1,15 @@
 package de.frajul.particlelab.entities.particles;
 
-import de.frajul.particlelab.data.Vector;
-import de.frajul.particlelab.entities.particles.attributes.attributeValues.SpawnShape;
-import de.frajul.particlelab.main.GameLog;
-import de.frajul.particlelab.rendering.Lock;
-import de.frajul.particlelab.rendering.Timer;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
+import de.frajul.particlelab.data.Vector;
+import de.frajul.particlelab.entities.particles.attributes.attributeValues.SpawnShape;
+import de.frajul.particlelab.rendering.Lock;
+import de.frajul.particlelab.rendering.Timer;
+
 /**
  * Created by Julian on 02.08.2016.
  */

particlelab/src/main/java/de/frajul/particlelab/entities/particles/attributes/Attribute.java

@@ -1,11 +1,11 @@
 package de.frajul.particlelab.entities.particles.attributes;
 
-import de.frajul.particlelab.entities.particles.attributes.attributeValues.ParticleAttributeValue;
-import de.frajul.particlelab.entities.particles.attributes.attributeValues.ParticleAttributeValueType;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import de.frajul.particlelab.entities.particles.attributes.attributeValues.ParticleAttributeValue;
+import de.frajul.particlelab.entities.particles.attributes.attributeValues.ParticleAttributeValueType;
+
 /**
  * Created by Julian on 02.08.2016.
  */

particlelab/src/main/java/de/frajul/particlelab/entities/particles/attributes/attributeValues/TimelineRange.java

@@ -1,8 +1,5 @@
 package de.frajul.particlelab.entities.particles.attributes.attributeValues;
 
-import de.frajul.particlelab.entities.particles.attributes.attributeValues.Range;
-import de.frajul.particlelab.entities.particles.attributes.attributeValues.Timeline;
-
 /**
  * Created by Julian on 02.08.2016.
  */

particlelab/src/main/java/de/frajul/particlelab/entities/particles/attributes/attributeValues/TintTimeline.java

@@ -1,11 +1,11 @@
 package de.frajul.particlelab.entities.particles.attributes.attributeValues;
 
-import de.frajul.particlelab.data.Color;
-import de.frajul.particlelab.main.GameLog;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import de.frajul.particlelab.data.Color;
+import de.frajul.particlelab.main.GameLog;
+
 /**
  * Created by Julian on 02.08.2016.
  */

particlelab/src/main/java/de/frajul/particlelab/entities/textures/TextureLoader.java

@@ -6,10 +6,10 @@ import android.graphics.BitmapFactory;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
 
-import de.frajul.particlelab.main.GameLog;
-
 import java.io.InputStream;
 
+import de.frajul.particlelab.main.GameLog;
+
 /**
  * Created by Julian on 26.11.2015.
  */

particlelab/src/main/java/de/frajul/particlelab/main/MainActivity.java

@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.view.Window;
 import android.view.WindowManager;
 
-import de.frajul.particlelab.entities.particles.ParticleReader;
 import de.frajul.particlelab.entities.particles.ParticleSystem;
 import de.frajul.particlelab.rendering.GameRenderer;
 import de.frajul.particlelab.rendering.Rendering;

particlelab/src/main/java/de/frajul/particlelab/main/Scene.java

@@ -2,6 +2,9 @@ package de.frajul.particlelab.main;
 
 import android.content.Context;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
 import de.frajul.particlelab.data.Vector;
 import de.frajul.particlelab.entities.Entity;
 import de.frajul.particlelab.entities.particles.ParticleSource;
@@ -9,9 +12,6 @@ import de.frajul.particlelab.entities.particles.ParticleSystem;
 import de.frajul.particlelab.entities.textures.TexturePack;
 import de.frajul.particlelab.rendering.Timer;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-
 /**
  * Created by Julian on 20.07.2016.
  */

particlelab/src/main/java/de/frajul/particlelab/rendering/GameRenderer.java

@@ -4,6 +4,9 @@ import android.content.Context;
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
 
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
 import de.frajul.particlelab.data.Color;
 import de.frajul.particlelab.entities.Entity;
 import de.frajul.particlelab.entities.particles.ParticleEffect;
@@ -13,9 +16,6 @@ import de.frajul.particlelab.entities.textures.TexturePack;
 import de.frajul.particlelab.main.GameLog;
 import de.frajul.particlelab.main.Scene;
 
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
 /**
  * Created by Julian on 22.11.2015.
  */

particlelab/src/main/java/de/frajul/particlelab/rendering/MatrixCreator.java

@@ -2,8 +2,8 @@ package de.frajul.particlelab.rendering;
 
 import android.opengl.Matrix;
 
-import de.frajul.particlelab.entities.Entity;
 import de.frajul.particlelab.data.Vector;
+import de.frajul.particlelab.entities.Entity;
 
 /**
  * Created by Julian on 23.11.2015.

particlelab/src/main/java/de/frajul/particlelab/rendering/Rendering.java

@@ -1,10 +1,10 @@
 package de.frajul.particlelab.rendering;
 
+import de.frajul.particlelab.data.Vector;
 import de.frajul.particlelab.entities.particles.ParticleSystem;
 import de.frajul.particlelab.entities.textures.TexturePack;
 import de.frajul.particlelab.main.MainActivity;
 import de.frajul.particlelab.main.Scene;
-import de.frajul.particlelab.data.Vector;
 
 /**
  * Created by Julian on 26.11.2015.

particlelab/src/main/java/de/frajul/particlelab/rendering/ShaderProgram.java

@@ -3,15 +3,15 @@ package de.frajul.particlelab.rendering;
 import android.content.Context;
 import android.opengl.GLES20;
 
-import de.frajul.particlelab.entities.Entity;
-import de.frajul.particlelab.data.Color;
-import de.frajul.particlelab.entities.textures.Texture;
-import de.frajul.particlelab.main.GameLog;
-
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import de.frajul.particlelab.data.Color;
+import de.frajul.particlelab.entities.Entity;
+import de.frajul.particlelab.entities.textures.Texture;
+import de.frajul.particlelab.main.GameLog;
+
 /**
  * Created by Julian on 23.11.2015.
  */

particlelab/src/main/res/drawable/custom_button.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:context=".main.GameActivity">
-    <item android:state_pressed="true" android:state_enabled="true">
-        <shape>
-            <corners android:radius="20dp" />
-            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
-            <stroke android:width="1dp" android:color="#992f2f" />
-
-            <solid android:color="#ef4444" />
-        </shape>
-    </item>
-    <item android:state_pressed="false" android:state_enabled="true">
-        <shape>
-            <corners android:radius="20dp" />
-            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
-            <stroke android:width="1dp" android:color="#992f2f" />
-
-            <gradient android:angle="270" android:endColor="#992f2f" android:startColor="#ef4444" />
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape>
-            <corners android:radius="20dp" />
-            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
-            <stroke android:width="1dp" android:color="#992f2f" />
-
-            <gradient android:angle="270" android:endColor="#a15d5d" android:startColor="#b73d3d" />
-        </shape>
-    </item>
-</selector>

particlelab/src/main/res/drawable/levelbutton_background.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="47dp" />
-    <gradient
-        android:centerColor="#669dd4"
-        android:centerX="50%"
-        android:centerY="50%"
-        android:endColor="#F7F9FF"
-        android:gradientRadius="300"
-        android:startColor="#a07bbc"
-        android:type="radial" />
-    <padding
-        android:bottom="0dp"
-        android:left="0dp"
-        android:right="0dp"
-        android:top="20dp" />
-    <size
-        android:width="200dp"
-        android:height="150dp" />
-    <stroke
-        android:width="10dp"
-        android:color="#b11a1a" />
-</shape>

particlelab/src/main/res/drawable/sound_toggle.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-        android:drawable="@drawable/sound_off" />
-
-    <item android:state_checked="true"
-        android:drawable="@drawable/sound_on" />
-
-</selector>

particlelab/src/main/res/drawable/tool_slot_background.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="3dp" />
-    <solid
-        android:color="#715f5f"/>
-    <padding
-        android:bottom="2dp"
-        android:left="2dp"
-        android:right="2dp"
-        android:top="2dp" />
-    <stroke
-        android:width="2dp"
-        android:color="#635e5e" />
-</shape>

particlelab/src/main/res/drawable/toolprogressbarlayers.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <shape android:shape="rectangle">
-            <solid android:color="#00fff700" />
-            <corners android:radius="200dp" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/progress">
-        <clip android:gravity="right">
-            <shape android:shape="rectangle">
-                <gradient
-                    android:angle="45"
-                    android:endColor="#a06c6c6c"
-                    android:startColor="#a0ababab" />
-                <corners android:radius="200dp" />
-            </shape>
-        </clip>
-    </item>
-</layer-list>

particlelab/src/main/res/drawable/unlock_message_background.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="30dp" />
-    <gradient
-        android:centerX="50%"
-        android:centerY="50%"
-        android:endColor="#82f7f9ff"
-        android:startColor="#820077ff"
-        android:angle="45"
-        android:type="linear" />
-    <padding
-        android:bottom="5dp"
-        android:left="10dp"
-        android:right="15dp"
-        android:top="5dp" />
-    <stroke
-        android:width="2dp"
-        android:color="#7826adbc" />
-</shape>

particlelab/src/main/res/drawable/worldbutton_background.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <gradient
-        android:centerX="0%"
-        android:centerY="0%"
-        android:endColor="#ff71a5"
-        android:startColor="#d7fd00"
-        android:angle="315"
-        android:type="linear" />
-    <padding
-        android:bottom="10dp"
-        android:left="0dp"
-        android:right="0dp"
-        android:top="10dp" />
-    <stroke
-        android:width="4dp"
-        android:color="#74ff71d0" />
-</shape>

particlelab/src/test/java/com/example/particlelab/ExampleUnitTest.java

@@ -2,7 +2,7 @@ package com.example.particlelab;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * To work on unit tests, switch the Test Artifact in the Build Variants view.