diff --git a/base/src/main/java/com/hako/base/extensions/ViewExtensions.kt b/base/src/main/java/com/hako/base/extensions/ViewExtensions.kt index 5bd84f8..39105ff 100644 --- a/base/src/main/java/com/hako/base/extensions/ViewExtensions.kt +++ b/base/src/main/java/com/hako/base/extensions/ViewExtensions.kt @@ -5,6 +5,34 @@ import android.view.View import android.view.ViewGroup import androidx.annotation.LayoutRes +fun View.enable() { + isEnabled = true +} + +fun View.disable() { + isEnabled = false +} + +fun View.visible() { + visibility = View.VISIBLE +} + +fun View.invisible() { + visibility = View.INVISIBLE +} + +fun View.transparent() { + alpha = 0f +} + +fun View.opaque() { + alpha = 1f +} + +fun View.gone() { + visibility = View.GONE +} + fun ViewGroup.inflate(@LayoutRes layout: Int, attachToRoot: Boolean = false): View = LayoutInflater .from(context) diff --git a/base/src/main/java/com/hako/base/widgets/LoadingOverlay.kt b/base/src/main/java/com/hako/base/widgets/LoadingOverlay.kt new file mode 100644 index 0000000..8f021f6 --- /dev/null +++ b/base/src/main/java/com/hako/base/widgets/LoadingOverlay.kt @@ -0,0 +1,18 @@ +package com.hako.base.widgets + +import android.content.Context +import android.util.AttributeSet +import android.widget.FrameLayout +import com.hako.base.R +import com.hako.base.extensions.inflate + +class LoadingOverlay @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { + + init { + inflate(R.layout.loading_overlay, true) + } +} \ No newline at end of file diff --git a/base/src/main/java/com/hako/base/widgets/NetworkErrorOverlay.kt b/base/src/main/java/com/hako/base/widgets/NetworkErrorOverlay.kt new file mode 100644 index 0000000..01b6cc2 --- /dev/null +++ b/base/src/main/java/com/hako/base/widgets/NetworkErrorOverlay.kt @@ -0,0 +1,18 @@ +package com.hako.base.widgets + +import android.content.Context +import android.util.AttributeSet +import android.widget.FrameLayout +import com.hako.base.R +import com.hako.base.extensions.inflate + +class NetworkErrorOverlay @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { + + init { + inflate(R.layout.network_error_overlay, true) + } +} \ No newline at end of file diff --git a/base/src/main/res/layout/loading_overlay.xml b/base/src/main/res/layout/loading_overlay.xml new file mode 100644 index 0000000..b9d5a46 --- /dev/null +++ b/base/src/main/res/layout/loading_overlay.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/base/src/main/res/layout/network_error_overlay.xml b/base/src/main/res/layout/network_error_overlay.xml new file mode 100644 index 0000000..72ee319 --- /dev/null +++ b/base/src/main/res/layout/network_error_overlay.xml @@ -0,0 +1,33 @@ + + + + + + + + \ No newline at end of file diff --git a/base/src/main/res/raw/loading_animation.json b/base/src/main/res/raw/loading_animation.json new file mode 100644 index 0000000..ad2269b --- /dev/null +++ b/base/src/main/res/raw/loading_animation.json @@ -0,0 +1 @@ +{"v":"5.1.6","fr":30,"ip":0,"op":94,"w":300,"h":300,"nm":"Comp 2","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[81,59.26,0],"ix":2},"a":{"a":0,"k":[-30,-6.544,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.651,0.667,0.667],"y":[0.998,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p651_0p998_0p333_0","0p667_1_0p333_0","0p667_1_0p333_0"],"t":9,"s":[0,75.476,100],"e":[110,75.476,100]},{"i":{"x":[0.524,0.833,0.833],"y":[0.97,1,1]},"o":{"x":[0.379,0.167,0.167],"y":[0.013,0,0]},"n":["0p524_0p97_0p379_0p013","0p833_1_0p167_0","0p833_1_0p167_0"],"t":21,"s":[110,75.476,100],"e":[100,75.476,100]},{"t":29}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[85.26,14.271],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":2,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.792156862745098,0.792156862745098,0.792156862745098,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[12.63,-8.364],"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":"Rectangle 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":118,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[81,41.26,0],"ix":2},"a":{"a":0,"k":[-30,-6.544,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.651,0.667,0.667],"y":[0.997,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p651_0p997_0p333_0","0p667_1_0p333_0","0p667_1_0p333_0"],"t":3,"s":[0,75.476,100],"e":[90,75.476,100]},{"i":{"x":[0.524,0.833,0.833],"y":[0.94,1,1]},"o":{"x":[0.379,0.167,0.167],"y":[0.027,0,0]},"n":["0p524_0p94_0p379_0p027","0p833_1_0p167_0","0p833_1_0p167_0"],"t":15,"s":[90,75.476,100],"e":[85,75.476,100]},{"t":23}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[85.26,14.271],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":2,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8549019607843137,0.8549019607843137,0.8549019607843137,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[12.63,-8.364],"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":"Rectangle 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":166,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[48.961,49.211,0],"ix":2},"a":{"a":0,"k":[-66.789,-32.789,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.044,0.044,0.667],"y":[0.991,0.991,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p044_0p991_0p333_0","0p044_0p991_0p333_0","0p667_1_0p333_0"],"t":0,"s":[0,0,100],"e":[93,93,100]},{"t":12}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[38.422,38.422],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":4,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.7294117647058823,0.7294117647058823,0.7294117647058823,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-66.789,-32.789],"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":"Rectangle 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":166,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[150,175,0],"ix":2},"a":{"a":0,"k":[100,50,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":200,"h":100,"ip":62,"op":152,"st":62,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":62,"s":[100],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":76,"s":[60],"e":[60]},{"t":94}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.182,"y":1},"o":{"x":0.333,"y":0},"n":"0p182_1_0p333_0","t":62,"s":[150,175,0],"e":[150,123.5,0],"to":[0,-8.58333301544189,0],"ti":[0,8.58333301544189,0]},{"i":{"x":0.182,"y":0.182},"o":{"x":0.167,"y":0.167},"n":"0p182_0p182_0p167_0p167","t":76,"s":[150,123.5,0],"e":[150,123.5,0],"to":[0,0,0],"ti":[0,0,0]},{"t":94}],"ix":2},"a":{"a":0,"k":[100,50,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.069,0.069,0.667],"y":[0.995,0.995,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p069_0p995_0p333_0","0p069_0p995_0p333_0","0p667_1_0p333_0"],"t":62,"s":[100,100,100],"e":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p833_1_0p333_0","0p833_1_0p333_0","0p833_1_0p333_0"],"t":76,"s":[80,80,100],"e":[80,80,100]},{"t":94}],"ix":6}},"ao":0,"w":200,"h":100,"ip":30,"op":120,"st":30,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"Comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":30,"s":[100],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":44,"s":[60],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":62,"s":[60],"e":[0]},{"t":76}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.182,"y":1},"o":{"x":0.333,"y":0},"n":"0p182_1_0p333_0","t":30,"s":[150,175,0],"e":[150,123.5,0],"to":[0,-8.58333301544189,0],"ti":[0,8.58333301544189,0]},{"i":{"x":0.182,"y":0.182},"o":{"x":0.167,"y":0.167},"n":"0p182_0p182_0p167_0p167","t":44,"s":[150,123.5,0],"e":[150,123.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.182,"y":1},"o":{"x":0.167,"y":0},"n":"0p182_1_0p167_0","t":62,"s":[150,123.5,0],"e":[150,86.5,0],"to":[0,-6.16666650772095,0],"ti":[0,6.16666650772095,0]},{"t":76}],"ix":2},"a":{"a":0,"k":[100,50,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.069,0.069,0.667],"y":[0.995,0.995,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p069_0p995_0p333_0","0p069_0p995_0p333_0","0p667_1_0p333_0"],"t":30,"s":[100,100,100],"e":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p833_1_0p333_0","0p833_1_0p333_0","0p833_1_0p333_0"],"t":44,"s":[80,80,100],"e":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":62,"s":[80,80,100],"e":[50,50,100]},{"t":76}],"ix":6}},"ao":0,"w":200,"h":100,"ip":-2,"op":88,"st":-2,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"Comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":-1,"s":[100],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":13,"s":[60],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":31,"s":[60],"e":[0]},{"t":45}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.182,"y":1},"o":{"x":0.333,"y":0},"n":"0p182_1_0p333_0","t":-1,"s":[150,175,0],"e":[150,123.5,0],"to":[0,-8.58333301544189,0],"ti":[0,8.58333301544189,0]},{"i":{"x":0.182,"y":0.182},"o":{"x":0.167,"y":0.167},"n":"0p182_0p182_0p167_0p167","t":13,"s":[150,123.5,0],"e":[150,123.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.182,"y":1},"o":{"x":0.167,"y":0},"n":"0p182_1_0p167_0","t":31,"s":[150,123.5,0],"e":[150,86.5,0],"to":[0,-6.16666650772095,0],"ti":[0,6.16666650772095,0]},{"t":45}],"ix":2},"a":{"a":0,"k":[100,50,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.069,0.069,0.667],"y":[0.995,0.995,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p069_0p995_0p333_0","0p069_0p995_0p333_0","0p667_1_0p333_0"],"t":-1,"s":[100,100,100],"e":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p833_1_0p333_0","0p833_1_0p333_0","0p833_1_0p333_0"],"t":13,"s":[80,80,100],"e":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":31,"s":[80,80,100],"e":[50,50,100]},{"t":45}],"ix":6}},"ao":0,"w":200,"h":100,"ip":-33,"op":57,"st":-33,"bm":0},{"ddd":0,"ind":5,"ty":0,"nm":"Comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":-35,"s":[100],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":-21,"s":[60],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":-1,"s":[60],"e":[0]},{"t":13}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.182,"y":1},"o":{"x":0.333,"y":0},"n":"0p182_1_0p333_0","t":-35,"s":[150,175,0],"e":[150,123.5,0],"to":[0,-8.58333301544189,0],"ti":[0,8.58333301544189,0]},{"i":{"x":0.182,"y":0.182},"o":{"x":0.167,"y":0.167},"n":"0p182_0p182_0p167_0p167","t":-21,"s":[150,123.5,0],"e":[150,123.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.182,"y":1},"o":{"x":0.167,"y":0},"n":"0p182_1_0p167_0","t":-1,"s":[150,123.5,0],"e":[150,86.5,0],"to":[0,-6.16666650772095,0],"ti":[0,6.16666650772095,0]},{"t":13}],"ix":2},"a":{"a":0,"k":[100,50,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.069,0.069,0.667],"y":[0.995,0.995,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p069_0p995_0p333_0","0p069_0p995_0p333_0","0p667_1_0p333_0"],"t":-35,"s":[100,100,100],"e":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p833_1_0p333_0","0p833_1_0p333_0","0p833_1_0p333_0"],"t":-21,"s":[80,80,100],"e":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":-1,"s":[80,80,100],"e":[50,50,100]},{"t":13}],"ix":6}},"ao":0,"w":200,"h":100,"ip":-76,"op":14,"st":-76,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/base/src/main/res/raw/network_animation.json b/base/src/main/res/raw/network_animation.json new file mode 100644 index 0000000..2f268ac --- /dev/null +++ b/base/src/main/res/raw/network_animation.json @@ -0,0 +1 @@ +{"ip":0,"fr":60,"v":"5.1.20","assets":[{"id":"precomp_1","layers":[{"ty":4,"nm":"Fill-67-Copy","ip":0,"st":0,"ind":15,"hix":4,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[11.560674667358398,2.8008460998535156,0]},"p":{"s":true,"x":{"a":0,"k":136.78967466735838},"y":{"a":0,"k":59.93284609985351}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-67-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[46.7294343,62.2339406],[69.8507811,62.2339406],[69.8507811,56.6322499],[46.7294343,56.6322499]],"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.21568627450980393,0.2784313725490196,0.30980392156862746,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-171.958,-107.196]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-66-Copy","ip":0,"st":0,"ind":14,"hix":3,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[11.560674667358398,11.607135772705078,0]},"p":{"s":true,"x":{"a":0,"k":136.78967466735838},"y":{"a":0,"k":68.73913577270508}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-66-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[46.7294343,56.6322499],[69.8507811,56.6322499],[69.8507811,68.2393858],[58.2901077,79.8465217],[46.7294343,68.2393858]],"i":[[0,0],[0,0],[0,0],[6.384348499999994,0],[0,6.410007300000004]],"o":[[0,0],[0,0],[0,6.410007300000004],[-6.3851528,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.19607843137254902,0.25098039215686274,0.2784313725490196,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-171.958,-107.196]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Combined-Shape","ip":0,"st":0,"ind":12,"hix":2,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[8.197591781616211,3.335012435913086,0]},"p":{"s":true,"x":{"a":0,"k":136.8685917816162},"y":{"a":0,"k":53.899012435913086}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Combined-Shape shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[53.977576,56.7339961],[50.1709343,56.7339961],[50.1709343,51.9745374],[52.0746573,50.0639709],[53.977576,51.9745374]],"i":[[0,0],[0,0],[0,0],[-1.051189700000002,0],[0,-1.0546069000000031]],"o":[[0,0],[0,0],[0,-1.0546069000000031],[1.0503854000000032,0],[0,0]]}}},{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[66.5661151,56.7339961],[62.7602777,56.7339961],[62.7602777,51.9745374],[64.6631964,50.0639709],[66.5661151,51.9745374]],"i":[[0,0],[0,0],[0,0],[-1.051189700000002,0],[0,-1.0546069000000031]],"o":[[0,0],[0,0],[0,-1.0546069000000031],[1.050385300000002,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.796078431372549,0.8117647058823529,0.8196078431372549,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-175.4,-100.628]},"r":{"a":0,"k":0}}]}],"op":152}]},{"id":"precomp_2","layers":[{"ty":4,"nm":"Fill-72-Copy","ip":0,"st":0,"ind":18,"hix":7,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[11.560673713684082,2.801248550415039,0]},"p":{"s":true,"x":{"a":0,"k":136.79},"y":{"a":0,"k":38.024}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-72-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[5.86197757e-14,40.3253897],[23.1213468,40.3253897],[23.1213468,34.7228916],[5.86197757e-14,34.7228916]],"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.21568627450980393,0.2784313725490196,0.30980392156862746,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-125.229,-52.181]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-71-Copy","ip":0,"st":0,"ind":17,"hix":6,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[11.560673713684082,11.607135772705078,0]},"p":{"s":true,"x":{"a":0,"k":136.79},"y":{"a":0,"k":29.065}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-71-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[23.1213468,40.171963],[5.86197757e-14,40.171963],[5.86197757e-14,28.5648271],[11.5606734,16.9576912],[23.1213468,28.5648271]],"i":[[0,0],[0,0],[0,0],[-6.38515277,0],[0,-6.410814799999997]],"o":[[0,0],[0,0],[0,-6.410814799999997],[6.3843485,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.19607843137254902,0.25098039215686274,0.2784313725490196,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-125.229,-34.416]},"r":{"a":0,"k":0}}]}],"op":152}]}],"layers":[{"ty":0,"nm":"instance:precomp_2","refId":"precomp_2","ind":15,"ip":0,"st":0,"hix":5,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[11.560673713684082,11.683692161560058,0]},"p":{"s":true,"x":{"a":0,"k":70.198},"y":{"a":1,"k":[{"t":0,"s":[38.142],"e":[38.142],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":35,"s":[38.142],"e":[29.142],"i":{"x":[0.367],"y":[0.556]},"o":{"x":[0.4],"y":[2.5]}},{"t":50,"s":[29.142],"e":[28.987199999999998],"i":{"x":[0.565],"y":[1]},"o":{"x":[0.39],"y":[0.575]}},{"t":52,"s":[28.987199999999998],"e":[29.142],"i":{"x":[0.745],"y":[0.715]},"o":{"x":[0.47],"y":[0]}},{"t":56,"s":[29.142],"e":[29.1807],"i":{"x":[0.565],"y":[1]},"o":{"x":[0.39],"y":[0.575]}},{"t":58,"s":[29.1807],"e":[29.142],"i":{"x":[0.745],"y":[0.715]},"o":{"x":[0.47],"y":[0]}},{"t":65,"s":[29.142],"e":[29.142],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":127,"s":[29.142],"e":[37.142],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":135,"s":[37.142],"e":[38.142],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":152}]}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"w":23,"h":23,"op":152},{"ty":0,"nm":"instance:precomp_1","refId":"precomp_1","ind":14,"ip":0,"st":0,"hix":1,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[11.560674667358398,14.89113577270508,0]},"p":{"s":true,"x":{"a":0,"k":70.19767466735838},"y":{"a":1,"k":[{"t":0,"s":[57.455],"e":[57.455],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":35,"s":[57.455],"e":[65.31140939331054],"i":{"x":[0.367],"y":[0.556]},"o":{"x":[0.4],"y":[2.5]}},{"t":50,"s":[65.31140939331054],"e":[65.44653963487548],"i":{"x":[0.565],"y":[1]},"o":{"x":[0.39],"y":[0.575]}},{"t":52,"s":[65.44653963487548],"e":[65.31140939331054],"i":{"x":[0.745],"y":[0.715]},"o":{"x":[0.47],"y":[0]}},{"t":56,"s":[65.31140939331054],"e":[65.27762683291931],"i":{"x":[0.565],"y":[1]},"o":{"x":[0.39],"y":[0.575]}},{"t":58,"s":[65.27762683291931],"e":[65.31140939331054],"i":{"x":[0.745],"y":[0.715]},"o":{"x":[0.47],"y":[0]}},{"t":65,"s":[65.31140939331054],"e":[65.31140939331054],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":127,"s":[65.31140939331054],"e":[57.455],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":135}]}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"w":23,"h":30,"op":152},{"ty":4,"nm":"Fill-70-Copy","ip":0,"st":0,"ind":13,"hix":8,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[1.608553409576416,9.685667991638184,0]},"p":{"s":true,"x":{"a":0,"k":69.897},"y":{"a":0,"k":18.053}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,201.9]}},"shapes":[{"ty":"gr","nm":"Fill-70-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[9.65132051,19.3713359],[12.8684274,19.3713359],[12.8684274,-1.95399252e-13],[9.65132051,-1.95399252e-13]],"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.23921568627450981,0.30980392156862746,0.44313725490196076,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-9.651,0]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-65-Copy","ip":0,"st":0,"ind":12,"hix":9,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[1.6085529327392578,10.430999755859375,0]},"p":{"s":true,"x":{"a":0,"k":69.89655293273925},"y":{"a":0,"k":82.703}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,175.29999999999998]}},"shapes":[{"ty":"gr","nm":"Fill-65-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[56.3807548,98.4894844],[59.5978616,98.4894844],[59.5978616,77.6274867],[56.3807548,77.6274867]],"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.23921568627450981,0.30980392156862746,0.44313725490196076,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-56.381,-77.627]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-80-Copy","ip":0,"st":0,"ind":11,"hix":10,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[6.337699890136719,6.3631744384765625,0]},"p":{"s":true,"x":{"a":0,"k":99.034},"y":{"a":0,"k":86.913}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":1,"k":[{"t":0,"s":[0],"e":[183.34649444186343],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":152}]},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-80-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[90.3083635,86.412682],[93.4635411,83.2448238],[90.2818224,80.0495102],[87.1258406,83.218176],[83.970663,80.0495102],[80.7881401,83.2448238],[83.9441219,86.412682],[80.7881401,89.5813477],[83.970663,92.7758537],[87.1258406,89.6079955],[90.2818224,92.7758537],[93.4635411,89.5813477],[90.3083635,86.412682]],"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.7843137254901961,0.796078431372549,0.8156862745098039,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-80.788,-80.05]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-79-Copy","ip":0,"st":0,"ind":10,"hix":11,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[6.337700843811035,6.362766265869141,0]},"p":{"s":true,"x":{"a":0,"k":24.245999999999988},"y":{"a":0,"k":88.863}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":1,"k":[{"t":0,"s":[0],"e":[94.53803619658584],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":152}]},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-79-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[15.5202234,88.3631718],[18.6754009,85.194506],[15.4936823,82],[12.3377005,85.1678582],[9.18252294,82],[6,85.194506],[9.15598181,88.3631718],[6,91.5302225],[9.18252294,94.7247285],[12.3377005,91.5576778],[15.4936823,94.725536],[18.6754009,91.5302225],[15.5202234,88.3631718]],"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.7843137254901961,0.796078431372549,0.8156862745098039,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-6,-82]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-78-Copy","ip":0,"st":0,"ind":9,"hix":12,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[6.337700843811035,6.363171577453613,0]},"p":{"s":true,"x":{"a":0,"k":19.041000000000004},"y":{"a":0,"k":21.235}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":1,"k":[{"t":0,"s":[183.34649444186343],"e":[272.154952687141],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":152}]},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-78-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[10.3154041,20.7352648],[13.4705817,17.566599],[10.288863,14.372093],[7.13288119,17.5399512],[3.97770366,14.372093],[0.795180723,17.566599],[3.95116253,20.7352648],[0.795180723,23.903123],[3.97770366,27.0984365],[7.13288119,23.9297708],[10.288863,27.0984365],[13.4705817,23.903123],[10.3154041,20.7352648]],"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.7843137254901961,0.796078431372549,0.8156862745098039,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-0.795,-14.372]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-77-Copy","ip":0,"st":0,"ind":8,"hix":13,"ks":{"o":{"a":1,"k":[{"t":0,"s":[0],"e":[0],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":27,"s":[0],"e":[100],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":30,"s":[100],"e":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":129,"s":[100],"e":[0],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":134}]},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[8.125606536865234,6.429790496826172,0]},"p":{"s":true,"x":{"a":0,"k":106.17299999999999},"y":{"a":0,"k":56.487}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-77-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[100.02483,53.7239059],[95.8063991,56.1682359],[102.390208,59.7253135],[97.7439017,62.4167414],[87.0976909,56.6559714],[91.7391718,53.9669661],[86.1389931,49.5571589],[100.02483,53.7239059]],"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.9529411764705882,0.6666666666666666,0,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-86.139,-49.557]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-76-Copy","ip":0,"st":0,"ind":7,"hix":14,"ks":{"o":{"a":1,"k":[{"t":0,"s":[0],"e":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":10,"s":[0],"e":[100],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":19,"s":[100],"e":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":129,"s":[100],"e":[0],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":134}]},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[7,4.5,0]},"p":{"s":true,"x":{"a":0,"k":37.908},"y":{"a":0,"k":45}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-76-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[24.5935437,44.9333587],[19,42.9542509],[22.2243422,40],[31.2707297,43.2081586],[28.0501854,46.1589783],[33,49],[21.6654309,47.6151735]],"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.9529411764705882,0.6666666666666666,0,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-19,-40]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-75-Copy","ip":0,"st":0,"ind":6,"hix":15,"ks":{"o":{"a":1,"k":[{"t":0,"s":[0],"e":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":3,"s":[0],"e":[1.5599999999999998],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":4,"s":[1.5599999999999998],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":5,"s":[0],"e":[6.25],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":7,"s":[6.25],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":10,"s":[0],"e":[25],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":15,"s":[25],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":20,"s":[0],"e":[100],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":30,"s":[100],"e":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":129,"s":[100],"e":[0],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":133}]},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[7.5,10,0]},"p":{"s":true,"x":{"a":0,"k":44.117000000000004},"y":{"a":0,"k":13.921}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-75-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[24.7093689,11.181303],[30.4364682,11.0344267],[25.6228981,3.58373029],[31.929724,3.42099412],[39.7093689,15.4793309],[33.408674,15.6413775],[36.7289883,23.4209941],[24.7093689,11.181303]],"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.9529411764705882,0.6666666666666666,0,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-24.709,-3.421]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-74-Copy","ip":0,"st":0,"ind":5,"hix":16,"ks":{"o":{"a":1,"k":[{"t":0,"s":[0],"e":[0],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":22,"s":[0],"e":[1.5599999999999998],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":23,"s":[1.5599999999999998],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":24,"s":[0],"e":[6.25],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":26,"s":[6.25],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":28,"s":[0],"e":[25],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":32,"s":[25],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":36,"s":[0],"e":[100],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":44,"s":[100],"e":[100],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":129,"s":[100],"e":[0],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":134}]},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[11.382123947143555,9.07196044921875,0]},"p":{"s":true,"x":{"a":0,"k":26.29},"y":{"a":0,"k":65.572}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-74-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[12.7389867,74.1439221],[11.995835,67.3939535],[3.81714514,73.8168809],[3,66.3837596],[16.2359818,56],[17.0531269,63.4266612],[25.764248,58.7342258],[12.7389867,74.1439221]],"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.9529411764705882,0.6666666666666666,0,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-3,-56]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-73-Copy","ip":0,"st":0,"ind":4,"hix":17,"ks":{"o":{"a":1,"k":[{"t":0,"s":[0],"e":[0],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":15,"s":[0],"e":[1.5599999999999998],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":16,"s":[1.5599999999999998],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":17,"s":[0],"e":[6.25],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":19,"s":[6.25],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":21,"s":[0],"e":[25],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":25,"s":[25],"e":[0],"i":{"x":[0.45],"y":[0.94]},"o":{"x":[0.25],"y":[0.46]}},{"t":29,"s":[0],"e":[100],"i":{"x":[0.68],"y":[0.53]},"o":{"x":[0.55],"y":[0.085]}},{"t":38,"s":[100],"e":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":129,"s":[100],"e":[0],"i":{"x":[0.515],"y":[0.955]},"o":{"x":[0.455],"y":[0.03]}},{"t":134}]},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[10.698890686035156,9.536684036254883,0]},"p":{"s":true,"x":{"a":0,"k":100.70299999999999},"y":{"a":0,"k":25.877}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":0,"k":[100,100,100]}},"shapes":[{"ty":"gr","nm":"Fill-73-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[96.8712615,27.6258868],[90.7643884,24.7035113],[99.4940078,19.0582152],[92.7702545,15.8402914],[78.654394,24.980487],[85.3717131,28.1959882],[78.096226,34.9136565],[96.8712615,27.6258868]],"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.9529411764705882,0.6666666666666666,0,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-78.096,-15.84]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-63-Copy","ip":0,"st":0,"ind":3,"hix":18,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[2.473957061767578,2.483494281768799,0]},"p":{"s":true,"x":{"a":0,"k":92.599},"y":{"a":0,"k":6.983}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":1,"k":[{"t":0,"s":[100,100],"e":[120,120],"i":{"x":[0.515,0.515],"y":[0.955,0.955]},"o":{"x":[0.455,0.455],"y":[0.03,0.03]}},{"t":97,"s":[120,120],"e":[100,100],"i":{"x":[0.515,0.515],"y":[0.955,0.955]},"o":{"x":[0.455,0.455],"y":[0.03,0.03]}},{"t":152}]}},"shapes":[{"ty":"gr","nm":"Fill-63-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[83.1647778,6.4830905],[80.6900184,8.96698851],[78.2168675,6.4830905],[80.6900184,4]],"i":[[0,-1.37115046],[1.3672703999999953,0],[0,1.3719579699999995],[-1.3656619000000063,0]],"o":[[0,1.3719579699999995],[-1.3656619000000063,0],[0,-1.37115046],[1.3672703999999953,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.24313725490196078,0.5137254901960784,0.7529411764705882,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-78.217,-4]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-62-Copy","ip":0,"st":0,"ind":2,"hix":19,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[2.473957061767578,2.4834938049316406,0]},"p":{"s":true,"x":{"a":0,"k":132.069},"y":{"a":0,"k":74.472}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":1,"k":[{"t":0,"s":[100,100],"e":[70,70],"i":{"x":[0.515,0.515],"y":[0.955,0.955]},"o":{"x":[0.455,0.455],"y":[0.03,0.03]}},{"t":51,"s":[70,70],"e":[100,100],"i":{"x":[0.515,0.515],"y":[0.955,0.955]},"o":{"x":[0.455,0.455],"y":[0.03,0.03]}},{"t":152}]}},"shapes":[{"ty":"gr","nm":"Fill-62-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[122.634657,73.9714626],[120.160702,76.4553606],[117.686747,73.9714626],[120.160702,71.4883721]],"i":[[0,-1.3711504999999988],[1.3664660000000026,0],[0,1.3719580000000065],[-1.3664660000000026,0]],"o":[[0,1.3719580000000065],[-1.3664660000000026,0],[0,-1.3711504999999988],[1.3664660000000026,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.24313725490196078,0.5137254901960784,0.7529411764705882,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-117.687,-71.488]},"r":{"a":0,"k":0}}]}],"op":152},{"ty":4,"nm":"Fill-61-Copy","ip":0,"st":0,"ind":1,"hix":20,"ks":{"o":{"a":0,"k":100},"or":{"a":0,"k":[0,0,0]},"a":{"a":0,"k":[2.473552703857422,2.4834938049316406,0]},"p":{"s":true,"x":{"a":0,"k":49.382000000000005},"y":{"a":0,"k":85.983}},"rx":{"a":0,"k":0},"ry":{"a":0,"k":0},"rz":{"a":0,"k":0},"s":{"a":1,"k":[{"t":0,"s":[100,100],"e":[150,150],"i":{"x":[0.515,0.515],"y":[0.955,0.955]},"o":{"x":[0.455,0.455],"y":[0.03,0.03]}},{"t":73,"s":[150,150],"e":[100,100],"i":{"x":[0.515,0.515],"y":[0.955,0.955]},"o":{"x":[0.455,0.455],"y":[0.03,0.03]}},{"t":152}]}},"shapes":[{"ty":"gr","nm":"Fill-61-Copy shape group","it":[{"ty":"sh","ks":{"a":0,"k":{"c":true,"v":[[39.947106,85.4830905],[37.4731509,87.9669885],[35,85.4830905],[37.4731509,83]],"i":[[0,-1.3711504999999988],[1.3664660999999967,0],[0,1.3719579999999922],[-1.3656618999999992,0]],"o":[[0,1.3719579999999922],[-1.3656618999999992,0],[0,-1.3711504999999988],[1.3664660999999967,0]]}}},{"ty":"st","o":{"a":0,"k":0},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0,0]},"lc":3,"lj":1,"ml":1},{"ty":"fl","o":{"a":0,"k":100},"r":2,"c":{"a":0,"k":[0.24313725490196078,0.5137254901960784,0.7529411764705882,1]}},{"ty":"tr","o":{"a":0,"k":100},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"p":{"a":0,"k":[-35,-83]},"r":{"a":0,"k":0}}]}],"op":152}],"op":152,"w":140,"h":100} \ No newline at end of file diff --git a/userlist/src/main/java/com/hako/userlist/feature/UserlistFragment.kt b/userlist/src/main/java/com/hako/userlist/feature/UserlistFragment.kt index 08f15e7..7f02c67 100644 --- a/userlist/src/main/java/com/hako/userlist/feature/UserlistFragment.kt +++ b/userlist/src/main/java/com/hako/userlist/feature/UserlistFragment.kt @@ -7,8 +7,10 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import com.hako.base.domain.network.RequestStatus +import com.hako.base.extensions.gone import com.hako.base.extensions.observeNonNull import com.hako.base.extensions.toast +import com.hako.base.extensions.visible import com.hako.userlist.model.UserViewable import com.hako.userlist.viewmodel.UserlistViewmodel import com.hako.userlist.widget.UserlistAdapter @@ -40,15 +42,23 @@ class UserlistFragment : Fragment() { viewModel.requestStatus.observeNonNull(this) { when (it) { - RequestStatus.Ready -> { context?.toast("Ready") } - RequestStatus.Loading -> { context?.toast("Loading") } - RequestStatus.Errored -> { context?.toast("Errored") } + RequestStatus.Ready -> { + fragment_userlist_error_overlay.gone() + fragment_userlist_loading_overlay.gone() + } + RequestStatus.Loading -> { + fragment_userlist_error_overlay.gone() + fragment_userlist_loading_overlay.visible() + } + RequestStatus.Errored -> { + fragment_userlist_error_overlay.visible() + fragment_userlist_loading_overlay.gone() + } } } } private fun handleFetchError(throwable: Throwable) { - context?.toast("Could't get data") Timber.e(throwable) } diff --git a/userlist/src/main/res/layout/fragment_userlist.xml b/userlist/src/main/res/layout/fragment_userlist.xml index a208918..ef7295d 100644 --- a/userlist/src/main/res/layout/fragment_userlist.xml +++ b/userlist/src/main/res/layout/fragment_userlist.xml @@ -15,4 +15,24 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + \ No newline at end of file