Merge pull request #26 from agrawalsuneet/dev

Merge dev to Master for 1.2 release
agrawalsuneet · Dec 30, 2018 · ccda9da · ccda9da
2 parents 849ce92 + 82a5a0b
commit ccda9da
Show file tree

Hide file tree

Showing 37 changed files with 592 additions and 408 deletions.
diff --git a/README.md b/README.md
@@ -9,47 +9,41 @@ latest version : [ ![Download](https://api.bintray.com/packages/agrawalsuneet/an
 
 
 
-### LazyLoader
 ![lazyloader](https://user-images.githubusercontent.com/12999622/36225792-b7044432-11c3-11e8-8e22-5bbdcafa2312.gif)
 
 
-### TashieLoader
 ![tashieloader](https://user-images.githubusercontent.com/12999622/36225793-b71f694c-11c3-11e8-9a81-8414bafb26c5.gif)
 
 
-### SlidingLoader
 ![slidingloader](https://user-images.githubusercontent.com/12999622/34130222-f58ba220-e43e-11e7-8f60-4971918fecde.gif)
 
 
-### RotatingCircularDotsLoader
 ![RotatingCircularDotsLoader](https://user-images.githubusercontent.com/12999622/34453427-d9aa8294-ed4c-11e7-8b1d-fe98d0c2c3dc.gif)
 
 
-### TrailingCircularDotsLoader
 ![trailingcirculardotsloader](https://user-images.githubusercontent.com/12999622/39367184-f3bb706a-4a2d-11e8-9120-5027bbef2861.gif)
 
 
-### ZeeLoader
 ![zeeloader](https://user-images.githubusercontent.com/12999622/44630261-8ba41980-a952-11e8-9ba5-45f4cafb473b.gif)
 
 
-### AllianceLoader
 ![allianceloader](https://user-images.githubusercontent.com/12999622/44946787-d1e9f480-adfa-11e8-82ff-23e5f19a656b.gif)
 
 
-### LinearDotsLoader
+![lightsloader](https://user-images.githubusercontent.com/12999622/50548389-bb9d5980-0c71-11e9-8803-f25d1175ced0.gif)
+
+
 ![lineardotsloader](https://user-images.githubusercontent.com/12999622/35482391-54665328-042c-11e8-954b-93a92ebe2b0c.gif)
 
 
-### CircularDotsLoader
 ![circulardotsloader](https://user-images.githubusercontent.com/12999622/36224573-f274b956-11bf-11e8-8f97-e4c031959465.gif)
 
 Check all other loaders [here](https://agrawalsuneet.github.io/agrawalsuneet/opensourcecontribution/)
 
 ## How To use
 include below dependency in build.gradle of application and compile it
 ```
-compile 'com.agrawalsuneet.androidlibs:dotsloader:1.1'
+implementation 'com.agrawalsuneet.androidlibs:dotsloader:1.2'
 ```
 
 
@@ -122,14 +116,13 @@ compile 'com.agrawalsuneet.androidlibs:dotsloader:1.1'
 
 * Kotlin
 ```
-var tashie = TashieLoader(this)
+var tashie = TashieLoader(
+                this, 5,
+                30, 10,
+                ContextCompat.getColor(this, R.color.green))
                 .apply {
-                    noOfDots = 5
-                    dotsDist = 10
-                    dotsRadius = 30
                     animDuration = 500
                     animDelay = 100
-                    dotsColor = resources.getColor(R.color.green)
                     interpolator = LinearInterpolator()
                 }
         containerLL.addView(tashie)
@@ -138,15 +131,15 @@ var tashie = TashieLoader(this)
 
 * Java
 ```
-TashieLoader tashie = new TashieLoader(this);
-        tashie.setNoOfDots(8);
-        tashie.setDotsRadius(20);
-        tashie.setDotsDist(10);
-        tashie.setDotsColor(ContextCompat.getColor(this, R.color.blue_selected));
+TashieLoader tashie = new TashieLoader(
+                this, 5,
+                30, 10,
+                ContextCompat.getColor(this, R.color.green));
+
         tashie.setAnimDuration(500);
         tashie.setAnimDelay(100);
         tashie.setInterpolator(new LinearInterpolator());
-        
+
         containerLL.addView(tashie);
 ```
 
@@ -375,6 +368,44 @@ AllianceLoader allianceLoader = new AllianceLoader(
         containerLL.addView(allianceLoader);
 ```
 
+### LightsLoader
+##### Through XML
+```
+<com.agrawalsuneet.dotsloader.loaders.LightsLoader
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        app:lights_circleColor="@color/blue_selected"
+        app:lights_circleDistance="4dp"
+        app:lights_circleRadius="12dp"
+        app:lights_noOfCircles="5" />
+```
+
+#####  Through Code
+
+* Kotlin
+```
+val lightsLoader = LightsLoader(
+                this, 5,
+                30, 10,
+                ContextCompat.getColor(this, R.color.red))
+
+
+        containerLL.addView(lightsLoader)
+
+```
+
+* Java
+```
+LightsLoader lightsLoader = new LightsLoader(
+                this, 5,
+                30, 10,
+                ContextCompat.getColor(this, R.color.red));
+
+
+        containerLL.addView(lightsLoader);
+```
+
 
 ### LinearDotsLoader
 ##### Through XML

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,21 +1,12 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-repositories {
-    mavenCentral()
-    maven {
-        url 'https://maven.google.com/'
-        name 'Google'
-    }
-}
-
 android {
-    compileSdkVersion 25
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.agrawalsuneet.loaders"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -29,9 +20,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile project(':dotsloader')
-    //compile 'com.agrawalsuneet.androidlibs:dotsloader:1.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation project(':dotsloader')
+    //implementation 'com.agrawalsuneet.androidlibs:dotsloader:1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt b/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt
@@ -14,9 +14,9 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main_alliance)
+        setContentView(R.layout.main_lights)
 
-        supportActionBar!!.title = "AllianceLoader"
+        supportActionBar?.title = "LightsLoader"
 
         containerLL = findViewById(R.id.container) as LinearLayout
 
@@ -32,6 +32,17 @@ class MainActivity : AppCompatActivity() {
         //initZeeLoader()
 
         //initAllianceLoader()
+        //initLightsLoader()
+    }
+
+    private fun initLightsLoader() {
+        val lightsLoader = LightsLoader(
+                this, 5,
+                30, 10,
+                ContextCompat.getColor(this, R.color.red))
+
+
+        containerLL.addView(lightsLoader)
     }
 
     private fun initAllianceLoader() {
@@ -104,14 +115,13 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun initTashieLoader() {
-        var tashie = TashieLoader(this)
+        var tashie = TashieLoader(
+                this, 5,
+                30, 10,
+                ContextCompat.getColor(this, R.color.green))
                 .apply {
-                    noOfDots = 5
-                    dotsDist = 10
-                    dotsRadius = 30
                     animDuration = 500
                     animDelay = 100
-                    dotsColor = resources.getColor(R.color.green)
                     interpolator = LinearInterpolator()
                 }
         containerLL.addView(tashie)

diff --git a/app/src/main/java/com/agrawalsuneet/loaders/MainActivityJava.java b/app/src/main/java/com/agrawalsuneet/loaders/MainActivityJava.java
@@ -8,6 +8,7 @@
 import android.widget.LinearLayout;
 
 import com.agrawalsuneet.dotsloader.loaders.AllianceLoader;
+import com.agrawalsuneet.dotsloader.loaders.LightsLoader;
 import com.agrawalsuneet.dotsloader.loaders.RotatingCircularDotsLoader;
 import com.agrawalsuneet.dotsloader.loaders.SlidingLoader;
 import com.agrawalsuneet.dotsloader.loaders.TashieLoader;
@@ -35,11 +36,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         loader.setInterpolator(new LinearInterpolator());*/
 
 
-        TashieLoader tashie = new TashieLoader(this);
-        tashie.setNoOfDots(8);
-        tashie.setDotsRadius(20);
-        tashie.setDotsDist(10);
-        tashie.setDotsColor(ContextCompat.getColor(this, R.color.blue_selected));
+
+        TashieLoader tashie = new TashieLoader(
+                this, 5,
+                30, 10,
+                ContextCompat.getColor(this, R.color.green));
+
         tashie.setAnimDuration(500);
         tashie.setAnimDelay(100);
         tashie.setInterpolator(new LinearInterpolator());
@@ -103,6 +105,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         allianceLoader.setAnimDuration(500);
 
         containerLL.addView(allianceLoader);
+
+        LightsLoader lightsLoader = new LightsLoader(
+                this, 5,
+                30, 10,
+                ContextCompat.getColor(this, R.color.red));
+
+
+        containerLL.addView(lightsLoader);
     }
 
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
diff --git a/...ain/res/layout/activity_main_alliance.xml → app/src/main/res/layout/main_alliance.xml b/...ain/res/layout/activity_main_alliance.xml → app/src/main/res/layout/main_alliance.xml
diff --git a/...yout/activity_main_circulardotsloader.xml → ...in/res/layout/main_circulardotsloader.xml b/...yout/activity_main_circulardotsloader.xml → ...in/res/layout/main_circulardotsloader.xml
diff --git a/...n/res/layout/activity_main_lazyloader.xml → app/src/main/res/layout/main_lazyloader.xml b/...n/res/layout/activity_main_lazyloader.xml → app/src/main/res/layout/main_lazyloader.xml