Skip to content

Commit bbd6272

Browse files
agrawalsuneetagrawalsuneet
authored
Merge pull request #9 from agrawalsuneet/dev
Merge Dev to master for 0.4 release
2 parents d6adcb3 + f21e795 commit bbd6272

File tree

16 files changed

+439
-95
lines changed

16 files changed

+439
-95
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ captures/
4040
.idea/dictionaries
4141
.idea/libraries
4242
.idea/cache
43+
.idea/caches/build_file_checksums.ser
44+
.idea/codeStyles/
4345

4446
# Keystore files
4547
*.jks

‎.idea/caches/build_file_checksums.ser‎

-595 Bytes
Binary file not shown.

‎README.md‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# SquareLoadersPack-Android
2-
> Android SquareLoadersPack [![BuddyBuild](https://dashboard.buddybuild.com/api/statusImage?appID=5a4e8d2fc4d3e1000114ff6d&branch=master&build=latest)](https://dashboard.buddybuild.com/apps/5a4e8d2fc4d3e1000114ff6d/build/latest?branch=master)
2+
> Android SquareLoadersPack
33
44
> A replacement of default android material progressbar with various Squares and Rectangles Loaders
55
6+
latest version : [ ![Download](https://api.bintray.com/packages/agrawalsuneet/androidlibs/squareloaderspack/images/download.svg) ](https://bintray.com/agrawalsuneet/androidlibs/squareloaderspack/_latestVersion)
7+
8+
9+
### SquareGridLoader
10+
![squaregridloader](https://user-images.githubusercontent.com/12999622/44960467-15765880-aef8-11e8-80fb-5a834ca5c628.gif)
11+
612

713
### ZipZapLoader
814
![zipzaploader](https://user-images.githubusercontent.com/12999622/36222631-d8228584-11b9-11e8-8478-d1442891419c.gif)
@@ -25,9 +31,56 @@ Check all other loaders [here](https://agrawalsuneet.github.io/agrawalsuneet/ope
2531
## How To use
2632
include below dependency in build.gradle of application and compile it
2733
```
28-
compile 'com.agrawalsuneet.androidlibs:squareloaderspack:0.3'
34+
implementation 'com.agrawalsuneet.androidlibs:squareloaderspack:0.4'
2935
```
3036

37+
### SquareGridLoader
38+
##### Through XML
39+
```
40+
<com.agrawalsuneet.squareloaderspack.loaders.SquareGridLoader
41+
android:layout_width="wrap_content"
42+
android:layout_height="wrap_content"
43+
app:squaregrid_animDelay="80"
44+
app:squaregrid_animDuration="400"
45+
app:squaregrid_interpolator="@android:interpolator/linear"
46+
app:squaregrid_sqaureColor="@color/blue"
47+
app:squaregrid_squareCount="5"
48+
app:squaregrid_squareLength="24dp" />
49+
```
50+
##### Through Code
51+
* Kotlin
52+
```
53+
val squareGridLoader = SquareGridLoader(
54+
this,
55+
3,
56+
100,
57+
ContextCompat.getColor(this, R.color.red))
58+
.apply {
59+
animDuration = 500
60+
animDelay = 100
61+
interpolator = LinearInterpolator()
62+
}
63+
64+
container.addView(squareGridLoader)
65+
```
66+
67+
* Java
68+
```
69+
SquareGridLoader squareGridLoader = new SquareGridLoader(
70+
this,
71+
3,
72+
100,
73+
ContextCompat.getColor(this, R.color.red));
74+
75+
squareGridLoader.setAnimDuration(500);
76+
squareGridLoader.setAnimDelay(100);
77+
squareGridLoader.setInterpolator(new LinearInterpolator());
78+
79+
80+
container.addView(squareGridLoader);
81+
```
82+
83+
3184
### ZipZapLoader
3285
##### Through XML
3386
```

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ repositories {
1111
}
1212

1313
android {
14-
compileSdkVersion 26
14+
compileSdkVersion 28
1515
defaultConfig {
1616
applicationId "com.agrawalsuneet.squareloaders"
1717
minSdkVersion 16
18-
targetSdkVersion 26
18+
targetSdkVersion 28
1919
versionCode 1
2020
versionName "1.0"
2121
}
@@ -35,8 +35,8 @@ android {
3535
dependencies {
3636
implementation fileTree(include: ['*.jar'], dir: 'libs')
3737
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
38-
implementation 'com.android.support:appcompat-v7:26.1.0'
38+
implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
3939
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
4040
implementation project(':squareloaderspack')
41-
//compile 'com.agrawalsuneet.androidlibs:squareloaderspack:0.1'
41+
//implementation 'com.agrawalsuneet.androidlibs:squareloaderspack:0.3'
4242
}

‎app/src/main/java/com/agrawalsuneet/squareloaders/MainActivity.kt‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ package com.agrawalsuneet.squareloaders
33
import android.os.Bundle
44
import android.support.v4.content.ContextCompat
55
import android.support.v7.app.AppCompatActivity
6+
import android.view.animation.BounceInterpolator
67
import android.view.animation.LinearInterpolator
78
import android.widget.Button
89
import android.widget.LinearLayout
9-
import com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
10-
import com.agrawalsuneet.squareloaderspack.loaders.RotatingSquareLoader
11-
import com.agrawalsuneet.squareloaderspack.loaders.WaveLoader
12-
import com.agrawalsuneet.squareloaderspack.loaders.ZipZapLoader
10+
import com.agrawalsuneet.squareloaderspack.loaders.*
1311

1412
class MainActivity : AppCompatActivity() {
1513

@@ -22,9 +20,10 @@ class MainActivity : AppCompatActivity() {
2220

2321
override fun onCreate(savedInstanceState: Bundle?) {
2422
super.onCreate(savedInstanceState)
25-
setContentView(R.layout.activity_main)
2623

27-
supportActionBar?.title = "RotatingSquareLoader"
24+
setContentView(R.layout.activity_main_squaregrid)
25+
26+
supportActionBar?.title = "SquareGridLoader"
2827

2928
container = findViewById(R.id.container)
3029

@@ -36,6 +35,23 @@ class MainActivity : AppCompatActivity() {
3635

3736
//initZipZapLoader()
3837
//initControls();
38+
39+
//initSquareGridLoader()
40+
}
41+
42+
private fun initSquareGridLoader(){
43+
val squareGridLoader = SquareGridLoader(
44+
this,
45+
3,
46+
100,
47+
ContextCompat.getColor(this, R.color.red))
48+
.apply {
49+
animDuration = 500
50+
animDelay = 100
51+
interpolator = LinearInterpolator()
52+
}
53+
54+
container.addView(squareGridLoader)
3955
}
4056

4157
private fun initRotatingSquareLoader() {

‎app/src/main/java/com/agrawalsuneet/squareloaders/MainActivityJava.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader;
1111
import com.agrawalsuneet.squareloaderspack.loaders.RotatingSquareLoader;
12+
import com.agrawalsuneet.squareloaderspack.loaders.SquareGridLoader;
1213
import com.agrawalsuneet.squareloaderspack.loaders.WaveLoader;
1314
import com.agrawalsuneet.squareloaderspack.loaders.ZipZapLoader;
1415

@@ -24,7 +25,7 @@ public class MainActivityJava extends AppCompatActivity {
2425
protected void onCreate(@Nullable Bundle savedInstanceState) {
2526
super.onCreate(savedInstanceState);
2627

27-
setContentView(R.layout.activity_main);
28+
setContentView(R.layout.activity_main_zipzap);
2829

2930
ZipZapLoader zipZapLoader = new ZipZapLoader(this, 40,
3031
ContextCompat.getColor(this, R.color.red),
@@ -66,5 +67,18 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
6667
rotatingSquareLoader.setAnimDuration(5000);
6768

6869
container.addView(rotatingSquareLoader);
70+
71+
SquareGridLoader squareGridLoader = new SquareGridLoader(
72+
this,
73+
3,
74+
100,
75+
ContextCompat.getColor(this, R.color.red));
76+
77+
squareGridLoader.setAnimDuration(500);
78+
squareGridLoader.setAnimDelay(100);
79+
squareGridLoader.setInterpolator(new LinearInterpolator());
80+
81+
82+
container.addView(squareGridLoader);
6983
}
7084
}

‎app/src/main/res/layout/activity_main_music_loader.xml‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -7,88 +7,88 @@
77
android:gravity="center"
88
android:orientation="vertical">
99

10-
<LinearLayout
11-
android:layout_width="match_parent"
12-
android:layout_height="wrap_content"
13-
android:layout_margin="16dp"
14-
android:gravity="center"
15-
android:orientation="horizontal">
10+
<LinearLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="wrap_content"
13+
android:layout_margin="16dp"
14+
android:gravity="center"
15+
android:orientation="horizontal">
1616

1717

18-
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
19-
android:layout_width="match_parent"
20-
android:layout_height="match_parent"
21-
app:musicplayer_animDuration="500"
22-
app:musicplayer_delayDuration="200"
23-
app:musicplayer_interpolator="@android:anim/linear_interpolator"
24-
app:musicplayer_isSingleColor="true"
25-
app:musicplayer_noOfDots="5"
26-
app:musicplayer_rectColor="@color/red"
27-
app:musicplayer_rectDistance="2dp"
28-
app:musicplayer_rectHeight="30dp"
29-
app:musicplayer_rectWidth="8dp" />
18+
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
19+
android:layout_width="match_parent"
20+
android:layout_height="match_parent"
21+
app:musicplayer_animDuration="500"
22+
app:musicplayer_delayDuration="200"
23+
app:musicplayer_interpolator="@android:anim/linear_interpolator"
24+
app:musicplayer_isSingleColor="true"
25+
app:musicplayer_noOfDots="5"
26+
app:musicplayer_rectColor="@color/red"
27+
app:musicplayer_rectDistance="2dp"
28+
app:musicplayer_rectHeight="30dp"
29+
app:musicplayer_rectWidth="8dp" />
3030

31-
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
32-
android:layout_width="match_parent"
33-
android:layout_height="match_parent"
34-
android:layout_marginLeft="16dp"
35-
app:musicplayer_animDuration="500"
36-
app:musicplayer_delayDuration="200"
37-
app:musicplayer_interpolator="@android:anim/linear_interpolator"
38-
app:musicplayer_isSingleColor="true"
39-
app:musicplayer_noOfDots="5"
40-
app:musicplayer_rectColor="@color/amber"
41-
app:musicplayer_rectDistance="2dp"
42-
app:musicplayer_rectHeight="30dp"
43-
app:musicplayer_rectWidth="8dp" />
31+
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
32+
android:layout_width="match_parent"
33+
android:layout_height="match_parent"
34+
android:layout_marginLeft="16dp"
35+
app:musicplayer_animDuration="500"
36+
app:musicplayer_delayDuration="200"
37+
app:musicplayer_interpolator="@android:anim/linear_interpolator"
38+
app:musicplayer_isSingleColor="true"
39+
app:musicplayer_noOfDots="5"
40+
app:musicplayer_rectColor="@color/amber"
41+
app:musicplayer_rectDistance="2dp"
42+
app:musicplayer_rectHeight="30dp"
43+
app:musicplayer_rectWidth="8dp" />
4444

45-
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
46-
android:layout_width="match_parent"
47-
android:layout_height="match_parent"
48-
android:layout_marginLeft="16dp"
49-
app:musicplayer_animDuration="500"
50-
app:musicplayer_delayDuration="200"
51-
app:musicplayer_interpolator="@android:anim/linear_interpolator"
52-
app:musicplayer_isSingleColor="true"
53-
app:musicplayer_noOfDots="5"
54-
app:musicplayer_rectColor="@color/green"
55-
app:musicplayer_rectDistance="2dp"
56-
app:musicplayer_rectHeight="30dp"
57-
app:musicplayer_rectWidth="8dp" />
45+
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
46+
android:layout_width="match_parent"
47+
android:layout_height="match_parent"
48+
android:layout_marginLeft="16dp"
49+
app:musicplayer_animDuration="500"
50+
app:musicplayer_delayDuration="200"
51+
app:musicplayer_interpolator="@android:anim/linear_interpolator"
52+
app:musicplayer_isSingleColor="true"
53+
app:musicplayer_noOfDots="5"
54+
app:musicplayer_rectColor="@color/green"
55+
app:musicplayer_rectDistance="2dp"
56+
app:musicplayer_rectHeight="30dp"
57+
app:musicplayer_rectWidth="8dp" />
5858

59-
</LinearLayout>
59+
</LinearLayout>
6060

6161

62-
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
63-
android:layout_width="match_parent"
64-
android:layout_height="match_parent"
65-
android:layout_margin="16dp"
66-
android:layout_marginLeft="16dp"
67-
app:musicplayer_animDuration="500"
68-
app:musicplayer_delayDuration="200"
69-
app:musicplayer_interpolator="@android:anim/linear_interpolator"
70-
app:musicplayer_isSingleColor="true"
71-
app:musicplayer_noOfDots="8"
72-
app:musicplayer_rectColor="@color/blue"
73-
app:musicplayer_rectDistance="2dp"
74-
app:musicplayer_rectHeight="80dp"
75-
app:musicplayer_rectWidth="16dp" />
62+
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
63+
android:layout_width="match_parent"
64+
android:layout_height="match_parent"
65+
android:layout_margin="16dp"
66+
android:layout_marginLeft="16dp"
67+
app:musicplayer_animDuration="500"
68+
app:musicplayer_delayDuration="200"
69+
app:musicplayer_interpolator="@android:anim/linear_interpolator"
70+
app:musicplayer_isSingleColor="true"
71+
app:musicplayer_noOfDots="8"
72+
app:musicplayer_rectColor="@color/blue"
73+
app:musicplayer_rectDistance="2dp"
74+
app:musicplayer_rectHeight="80dp"
75+
app:musicplayer_rectWidth="16dp" />
7676

7777

78-
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
79-
android:layout_width="match_parent"
80-
android:layout_height="match_parent"
81-
android:layout_margin="16dp"
82-
android:layout_marginLeft="16dp"
83-
app:musicplayer_animDuration="500"
84-
app:musicplayer_delayDuration="200"
85-
app:musicplayer_interpolator="@android:anim/linear_interpolator"
86-
app:musicplayer_isSingleColor="false"
87-
app:musicplayer_noOfDots="4"
88-
app:musicplayer_rectColor="@color/blue"
89-
app:musicplayer_rectColorsArray="@array/waveloader_colorsarray"
90-
app:musicplayer_rectDistance="2dp"
91-
app:musicplayer_rectHeight="60dp"
92-
app:musicplayer_rectWidth="12dp" />
78+
<com.agrawalsuneet.squareloaderspack.loaders.MusicPlayerLoader
79+
android:layout_width="match_parent"
80+
android:layout_height="match_parent"
81+
android:layout_margin="16dp"
82+
android:layout_marginLeft="16dp"
83+
app:musicplayer_animDuration="500"
84+
app:musicplayer_delayDuration="200"
85+
app:musicplayer_interpolator="@android:anim/linear_interpolator"
86+
app:musicplayer_isSingleColor="false"
87+
app:musicplayer_noOfDots="4"
88+
app:musicplayer_rectColor="@color/blue"
89+
app:musicplayer_rectColorsArray="@array/waveloader_colorsarray"
90+
app:musicplayer_rectDistance="2dp"
91+
app:musicplayer_rectHeight="60dp"
92+
app:musicplayer_rectWidth="12dp" />
9393

9494
</LinearLayout>

0 commit comments

Comments
 (0)