diff --git a/build.gradle b/build.gradle
index 6ba2d54..7872557 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,6 +41,7 @@ buildscript {
rxandroidVersion = '2.0.1'
rxjavaVersion = '2.1.6'
adapterrxjava2Version = '2.3.0'
+ lottieVersion = '3.4.1'
groupName = 'com.getbubblenow.android'
}
diff --git a/ui/build.gradle b/ui/build.gradle
index f16cae4..0d907ef 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -94,6 +94,7 @@ dependencies {
implementation "io.reactivex.rxjava2:rxandroid:$rxandroidVersion"
implementation "io.reactivex.rxjava2:rxjava:$rxjavaVersion"
implementation "com.squareup.retrofit2:adapter-rxjava2:$adapterrxjava2Version"
+ implementation "com.airbnb.android:lottie:$lottieVersion"
}
tasks.withType(JavaCompile) {
diff --git a/ui/src/main/java/com/getbubblenow/android/fragment/LoadingDialogFragment.java b/ui/src/main/java/com/getbubblenow/android/fragment/LoadingDialogFragment.java
index 734448b..508241b 100644
--- a/ui/src/main/java/com/getbubblenow/android/fragment/LoadingDialogFragment.java
+++ b/ui/src/main/java/com/getbubblenow/android/fragment/LoadingDialogFragment.java
@@ -1,12 +1,16 @@
package com.getbubblenow.android.fragment;
import android.app.Dialog;
+import android.graphics.Color;
import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
+
+import com.airbnb.lottie.LottieAnimationView;
import com.getbubblenow.android.R;
import com.getbubblenow.android.activity.BaseActivityBubble;
import com.getbubblenow.android.activity.LoginActivity;
@@ -17,9 +21,6 @@ import androidx.fragment.app.DialogFragment;
public class LoadingDialogFragment extends DialogFragment {
-
- private ProgressBar progressBar;
-
public static LoadingDialogFragment newInstance() {
LoadingDialogFragment fragment = new LoadingDialogFragment();
Bundle args = new Bundle();
@@ -39,6 +40,7 @@ public class LoadingDialogFragment extends DialogFragment {
super.onBackPressed();
}
};
+ dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
return dialog;
}
@@ -51,7 +53,5 @@ public class LoadingDialogFragment extends DialogFragment {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- progressBar = view.findViewById(R.id.progress);
- progressBar.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(getContext(), R.color.colorPrimaryDark), PorterDuff.Mode.SRC_IN);
}
}
diff --git a/ui/src/main/res/layout/fragment_loading_dialog.xml b/ui/src/main/res/layout/fragment_loading_dialog.xml
index c088797..ee89e3c 100644
--- a/ui/src/main/res/layout/fragment_loading_dialog.xml
+++ b/ui/src/main/res/layout/fragment_loading_dialog.xml
@@ -4,25 +4,21 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:gravity="center_vertical"
android:background="@android:color/transparent">
-
-
-
-
+
\ No newline at end of file
diff --git a/ui/src/main/res/raw/loading.json b/ui/src/main/res/raw/loading.json
new file mode 100644
index 0000000..c46de22
--- /dev/null
+++ b/ui/src/main/res/raw/loading.json
@@ -0,0 +1 @@
+{"v":"4.10.1","fr":10,"ip":0,"op":300,"w":800,"h":800,"nm":"profile around","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":60,"s":[0],"e":[-245]},{"t":299.00001217852}],"ix":10},"p":{"a":0,"k":[400,400,0],"ix":2},"a":{"a":0,"k":[-22,-10,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[668,668],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"gs","o":{"a":0,"k":100,"ix":9},"w":{"a":0,"k":24,"ix":10},"g":{"p":9,"k":{"a":0,"k":[0,0.9019607843137255,0.19215686274509805,0.592156862745098,0.111,0.9019607843137255,0.19215686274509805,0.592156862745098,0.25,1,0.5411764705882353,0,0.375,1,0.5411764705882353,0,0.5,0.8,0.06666666666666667,0.8274509803921568,0.621,0.8,0.06666666666666667,0.8274509803921568,0.75,0.8,0.06666666666666667,0.8274509803921568,0.875,0.4,0.09803921568627451,0.7333333333333333,1,0.4,0.09803921568627451,0.7333333333333333],"ix":8}},"s":{"a":0,"k":[-388,12],"ix":4},"e":{"a":0,"k":[384,8],"ix":5},"t":1,"lc":2,"lj":1,"ml":4,"d":[{"n":"d","nm":"dash","v":{"a":0,"k":50,"ix":1}},{"n":"o","nm":"offset","v":{"a":0,"k":0,"ix":7}}],"nm":"Gradient Stroke 1","mn":"ADBE Vector Graphic - G-Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-22,-10],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":40,"s":[0],"e":[0]},{"t":60.0000024438501}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":40,"s":[0],"e":[100]},{"t":60.0000024438501}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-250]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[-250],"e":[-500]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":40,"s":[-500],"e":[-1071]},{"t":60.0000024438501}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":308.000012545097,"st":0,"bm":0}]}
\ No newline at end of file