diff --git a/flow-kit/build.gradle b/flow-kit/build.gradle index da91067..1fd457b 100644 --- a/flow-kit/build.gradle +++ b/flow-kit/build.gradle @@ -41,6 +41,8 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.fragment:fragment:1.2.5' + implementation "io.reactivex.rxjava2:rxjava:2.1.0" + } apply from: "${rootProject.projectDir}/flow-kit/maven-push.gradle" diff --git a/flow-kit/gradle.properties b/flow-kit/gradle.properties index 85b6f72..9e11b1d 100644 --- a/flow-kit/gradle.properties +++ b/flow-kit/gradle.properties @@ -2,8 +2,8 @@ POM_NAME=FlowKit POM_ARTIFACT_ID=flow-kit POM_PACKAGING=aar -VERSION_NAME=1.0.1 -VERSION_CODE=2 +VERSION_NAME=1.1.0 +VERSION_CODE=3 GROUP=com.zeoflow POM_DESCRIPTION=An Android Library that comes with useful features and components diff --git a/flow-kit/src/main/AndroidManifest.xml b/flow-kit/src/main/AndroidManifest.xml index 6cdd4b1..ef9f51c 100644 --- a/flow-kit/src/main/AndroidManifest.xml +++ b/flow-kit/src/main/AndroidManifest.xml @@ -7,20 +7,20 @@ android:supportsRtl="true"> diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnimRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/AnimRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnimRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/AnimRes.java index 59b3969..f047f3b 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnimRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/AnimRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnimatorRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/AnimatorRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnimatorRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/AnimatorRes.java index 5c11ecb..606656d 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnimatorRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/AnimatorRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnnotationDefault.java b/flow-kit/src/main/java/com/zeoflow/annotation/AnnotationDefault.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnnotationDefault.java rename to flow-kit/src/main/java/com/zeoflow/annotation/AnnotationDefault.java index f6c47b6..f81aaef 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnnotationDefault.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/AnnotationDefault.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnyRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/AnyRes.java similarity index 100% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnyRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/AnyRes.java diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnyThread.java b/flow-kit/src/main/java/com/zeoflow/annotation/AnyThread.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnyThread.java rename to flow-kit/src/main/java/com/zeoflow/annotation/AnyThread.java index 9ded353..888f701 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AnyThread.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/AnyThread.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AppIdInt.java b/flow-kit/src/main/java/com/zeoflow/annotation/AppIdInt.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AppIdInt.java rename to flow-kit/src/main/java/com/zeoflow/annotation/AppIdInt.java index 2b89c21..e911115 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AppIdInt.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/AppIdInt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ArrayRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/ArrayRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ArrayRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ArrayRes.java index 6cb6355..719f657 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ArrayRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ArrayRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AttrRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/AttrRes.java similarity index 100% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/AttrRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/AttrRes.java diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BinderThread.java b/flow-kit/src/main/java/com/zeoflow/annotation/BinderThread.java similarity index 92% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BinderThread.java rename to flow-kit/src/main/java/com/zeoflow/annotation/BinderThread.java index 1ba29f4..81c9202 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BinderThread.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/BinderThread.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BoolRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/BoolRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BoolRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/BoolRes.java index bbd236b..94a632b 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BoolRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/BoolRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BroadcastBehavior.java b/flow-kit/src/main/java/com/zeoflow/annotation/BroadcastBehavior.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BroadcastBehavior.java rename to flow-kit/src/main/java/com/zeoflow/annotation/BroadcastBehavior.java index 71baf88..fc160dc 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BroadcastBehavior.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/BroadcastBehavior.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import android.content.Intent; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BytesLong.java b/flow-kit/src/main/java/com/zeoflow/annotation/BytesLong.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BytesLong.java rename to flow-kit/src/main/java/com/zeoflow/annotation/BytesLong.java index 985f96f..6741c42 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/BytesLong.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/BytesLong.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CallSuper.java b/flow-kit/src/main/java/com/zeoflow/annotation/CallSuper.java similarity index 100% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CallSuper.java rename to flow-kit/src/main/java/com/zeoflow/annotation/CallSuper.java diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CallbackExecutor.java b/flow-kit/src/main/java/com/zeoflow/annotation/CallbackExecutor.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CallbackExecutor.java rename to flow-kit/src/main/java/com/zeoflow/annotation/CallbackExecutor.java index 721c3fa..f778b64 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CallbackExecutor.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/CallbackExecutor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CheckResult.java b/flow-kit/src/main/java/com/zeoflow/annotation/CheckResult.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CheckResult.java rename to flow-kit/src/main/java/com/zeoflow/annotation/CheckResult.java index 2d26fa9..53e5582 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CheckResult.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/CheckResult.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ChecksSdkIntAtLeast.java b/flow-kit/src/main/java/com/zeoflow/annotation/ChecksSdkIntAtLeast.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ChecksSdkIntAtLeast.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ChecksSdkIntAtLeast.java index 67d5e55..daa1da8 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ChecksSdkIntAtLeast.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ChecksSdkIntAtLeast.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorInt.java b/flow-kit/src/main/java/com/zeoflow/annotation/ColorInt.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorInt.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ColorInt.java index bd50f45..b9eef6e 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorInt.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ColorInt.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorLong.java b/flow-kit/src/main/java/com/zeoflow/annotation/ColorLong.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorLong.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ColorLong.java index 496a3ae..d3ad76d 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorLong.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ColorLong.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/ColorRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ColorRes.java index 74ff32e..089704b 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ColorRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ColorRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Colour.java b/flow-kit/src/main/java/com/zeoflow/annotation/Colour.java similarity index 85% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Colour.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Colour.java index ea4ff28..7a01bf7 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Colour.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Colour.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Condemned.java b/flow-kit/src/main/java/com/zeoflow/annotation/Condemned.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Condemned.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Condemned.java index e497c6d..530f228 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Condemned.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Condemned.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ContentView.java b/flow-kit/src/main/java/com/zeoflow/annotation/ContentView.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ContentView.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ContentView.java index 4e18177..866b1fd 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ContentView.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ContentView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CorePlatformApi.java b/flow-kit/src/main/java/com/zeoflow/annotation/CorePlatformApi.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CorePlatformApi.java rename to flow-kit/src/main/java/com/zeoflow/annotation/CorePlatformApi.java index 6349302..c9ced77 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CorePlatformApi.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/CorePlatformApi.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Credential.java b/flow-kit/src/main/java/com/zeoflow/annotation/Credential.java similarity index 82% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Credential.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Credential.java index 1358785..b07132d 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Credential.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Credential.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CurrentTimeMillisLong.java b/flow-kit/src/main/java/com/zeoflow/annotation/CurrentTimeMillisLong.java similarity index 100% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CurrentTimeMillisLong.java rename to flow-kit/src/main/java/com/zeoflow/annotation/CurrentTimeMillisLong.java diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CurrentTimeSecondsLong.java b/flow-kit/src/main/java/com/zeoflow/annotation/CurrentTimeSecondsLong.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CurrentTimeSecondsLong.java rename to flow-kit/src/main/java/com/zeoflow/annotation/CurrentTimeSecondsLong.java index 8a1c111..cceef8d 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/CurrentTimeSecondsLong.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/CurrentTimeSecondsLong.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DimenRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/DimenRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DimenRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/DimenRes.java index a9f80d1..00ccb26 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DimenRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/DimenRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Dimension.java b/flow-kit/src/main/java/com/zeoflow/annotation/Dimension.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Dimension.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Dimension.java index 347f615..0852ef7 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Dimension.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Dimension.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DimensionUnit.java b/flow-kit/src/main/java/com/zeoflow/annotation/DimensionUnit.java similarity index 90% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DimensionUnit.java rename to flow-kit/src/main/java/com/zeoflow/annotation/DimensionUnit.java index dc7b655..5ee6dfe 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DimensionUnit.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/DimensionUnit.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DoNotInline.java b/flow-kit/src/main/java/com/zeoflow/annotation/DoNotInline.java similarity index 93% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DoNotInline.java rename to flow-kit/src/main/java/com/zeoflow/annotation/DoNotInline.java index b69f75a..27d9610 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DoNotInline.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/DoNotInline.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DrawableRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/DrawableRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DrawableRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/DrawableRes.java index f77a5c4..3dbf856 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DrawableRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/DrawableRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DurationMillisLong.java b/flow-kit/src/main/java/com/zeoflow/annotation/DurationMillisLong.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DurationMillisLong.java rename to flow-kit/src/main/java/com/zeoflow/annotation/DurationMillisLong.java index 4f88bd9..70629f1 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/DurationMillisLong.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/DurationMillisLong.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ElapsedRealtimeLong.java b/flow-kit/src/main/java/com/zeoflow/annotation/ElapsedRealtimeLong.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ElapsedRealtimeLong.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ElapsedRealtimeLong.java index 18ee95a..8ef9781 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ElapsedRealtimeLong.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ElapsedRealtimeLong.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import android.os.SystemClock; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/EnclosingClass.java b/flow-kit/src/main/java/com/zeoflow/annotation/EnclosingClass.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/EnclosingClass.java rename to flow-kit/src/main/java/com/zeoflow/annotation/EnclosingClass.java index b339eb0..b98f32f 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/EnclosingClass.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/EnclosingClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/EnclosingMethod.java b/flow-kit/src/main/java/com/zeoflow/annotation/EnclosingMethod.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/EnclosingMethod.java rename to flow-kit/src/main/java/com/zeoflow/annotation/EnclosingMethod.java index 040d4ab..edbbc13 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/EnclosingMethod.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/EnclosingMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ErrorCode.java b/flow-kit/src/main/java/com/zeoflow/annotation/ErrorCode.java similarity index 82% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ErrorCode.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ErrorCode.java index 2ce2d6f..9514989 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ErrorCode.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ErrorCode.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ErrorMessage.java b/flow-kit/src/main/java/com/zeoflow/annotation/ErrorMessage.java similarity index 82% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ErrorMessage.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ErrorMessage.java index 7b7c119..30b36e6 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ErrorMessage.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ErrorMessage.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FloatRange.java b/flow-kit/src/main/java/com/zeoflow/annotation/FloatRange.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FloatRange.java rename to flow-kit/src/main/java/com/zeoflow/annotation/FloatRange.java index a6061bb..31796d0 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FloatRange.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/FloatRange.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FontRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/FontRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FontRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/FontRes.java index 9b79022..99f47f2 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FontRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/FontRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ForceInline.java b/flow-kit/src/main/java/com/zeoflow/annotation/ForceInline.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ForceInline.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ForceInline.java index f5177b6..1d3f6d0 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ForceInline.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ForceInline.java @@ -23,7 +23,7 @@ * questions. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FractionRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/FractionRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FractionRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/FractionRes.java index f4b03e4..9fa6ae8 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/FractionRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/FractionRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/GuardedBy.java b/flow-kit/src/main/java/com/zeoflow/annotation/GuardedBy.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/GuardedBy.java rename to flow-kit/src/main/java/com/zeoflow/annotation/GuardedBy.java index e66246a..b7cd568 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/GuardedBy.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/GuardedBy.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/HalfFloat.java b/flow-kit/src/main/java/com/zeoflow/annotation/HalfFloat.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/HalfFloat.java rename to flow-kit/src/main/java/com/zeoflow/annotation/HalfFloat.java index 4770b2f..7c96f58 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/HalfFloat.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/HalfFloat.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Hide.java b/flow-kit/src/main/java/com/zeoflow/annotation/Hide.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Hide.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Hide.java index 3d14982..4cdd706 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Hide.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Hide.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IdRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/IdRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IdRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/IdRes.java index 1325d0a..3d2113f 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IdRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/IdRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Immutable.java b/flow-kit/src/main/java/com/zeoflow/annotation/Immutable.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Immutable.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Immutable.java index d1b179b..1327be5 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Immutable.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Immutable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InnerClass.java b/flow-kit/src/main/java/com/zeoflow/annotation/InnerClass.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InnerClass.java rename to flow-kit/src/main/java/com/zeoflow/annotation/InnerClass.java index ce9bade..c20df63 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InnerClass.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/InnerClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InspectableProperty.java b/flow-kit/src/main/java/com/zeoflow/annotation/InspectableProperty.java similarity index 99% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InspectableProperty.java rename to flow-kit/src/main/java/com/zeoflow/annotation/InspectableProperty.java index 2e1e95f..e27007a 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InspectableProperty.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/InspectableProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntDef.java b/flow-kit/src/main/java/com/zeoflow/annotation/IntDef.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntDef.java rename to flow-kit/src/main/java/com/zeoflow/annotation/IntDef.java index 5248e6c..4485f0c 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntDef.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/IntDef.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntRange.java b/flow-kit/src/main/java/com/zeoflow/annotation/IntRange.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntRange.java rename to flow-kit/src/main/java/com/zeoflow/annotation/IntRange.java index e08c9bc..b71b22a 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntRange.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/IntRange.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntegerRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/IntegerRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntegerRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/IntegerRes.java index 6904ed9..0ba6627 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntegerRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/IntegerRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InterpolatorRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/InterpolatorRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InterpolatorRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/InterpolatorRes.java index b03ab22..997b064 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/InterpolatorRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/InterpolatorRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntraCoreApi.java b/flow-kit/src/main/java/com/zeoflow/annotation/IntraCoreApi.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntraCoreApi.java rename to flow-kit/src/main/java/com/zeoflow/annotation/IntraCoreApi.java index f69f605..951a1c9 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/IntraCoreApi.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/IntraCoreApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Keep.java b/flow-kit/src/main/java/com/zeoflow/annotation/Keep.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Keep.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Keep.java index 98d2c43..ffb73f7 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Keep.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Keep.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/KeepForApi.java b/flow-kit/src/main/java/com/zeoflow/annotation/KeepForApi.java similarity index 86% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/KeepForApi.java rename to flow-kit/src/main/java/com/zeoflow/annotation/KeepForApi.java index 695f5e4..b311827 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/KeepForApi.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/KeepForApi.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/KnownFailure.java b/flow-kit/src/main/java/com/zeoflow/annotation/KnownFailure.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/KnownFailure.java rename to flow-kit/src/main/java/com/zeoflow/annotation/KnownFailure.java index d4edb9a..17513d9 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/KnownFailure.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/KnownFailure.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/LayoutRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/LayoutRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/LayoutRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/LayoutRes.java index 04cb24b..0132623 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/LayoutRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/LayoutRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/LongDef.java b/flow-kit/src/main/java/com/zeoflow/annotation/LongDef.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/LongDef.java rename to flow-kit/src/main/java/com/zeoflow/annotation/LongDef.java index 8d3c941..271bd7a 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/LongDef.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/LongDef.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MainThread.java b/flow-kit/src/main/java/com/zeoflow/annotation/MainThread.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MainThread.java rename to flow-kit/src/main/java/com/zeoflow/annotation/MainThread.java index d6a8913..681958b 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MainThread.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/MainThread.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MemberClasses.java b/flow-kit/src/main/java/com/zeoflow/annotation/MemberClasses.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MemberClasses.java rename to flow-kit/src/main/java/com/zeoflow/annotation/MemberClasses.java index 3affa4e..65ac7fb 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MemberClasses.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/MemberClasses.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MenuRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/MenuRes.java similarity index 93% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MenuRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/MenuRes.java index cffd650..89a2976 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MenuRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/MenuRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MethodParameters.java b/flow-kit/src/main/java/com/zeoflow/annotation/MethodParameters.java similarity index 99% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MethodParameters.java rename to flow-kit/src/main/java/com/zeoflow/annotation/MethodParameters.java index 8a2cdcd..c699185 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/MethodParameters.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/MethodParameters.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NavigationRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/NavigationRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NavigationRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/NavigationRes.java index 221f849..bcf9ba1 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NavigationRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/NavigationRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NonNull.java b/flow-kit/src/main/java/com/zeoflow/annotation/NonNull.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NonNull.java rename to flow-kit/src/main/java/com/zeoflow/annotation/NonNull.java index 08755f4..51528b3 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NonNull.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/NonNull.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NotNull.java b/flow-kit/src/main/java/com/zeoflow/annotation/NotNull.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NotNull.java rename to flow-kit/src/main/java/com/zeoflow/annotation/NotNull.java index 9f15817..7e77d60 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/NotNull.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/NotNull.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Nullable.java b/flow-kit/src/main/java/com/zeoflow/annotation/Nullable.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Nullable.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Nullable.java index 3d9d228..d8326b3 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Nullable.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Nullable.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/OWNERS b/flow-kit/src/main/java/com/zeoflow/annotation/OWNERS similarity index 100% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/OWNERS rename to flow-kit/src/main/java/com/zeoflow/annotation/OWNERS diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/PluralsRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/PluralsRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/PluralsRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/PluralsRes.java index 8ee78e5..71f1e26 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/PluralsRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/PluralsRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ProductionVisibility.java b/flow-kit/src/main/java/com/zeoflow/annotation/ProductionVisibility.java similarity index 91% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ProductionVisibility.java rename to flow-kit/src/main/java/com/zeoflow/annotation/ProductionVisibility.java index 2e9ae63..141f47f 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/ProductionVisibility.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/ProductionVisibility.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Px.java b/flow-kit/src/main/java/com/zeoflow/annotation/Px.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Px.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Px.java index 4a02b72..ac1cc79 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Px.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Px.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RawRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/RawRes.java similarity index 93% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RawRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/RawRes.java index dcab322..3dd00ff 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RawRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/RawRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresApi.java b/flow-kit/src/main/java/com/zeoflow/annotation/RequiresApi.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresApi.java rename to flow-kit/src/main/java/com/zeoflow/annotation/RequiresApi.java index 311f9f1..156dc1e 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresApi.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/RequiresApi.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresFeature.java b/flow-kit/src/main/java/com/zeoflow/annotation/RequiresFeature.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresFeature.java rename to flow-kit/src/main/java/com/zeoflow/annotation/RequiresFeature.java index 1b4a0df..6aa7198 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresFeature.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/RequiresFeature.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresPermission.java b/flow-kit/src/main/java/com/zeoflow/annotation/RequiresPermission.java similarity index 99% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresPermission.java rename to flow-kit/src/main/java/com/zeoflow/annotation/RequiresPermission.java index 8e35046..e2683b5 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RequiresPermission.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/RequiresPermission.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RestrictTo.java b/flow-kit/src/main/java/com/zeoflow/annotation/RestrictTo.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RestrictTo.java rename to flow-kit/src/main/java/com/zeoflow/annotation/RestrictTo.java index e8fa985..67581de 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/RestrictTo.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/RestrictTo.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Sampled.kt b/flow-kit/src/main/java/com/zeoflow/annotation/Sampled.kt similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Sampled.kt rename to flow-kit/src/main/java/com/zeoflow/annotation/Sampled.kt index 8a46da9..fd31b15 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Sampled.kt +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Sampled.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation +package com.zeoflow.annotation /** * Denotes that the annotated function is considered a sample function, and is linked to from the diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SdkConstant.java b/flow-kit/src/main/java/com/zeoflow/annotation/SdkConstant.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SdkConstant.java rename to flow-kit/src/main/java/com/zeoflow/annotation/SdkConstant.java index fbc81d4..b810211 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SdkConstant.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/SdkConstant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Signature.java b/flow-kit/src/main/java/com/zeoflow/annotation/Signature.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Signature.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Signature.java index 2ee9544..cda12bc 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Signature.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Signature.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Size.java b/flow-kit/src/main/java/com/zeoflow/annotation/Size.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Size.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Size.java index 730825e..0f82c82 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Size.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Size.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SourceDebugExtension.java b/flow-kit/src/main/java/com/zeoflow/annotation/SourceDebugExtension.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SourceDebugExtension.java rename to flow-kit/src/main/java/com/zeoflow/annotation/SourceDebugExtension.java index 4fd47a8..df39f47 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SourceDebugExtension.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/SourceDebugExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StringDef.java b/flow-kit/src/main/java/com/zeoflow/annotation/StringDef.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StringDef.java rename to flow-kit/src/main/java/com/zeoflow/annotation/StringDef.java index 31e5c64..380754b 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StringDef.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/StringDef.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StringRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/StringRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StringRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/StringRes.java index 1bab4f5..38cbeba 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StringRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/StringRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StyleRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/StyleRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StyleRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/StyleRes.java index 5c34c9e..5b0d108 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StyleRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/StyleRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StyleableRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/StyleableRes.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StyleableRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/StyleableRes.java index fde7cf0..3c884e8 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/StyleableRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/StyleableRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SuppressAutoDoc.java b/flow-kit/src/main/java/com/zeoflow/annotation/SuppressAutoDoc.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SuppressAutoDoc.java rename to flow-kit/src/main/java/com/zeoflow/annotation/SuppressAutoDoc.java index 33e86af..28912d6 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SuppressAutoDoc.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/SuppressAutoDoc.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SuppressLint.java b/flow-kit/src/main/java/com/zeoflow/annotation/SuppressLint.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SuppressLint.java rename to flow-kit/src/main/java/com/zeoflow/annotation/SuppressLint.java index ea35626..9c77629 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SuppressLint.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/SuppressLint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SystemApi.java b/flow-kit/src/main/java/com/zeoflow/annotation/SystemApi.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SystemApi.java rename to flow-kit/src/main/java/com/zeoflow/annotation/SystemApi.java index 383f042..3eda080 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SystemApi.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/SystemApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SystemService.java b/flow-kit/src/main/java/com/zeoflow/annotation/SystemService.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SystemService.java rename to flow-kit/src/main/java/com/zeoflow/annotation/SystemService.java index 50ceda0..8ffa512 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/SystemService.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/SystemService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TargetApi.java b/flow-kit/src/main/java/com/zeoflow/annotation/TargetApi.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TargetApi.java rename to flow-kit/src/main/java/com/zeoflow/annotation/TargetApi.java index a062153..9dbc8bd 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TargetApi.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/TargetApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestApi.java b/flow-kit/src/main/java/com/zeoflow/annotation/TestApi.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestApi.java rename to flow-kit/src/main/java/com/zeoflow/annotation/TestApi.java index b9032df..427ca21 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestApi.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/TestApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestTarget.java b/flow-kit/src/main/java/com/zeoflow/annotation/TestTarget.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestTarget.java rename to flow-kit/src/main/java/com/zeoflow/annotation/TestTarget.java index 2161874..a9f4b52 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestTarget.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/TestTarget.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestTargetClass.java b/flow-kit/src/main/java/com/zeoflow/annotation/TestTargetClass.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestTargetClass.java rename to flow-kit/src/main/java/com/zeoflow/annotation/TestTargetClass.java index cfd7eb4..13c86ea 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TestTargetClass.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/TestTargetClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Throws.java b/flow-kit/src/main/java/com/zeoflow/annotation/Throws.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Throws.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Throws.java index 7c64222..b8c4fbd 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Throws.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Throws.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TransitionRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/TransitionRes.java similarity index 93% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TransitionRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/TransitionRes.java index d790f9c..82f77d4 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/TransitionRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/TransitionRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UiThread.java b/flow-kit/src/main/java/com/zeoflow/annotation/UiThread.java similarity index 92% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UiThread.java rename to flow-kit/src/main/java/com/zeoflow/annotation/UiThread.java index 19ff484..7373720 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UiThread.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/UiThread.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -28,7 +28,7 @@ * Thread * annotations. * - * @see com.zeoflow.flow.kit.annotation.MainThread + * @see com.zeoflow.annotation.MainThread */ @Documented @Retention(CLASS) diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UnsupportedAppUsage.java b/flow-kit/src/main/java/com/zeoflow/annotation/UnsupportedAppUsage.java similarity index 99% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UnsupportedAppUsage.java rename to flow-kit/src/main/java/com/zeoflow/annotation/UnsupportedAppUsage.java index 9e1dca0..c18d933 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UnsupportedAppUsage.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/UnsupportedAppUsage.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UserHandleAware.java b/flow-kit/src/main/java/com/zeoflow/annotation/UserHandleAware.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UserHandleAware.java rename to flow-kit/src/main/java/com/zeoflow/annotation/UserHandleAware.java index b5fb12d..b60c70a 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UserHandleAware.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/UserHandleAware.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UserIdInt.java b/flow-kit/src/main/java/com/zeoflow/annotation/UserIdInt.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UserIdInt.java rename to flow-kit/src/main/java/com/zeoflow/annotation/UserIdInt.java index cd0c3eb..c98bcf8 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/UserIdInt.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/UserIdInt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/VisibleForNative.java b/flow-kit/src/main/java/com/zeoflow/annotation/VisibleForNative.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/VisibleForNative.java rename to flow-kit/src/main/java/com/zeoflow/annotation/VisibleForNative.java index 7cebafa..aae44dd 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/VisibleForNative.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/VisibleForNative.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/VisibleForTesting.java b/flow-kit/src/main/java/com/zeoflow/annotation/VisibleForTesting.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/VisibleForTesting.java rename to flow-kit/src/main/java/com/zeoflow/annotation/VisibleForTesting.java index 3b1388c..8606579 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/VisibleForTesting.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/VisibleForTesting.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Widget.java b/flow-kit/src/main/java/com/zeoflow/annotation/Widget.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Widget.java rename to flow-kit/src/main/java/com/zeoflow/annotation/Widget.java index a1b2a29..a0fdf6f 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/Widget.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/Widget.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/WorkerThread.java b/flow-kit/src/main/java/com/zeoflow/annotation/WorkerThread.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/WorkerThread.java rename to flow-kit/src/main/java/com/zeoflow/annotation/WorkerThread.java index 6dec62a..60871a8 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/WorkerThread.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/WorkerThread.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/XmlRes.java b/flow-kit/src/main/java/com/zeoflow/annotation/XmlRes.java similarity index 93% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/XmlRes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/XmlRes.java index 38610e9..7d24543 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/XmlRes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/XmlRes.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.annotation; +package com.zeoflow.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/codegen/CovariantReturnType.java b/flow-kit/src/main/java/com/zeoflow/annotation/codegen/CovariantReturnType.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/codegen/CovariantReturnType.java rename to flow-kit/src/main/java/com/zeoflow/annotation/codegen/CovariantReturnType.java index f2a0aab..21b4088 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/codegen/CovariantReturnType.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/codegen/CovariantReturnType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation.codegen; +package com.zeoflow.annotation.codegen; -import com.zeoflow.flow.kit.annotation.CorePlatformApi; +import com.zeoflow.annotation.CorePlatformApi; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/compat/VersionCodes.java b/flow-kit/src/main/java/com/zeoflow/annotation/compat/VersionCodes.java similarity index 91% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/compat/VersionCodes.java rename to flow-kit/src/main/java/com/zeoflow/annotation/compat/VersionCodes.java index ba4c993..81a1f0f 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/compat/VersionCodes.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/compat/VersionCodes.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zeoflow.flow.kit.annotation.compat; +package com.zeoflow.annotation.compat; -import com.zeoflow.flow.kit.annotation.CorePlatformApi; -import com.zeoflow.flow.kit.annotation.IntraCoreApi; +import com.zeoflow.annotation.CorePlatformApi; +import com.zeoflow.annotation.IntraCoreApi; /** * Version code constants for Android releases. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/experimental/Experimental.kt b/flow-kit/src/main/java/com/zeoflow/annotation/experimental/Experimental.kt similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/experimental/Experimental.kt rename to flow-kit/src/main/java/com/zeoflow/annotation/experimental/Experimental.kt index 01c6aa0..c9c8e1d 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/experimental/Experimental.kt +++ b/flow-kit/src/main/java/com/zeoflow/annotation/experimental/Experimental.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation.experimental +package com.zeoflow.annotation.experimental /** * Denotes that the annotated element is a marker of an experimental API. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/experimental/UseExperimental.kt b/flow-kit/src/main/java/com/zeoflow/annotation/experimental/UseExperimental.kt similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/experimental/UseExperimental.kt rename to flow-kit/src/main/java/com/zeoflow/annotation/experimental/UseExperimental.kt index 76b2071..15ee862 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/experimental/UseExperimental.kt +++ b/flow-kit/src/main/java/com/zeoflow/annotation/experimental/UseExperimental.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation.experimental +package com.zeoflow.annotation.experimental import kotlin.reflect.KClass diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/CriticalNative.java b/flow-kit/src/main/java/com/zeoflow/annotation/optimization/CriticalNative.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/CriticalNative.java rename to flow-kit/src/main/java/com/zeoflow/annotation/optimization/CriticalNative.java index 74eace7..7179e13 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/CriticalNative.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/optimization/CriticalNative.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation.optimization; +package com.zeoflow.annotation.optimization; -import com.zeoflow.flow.kit.annotation.CorePlatformApi; +import com.zeoflow.annotation.CorePlatformApi; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/DeadReferenceSafe.java b/flow-kit/src/main/java/com/zeoflow/annotation/optimization/DeadReferenceSafe.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/DeadReferenceSafe.java rename to flow-kit/src/main/java/com/zeoflow/annotation/optimization/DeadReferenceSafe.java index 4a33e8c..d7c8e55 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/DeadReferenceSafe.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/optimization/DeadReferenceSafe.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation.optimization; +package com.zeoflow.annotation.optimization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/FastNative.java b/flow-kit/src/main/java/com/zeoflow/annotation/optimization/FastNative.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/FastNative.java rename to flow-kit/src/main/java/com/zeoflow/annotation/optimization/FastNative.java index ee13b5f..437d9f1 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/FastNative.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/optimization/FastNative.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation.optimization; +package com.zeoflow.annotation.optimization; -import com.zeoflow.flow.kit.annotation.CorePlatformApi; -import com.zeoflow.flow.kit.annotation.IntraCoreApi; +import com.zeoflow.annotation.CorePlatformApi; +import com.zeoflow.annotation.IntraCoreApi; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/ReachabilitySensitive.java b/flow-kit/src/main/java/com/zeoflow/annotation/optimization/ReachabilitySensitive.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/ReachabilitySensitive.java rename to flow-kit/src/main/java/com/zeoflow/annotation/optimization/ReachabilitySensitive.java index 85bb726..5aabc5b 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/annotation/optimization/ReachabilitySensitive.java +++ b/flow-kit/src/main/java/com/zeoflow/annotation/optimization/ReachabilitySensitive.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.annotation.optimization; +package com.zeoflow.annotation.optimization; -import com.zeoflow.flow.kit.annotation.IntraCoreApi; +import com.zeoflow.annotation.IntraCoreApi; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ActivityBuilder.java b/flow-kit/src/main/java/com/zeoflow/compat/ActivityBuilder.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ActivityBuilder.java rename to flow-kit/src/main/java/com/zeoflow/compat/ActivityBuilder.java index 2760542..6fe85c6 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ActivityBuilder.java +++ b/flow-kit/src/main/java/com/zeoflow/compat/ActivityBuilder.java @@ -1,11 +1,11 @@ -package com.zeoflow.flow.kit.compat; +package com.zeoflow.compat; import android.content.Intent; import android.os.Bundle; import android.os.Parcelable; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; import com.zeoflow.zson.Zson; import java.io.Serializable; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ActivityCore.java b/flow-kit/src/main/java/com/zeoflow/compat/ActivityCore.java similarity index 88% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ActivityCore.java rename to flow-kit/src/main/java/com/zeoflow/compat/ActivityCore.java index 5506e6c..12910a2 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ActivityCore.java +++ b/flow-kit/src/main/java/com/zeoflow/compat/ActivityCore.java @@ -1,18 +1,18 @@ -package com.zeoflow.flow.kit.compat; +package com.zeoflow.compat; import android.content.Context; import android.content.pm.ApplicationInfo; import androidx.appcompat.app.AppCompatActivity; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.model.Extra; -import com.zeoflow.flow.kit.initializer.ZeoFlowApp; -import com.zeoflow.flow.kit.logger.AndroidLogAdapter; -import com.zeoflow.flow.kit.logger.FormatStrategy; -import com.zeoflow.flow.kit.logger.Logger; -import com.zeoflow.flow.kit.logger.PrettyFormatStrategy; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.model.Extra; +import com.zeoflow.initializer.ZeoFlowApp; +import com.zeoflow.logger.AndroidLogAdapter; +import com.zeoflow.logger.FormatStrategy; +import com.zeoflow.logger.Logger; +import com.zeoflow.logger.PrettyFormatStrategy; import com.zeoflow.zson.JsonElement; import com.zeoflow.zson.Zson; import com.zeoflow.zson.reflect.TypeToken; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ClassCore.java b/flow-kit/src/main/java/com/zeoflow/compat/ClassCore.java similarity index 80% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ClassCore.java rename to flow-kit/src/main/java/com/zeoflow/compat/ClassCore.java index c24b8ae..74b9de2 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/ClassCore.java +++ b/flow-kit/src/main/java/com/zeoflow/compat/ClassCore.java @@ -1,15 +1,15 @@ -package com.zeoflow.flow.kit.compat; +package com.zeoflow.compat; import android.content.Context; import android.content.pm.ApplicationInfo; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.initializer.ZeoFlowApp; -import com.zeoflow.flow.kit.logger.AndroidLogAdapter; -import com.zeoflow.flow.kit.logger.FormatStrategy; -import com.zeoflow.flow.kit.logger.Logger; -import com.zeoflow.flow.kit.logger.PrettyFormatStrategy; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.initializer.ZeoFlowApp; +import com.zeoflow.logger.AndroidLogAdapter; +import com.zeoflow.logger.FormatStrategy; +import com.zeoflow.logger.Logger; +import com.zeoflow.logger.PrettyFormatStrategy; import com.zeoflow.zson.Zson; public class ClassCore diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/FragmentCore.java b/flow-kit/src/main/java/com/zeoflow/compat/FragmentCore.java similarity index 89% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compat/FragmentCore.java rename to flow-kit/src/main/java/com/zeoflow/compat/FragmentCore.java index 9688032..7a2c45c 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/FragmentCore.java +++ b/flow-kit/src/main/java/com/zeoflow/compat/FragmentCore.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.compat; +package com.zeoflow.compat; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -6,14 +6,14 @@ import androidx.fragment.app.Fragment; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.model.Extra; -import com.zeoflow.flow.kit.initializer.ZeoFlowApp; -import com.zeoflow.flow.kit.logger.AndroidLogAdapter; -import com.zeoflow.flow.kit.logger.FormatStrategy; -import com.zeoflow.flow.kit.logger.Logger; -import com.zeoflow.flow.kit.logger.PrettyFormatStrategy; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.model.Extra; +import com.zeoflow.initializer.ZeoFlowApp; +import com.zeoflow.logger.AndroidLogAdapter; +import com.zeoflow.logger.FormatStrategy; +import com.zeoflow.logger.Logger; +import com.zeoflow.logger.PrettyFormatStrategy; import com.zeoflow.zson.JsonElement; import com.zeoflow.zson.Zson; import com.zeoflow.zson.reflect.TypeToken; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/Gist.java b/flow-kit/src/main/java/com/zeoflow/compat/Gist.java similarity index 97% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compat/Gist.java rename to flow-kit/src/main/java/com/zeoflow/compat/Gist.java index 9c208a5..1dc0448 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/Gist.java +++ b/flow-kit/src/main/java/com/zeoflow/compat/Gist.java @@ -1,8 +1,8 @@ -package com.zeoflow.flow.kit.compat; +package com.zeoflow.compat; import android.os.Bundle; -import com.zeoflow.flow.kit.model.Extra; +import com.zeoflow.model.Extra; import com.zeoflow.zson.ZsonAttributes; import com.zeoflow.zson.model.Attribute; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/RVHolderCore.java b/flow-kit/src/main/java/com/zeoflow/compat/RVHolderCore.java similarity index 84% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compat/RVHolderCore.java rename to flow-kit/src/main/java/com/zeoflow/compat/RVHolderCore.java index 8d2fd74..8877fc1 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/RVHolderCore.java +++ b/flow-kit/src/main/java/com/zeoflow/compat/RVHolderCore.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.compat; +package com.zeoflow.compat; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -6,13 +6,13 @@ import androidx.recyclerview.widget.RecyclerView; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.initializer.ZeoFlowApp; -import com.zeoflow.flow.kit.logger.AndroidLogAdapter; -import com.zeoflow.flow.kit.logger.FormatStrategy; -import com.zeoflow.flow.kit.logger.Logger; -import com.zeoflow.flow.kit.logger.PrettyFormatStrategy; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.initializer.ZeoFlowApp; +import com.zeoflow.logger.AndroidLogAdapter; +import com.zeoflow.logger.FormatStrategy; +import com.zeoflow.logger.Logger; +import com.zeoflow.logger.PrettyFormatStrategy; import com.zeoflow.zson.Zson; public class RVHolderCore extends RecyclerView.ViewHolder diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/StatusBarUtil.java b/flow-kit/src/main/java/com/zeoflow/compat/StatusBarUtil.java similarity index 99% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compat/StatusBarUtil.java rename to flow-kit/src/main/java/com/zeoflow/compat/StatusBarUtil.java index c9d80ac..3ea5129 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compat/StatusBarUtil.java +++ b/flow-kit/src/main/java/com/zeoflow/compat/StatusBarUtil.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.compat; +package com.zeoflow.compat; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -16,9 +16,9 @@ import androidx.drawerlayout.widget.DrawerLayout; import com.zeoflow.flow.kit.R; -import com.zeoflow.flow.kit.annotation.ColorInt; -import com.zeoflow.flow.kit.annotation.IntRange; -import com.zeoflow.flow.kit.annotation.NonNull; +import com.zeoflow.annotation.ColorInt; +import com.zeoflow.annotation.IntRange; +import com.zeoflow.annotation.NonNull; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/Compressor.kt b/flow-kit/src/main/java/com/zeoflow/compressor/Compressor.kt similarity index 76% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/Compressor.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/Compressor.kt index 4b2ac6c..c616ab8 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/Compressor.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/Compressor.kt @@ -1,8 +1,8 @@ -package com.zeoflow.flow.kit.compressor +package com.zeoflow.compressor -import com.zeoflow.flow.kit.compressor.constraint.Compression -import com.zeoflow.flow.kit.compressor.constraint.default -import com.zeoflow.flow.kit.initializer.ZeoFlowApp.getContext +import com.zeoflow.compressor.constraint.Compression +import com.zeoflow.compressor.constraint.default +import com.zeoflow.initializer.ZeoFlowApp.getContext import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/Util.kt b/flow-kit/src/main/java/com/zeoflow/compressor/Util.kt similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/Util.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/Util.kt index 38bf4e8..7e28bb8 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/Util.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/Util.kt @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.compressor +package com.zeoflow.compressor import android.content.Context import android.graphics.Bitmap diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/Compression.kt b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/Compression.kt similarity index 78% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/Compression.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/constraint/Compression.kt index 53b565d..01e6809 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/Compression.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/Compression.kt @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.compressor.constraint +package com.zeoflow.compressor.constraint class Compression { internal val constraints: MutableList = mutableListOf() diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/Constraint.kt b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/Constraint.kt similarity index 83% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/Constraint.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/constraint/Constraint.kt index b5469c7..0596e32 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/Constraint.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/Constraint.kt @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.compressor.constraint +package com.zeoflow.compressor.constraint import java.io.File diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/DefaultConstraint.kt b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/DefaultConstraint.kt similarity index 83% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/DefaultConstraint.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/constraint/DefaultConstraint.kt index ecde93c..acba852 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/DefaultConstraint.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/DefaultConstraint.kt @@ -1,9 +1,9 @@ -package com.zeoflow.flow.kit.compressor.constraint +package com.zeoflow.compressor.constraint import android.graphics.Bitmap -import com.zeoflow.flow.kit.compressor.decodeSampledBitmapFromFile -import com.zeoflow.flow.kit.compressor.determineImageRotation -import com.zeoflow.flow.kit.compressor.overWrite +import com.zeoflow.compressor.decodeSampledBitmapFromFile +import com.zeoflow.compressor.determineImageRotation +import com.zeoflow.compressor.overWrite import java.io.File /** diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/DestinationConstraint.kt b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/DestinationConstraint.kt similarity index 91% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/DestinationConstraint.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/constraint/DestinationConstraint.kt index 3790d39..ce4daf1 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/DestinationConstraint.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/DestinationConstraint.kt @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.compressor.constraint +package com.zeoflow.compressor.constraint import java.io.File diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/FormatConstraint.kt b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/FormatConstraint.kt similarity index 74% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/FormatConstraint.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/constraint/FormatConstraint.kt index 0349e0a..38612b4 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/FormatConstraint.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/FormatConstraint.kt @@ -1,9 +1,9 @@ -package com.zeoflow.flow.kit.compressor.constraint +package com.zeoflow.compressor.constraint import android.graphics.Bitmap -import com.zeoflow.flow.kit.compressor.compressFormat -import com.zeoflow.flow.kit.compressor.loadBitmap -import com.zeoflow.flow.kit.compressor.overWrite +import com.zeoflow.compressor.compressFormat +import com.zeoflow.compressor.loadBitmap +import com.zeoflow.compressor.overWrite import java.io.File /** diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/QualityConstraint.kt b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/QualityConstraint.kt similarity index 80% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/QualityConstraint.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/constraint/QualityConstraint.kt index 3679617..79076ad 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/QualityConstraint.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/QualityConstraint.kt @@ -1,7 +1,7 @@ -package com.zeoflow.flow.kit.compressor.constraint +package com.zeoflow.compressor.constraint -import com.zeoflow.flow.kit.compressor.loadBitmap -import com.zeoflow.flow.kit.compressor.overWrite +import com.zeoflow.compressor.loadBitmap +import com.zeoflow.compressor.overWrite import java.io.File /** diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/ResolutionConstraint.kt b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/ResolutionConstraint.kt similarity index 76% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/ResolutionConstraint.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/constraint/ResolutionConstraint.kt index 29b47e1..33cef2f 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/ResolutionConstraint.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/ResolutionConstraint.kt @@ -1,10 +1,10 @@ -package com.zeoflow.flow.kit.compressor.constraint +package com.zeoflow.compressor.constraint import android.graphics.BitmapFactory -import com.zeoflow.flow.kit.compressor.calculateInSampleSize -import com.zeoflow.flow.kit.compressor.decodeSampledBitmapFromFile -import com.zeoflow.flow.kit.compressor.determineImageRotation -import com.zeoflow.flow.kit.compressor.overWrite +import com.zeoflow.compressor.calculateInSampleSize +import com.zeoflow.compressor.decodeSampledBitmapFromFile +import com.zeoflow.compressor.determineImageRotation +import com.zeoflow.compressor.overWrite import java.io.File /** diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/SizeConstraint.kt b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/SizeConstraint.kt similarity index 86% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/SizeConstraint.kt rename to flow-kit/src/main/java/com/zeoflow/compressor/constraint/SizeConstraint.kt index ab4d4e1..2018dd1 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/compressor/constraint/SizeConstraint.kt +++ b/flow-kit/src/main/java/com/zeoflow/compressor/constraint/SizeConstraint.kt @@ -1,7 +1,7 @@ -package com.zeoflow.flow.kit.compressor.constraint +package com.zeoflow.compressor.constraint -import com.zeoflow.flow.kit.compressor.loadBitmap -import com.zeoflow.flow.kit.compressor.overWrite +import com.zeoflow.compressor.loadBitmap +import com.zeoflow.compressor.overWrite import java.io.File /** diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/DataCollectionDefaultChange.java b/flow-kit/src/main/java/com/zeoflow/core/manage/DataCollectionDefaultChange.java similarity index 90% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/DataCollectionDefaultChange.java rename to flow-kit/src/main/java/com/zeoflow/core/manage/DataCollectionDefaultChange.java index 7642965..005e51c 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/DataCollectionDefaultChange.java +++ b/flow-kit/src/main/java/com/zeoflow/core/manage/DataCollectionDefaultChange.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.zeoflow.flow.kit.core.manage; +package com.zeoflow.core.manage; -import com.zeoflow.flow.kit.annotation.KeepForApi; +import com.zeoflow.annotation.KeepForApi; @KeepForApi public final class DataCollectionDefaultChange diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/PlatformInfo.java b/flow-kit/src/main/java/com/zeoflow/core/manage/PlatformInfo.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/PlatformInfo.java rename to flow-kit/src/main/java/com/zeoflow/core/manage/PlatformInfo.java index 0ee82f5..3967ed2 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/PlatformInfo.java +++ b/flow-kit/src/main/java/com/zeoflow/core/manage/PlatformInfo.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.core.manage; +package com.zeoflow.core.manage; import android.content.Context; import android.content.SharedPreferences; @@ -9,7 +9,7 @@ import java.util.TimeZone; import java.util.UUID; -import static com.zeoflow.flow.kit.initializer.ZeoFlowApp.getContext; +import static com.zeoflow.initializer.ZeoFlowApp.getContext; public class PlatformInfo { diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/StringResourceValueReader.java b/flow-kit/src/main/java/com/zeoflow/core/manage/StringResourceValueReader.java similarity index 77% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/StringResourceValueReader.java rename to flow-kit/src/main/java/com/zeoflow/core/manage/StringResourceValueReader.java index 68dd689..2e39456 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/StringResourceValueReader.java +++ b/flow-kit/src/main/java/com/zeoflow/core/manage/StringResourceValueReader.java @@ -1,12 +1,12 @@ -package com.zeoflow.flow.kit.core.manage; +package com.zeoflow.core.manage; import android.content.Context; import android.content.res.Resources; -import com.zeoflow.flow.kit.annotation.KeepForApi; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.core.utils.Preconditions; +import com.zeoflow.annotation.KeepForApi; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.core.utils.Preconditions; @KeepForApi public class StringResourceValueReader diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/StringsVerify.java b/flow-kit/src/main/java/com/zeoflow/core/manage/StringsVerify.java similarity index 79% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/StringsVerify.java rename to flow-kit/src/main/java/com/zeoflow/core/manage/StringsVerify.java index a205cd5..905b744 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/manage/StringsVerify.java +++ b/flow-kit/src/main/java/com/zeoflow/core/manage/StringsVerify.java @@ -1,9 +1,9 @@ -package com.zeoflow.flow.kit.core.manage; +package com.zeoflow.core.manage; import android.text.TextUtils; -import com.zeoflow.flow.kit.annotation.KeepForApi; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.KeepForApi; +import com.zeoflow.annotation.Nullable; import java.util.regex.Pattern; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/utils/Objects.java b/flow-kit/src/main/java/com/zeoflow/core/utils/Objects.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/core/utils/Objects.java rename to flow-kit/src/main/java/com/zeoflow/core/utils/Objects.java index 192adda..901d70d 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/utils/Objects.java +++ b/flow-kit/src/main/java/com/zeoflow/core/utils/Objects.java @@ -23,14 +23,14 @@ * questions. */ -package com.zeoflow.flow.kit.core.utils; +package com.zeoflow.core.utils; import android.os.Build; -import com.zeoflow.flow.kit.annotation.ForceInline; -import com.zeoflow.flow.kit.annotation.KeepForApi; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.annotation.RequiresApi; +import com.zeoflow.annotation.ForceInline; +import com.zeoflow.annotation.KeepForApi; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.annotation.RequiresApi; import java.util.ArrayList; import java.util.Arrays; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/utils/Preconditions.java b/flow-kit/src/main/java/com/zeoflow/core/utils/Preconditions.java similarity index 99% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/core/utils/Preconditions.java rename to flow-kit/src/main/java/com/zeoflow/core/utils/Preconditions.java index 48a038f..65b91bf 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/core/utils/Preconditions.java +++ b/flow-kit/src/main/java/com/zeoflow/core/utils/Preconditions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.zeoflow.flow.kit.core.utils; +package com.zeoflow.core.utils; import android.annotation.TargetApi; import android.os.Build; @@ -22,12 +22,12 @@ import android.os.Looper; import android.text.TextUtils; -import com.zeoflow.flow.kit.annotation.IntRange; -import com.zeoflow.flow.kit.annotation.KeepForApi; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.annotation.RequiresApi; -import com.zeoflow.flow.kit.annotation.RestrictTo; +import com.zeoflow.annotation.IntRange; +import com.zeoflow.annotation.KeepForApi; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.annotation.RequiresApi; +import com.zeoflow.annotation.RestrictTo; import java.util.Arrays; import java.util.Collection; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/CrashReporter.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/CrashReporter.java similarity index 80% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/CrashReporter.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/CrashReporter.java index 5ed9bb6..e0704f7 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/CrashReporter.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/CrashReporter.java @@ -1,12 +1,12 @@ -package com.zeoflow.flow.kit.crash.reporter; +package com.zeoflow.crash.reporter; import android.content.Intent; -import com.zeoflow.flow.kit.crash.reporter.ui.CrashReporterActivity; -import com.zeoflow.flow.kit.crash.reporter.utils.CrashReporterExceptionHandler; -import com.zeoflow.flow.kit.crash.reporter.utils.CrashUtil; +import com.zeoflow.crash.reporter.ui.CrashReporterActivity; +import com.zeoflow.crash.reporter.utils.CrashReporterExceptionHandler; +import com.zeoflow.crash.reporter.utils.CrashUtil; -import static com.zeoflow.flow.kit.initializer.ZeoFlowApp.getContext; +import static com.zeoflow.initializer.ZeoFlowApp.getContext; public class CrashReporter { diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/adapter/CrashLogAdapter.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/adapter/CrashLogAdapter.java similarity index 93% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/adapter/CrashLogAdapter.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/adapter/CrashLogAdapter.java index 7be407f..59c71d2 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/adapter/CrashLogAdapter.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/adapter/CrashLogAdapter.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.adapter; +package com.zeoflow.crash.reporter.adapter; import android.annotation.SuppressLint; import android.content.Context; @@ -11,8 +11,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.zeoflow.flow.kit.R; -import com.zeoflow.flow.kit.crash.reporter.ui.LogMessageActivity; -import com.zeoflow.flow.kit.crash.reporter.utils.FileUtils; +import com.zeoflow.crash.reporter.ui.LogMessageActivity; +import com.zeoflow.crash.reporter.utils.FileUtils; import org.jetbrains.annotations.NotNull; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/adapter/MainPagerAdapter.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/adapter/MainPagerAdapter.java similarity index 86% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/adapter/MainPagerAdapter.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/adapter/MainPagerAdapter.java index e1a1145..6a249ce 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/adapter/MainPagerAdapter.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/adapter/MainPagerAdapter.java @@ -1,11 +1,11 @@ -package com.zeoflow.flow.kit.crash.reporter.adapter; +package com.zeoflow.crash.reporter.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; -import com.zeoflow.flow.kit.crash.reporter.ui.CrashLogFragment; -import com.zeoflow.flow.kit.crash.reporter.ui.ExceptionLogFragment; +import com.zeoflow.crash.reporter.ui.CrashLogFragment; +import com.zeoflow.crash.reporter.ui.ExceptionLogFragment; /** * Created by bali on 11/08/17. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/CrashLogFragment.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/CrashLogFragment.java similarity index 88% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/CrashLogFragment.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/CrashLogFragment.java index b2155e8..cad8db3 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/CrashLogFragment.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/CrashLogFragment.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.ui; +package com.zeoflow.crash.reporter.ui; import android.content.Context; import android.os.Bundle; @@ -12,11 +12,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.zeoflow.flow.kit.R; -import com.zeoflow.flow.kit.compat.FragmentCore; -import com.zeoflow.flow.kit.crash.reporter.CrashReporter; -import com.zeoflow.flow.kit.crash.reporter.adapter.CrashLogAdapter; -import com.zeoflow.flow.kit.crash.reporter.utils.Constants; -import com.zeoflow.flow.kit.crash.reporter.utils.CrashUtil; +import com.zeoflow.compat.FragmentCore; +import com.zeoflow.crash.reporter.CrashReporter; +import com.zeoflow.crash.reporter.adapter.CrashLogAdapter; +import com.zeoflow.crash.reporter.utils.Constants; +import com.zeoflow.crash.reporter.utils.CrashUtil; import java.io.File; import java.util.ArrayList; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/CrashReporterActivity.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/CrashReporterActivity.java similarity index 82% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/CrashReporterActivity.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/CrashReporterActivity.java index b6889dc..e3bff25 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/CrashReporterActivity.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/CrashReporterActivity.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.ui; +package com.zeoflow.crash.reporter.ui; import android.content.Intent; import android.os.Bundle; @@ -7,13 +7,13 @@ import androidx.viewpager.widget.ViewPager; import com.zeoflow.flow.kit.R; -import com.zeoflow.flow.kit.compat.ActivityCore; -import com.zeoflow.flow.kit.crash.reporter.CrashReporter; -import com.zeoflow.flow.kit.crash.reporter.adapter.MainPagerAdapter; -import com.zeoflow.flow.kit.crash.reporter.utils.Constants; -import com.zeoflow.flow.kit.crash.reporter.utils.CrashUtil; -import com.zeoflow.flow.kit.crash.reporter.utils.FileUtils; -import com.zeoflow.flow.kit.crash.reporter.utils.SimplePageChangeListener; +import com.zeoflow.compat.ActivityCore; +import com.zeoflow.crash.reporter.CrashReporter; +import com.zeoflow.crash.reporter.adapter.MainPagerAdapter; +import com.zeoflow.crash.reporter.utils.Constants; +import com.zeoflow.crash.reporter.utils.CrashUtil; +import com.zeoflow.crash.reporter.utils.FileUtils; +import com.zeoflow.crash.reporter.utils.SimplePageChangeListener; import com.zeoflow.material.elements.tabs.TabLayout; import java.io.File; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/ExceptionLogFragment.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/ExceptionLogFragment.java similarity index 89% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/ExceptionLogFragment.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/ExceptionLogFragment.java index f473091..a93ede5 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/ExceptionLogFragment.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/ExceptionLogFragment.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.ui; +package com.zeoflow.crash.reporter.ui; import android.content.Context; import android.os.Bundle; @@ -13,11 +13,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.zeoflow.flow.kit.R; -import com.zeoflow.flow.kit.compat.FragmentCore; -import com.zeoflow.flow.kit.crash.reporter.CrashReporter; -import com.zeoflow.flow.kit.crash.reporter.adapter.CrashLogAdapter; -import com.zeoflow.flow.kit.crash.reporter.utils.Constants; -import com.zeoflow.flow.kit.crash.reporter.utils.CrashUtil; +import com.zeoflow.compat.FragmentCore; +import com.zeoflow.crash.reporter.CrashReporter; +import com.zeoflow.crash.reporter.adapter.CrashLogAdapter; +import com.zeoflow.crash.reporter.utils.Constants; +import com.zeoflow.crash.reporter.utils.CrashUtil; import java.io.File; import java.util.ArrayList; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/LogMessageActivity.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/LogMessageActivity.java similarity index 92% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/LogMessageActivity.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/LogMessageActivity.java index 1d2ce7a..5bdd5da 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/ui/LogMessageActivity.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/ui/LogMessageActivity.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.ui; +package com.zeoflow.crash.reporter.ui; import android.content.Intent; import android.graphics.Color; @@ -9,10 +9,10 @@ import androidx.appcompat.app.AppCompatActivity; import com.zeoflow.flow.kit.R; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.NotNull; -import com.zeoflow.flow.kit.crash.reporter.utils.AppUtils; -import com.zeoflow.flow.kit.crash.reporter.utils.FileUtils; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.NotNull; +import com.zeoflow.crash.reporter.utils.AppUtils; +import com.zeoflow.crash.reporter.utils.FileUtils; import com.zeoflow.stylar.AbstractStylarPlugin; import com.zeoflow.stylar.Stylar; import com.zeoflow.stylar.core.StylarTheme; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/AppUtils.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/AppUtils.java similarity index 86% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/AppUtils.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/AppUtils.java index 66f0de8..6340bc3 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/AppUtils.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/AppUtils.java @@ -1,10 +1,10 @@ -package com.zeoflow.flow.kit.crash.reporter.utils; +package com.zeoflow.crash.reporter.utils; import android.os.Build; -import static com.zeoflow.flow.kit.core.manage.PlatformInfo.getAppVersion; -import static com.zeoflow.flow.kit.core.manage.PlatformInfo.getDeviceID; -import static com.zeoflow.flow.kit.core.manage.PlatformInfo.timeZone; +import static com.zeoflow.core.manage.PlatformInfo.getAppVersion; +import static com.zeoflow.core.manage.PlatformInfo.getDeviceID; +import static com.zeoflow.core.manage.PlatformInfo.timeZone; public class AppUtils diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/Constants.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/Constants.java similarity index 90% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/Constants.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/Constants.java index 78a7ce0..af69c67 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/Constants.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/Constants.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.utils; +package com.zeoflow.crash.reporter.utils; /** * Created by bali on 15/08/17. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterException.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterException.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterException.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterException.java index 7eed162..6690bba 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterException.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterException.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.utils; +package com.zeoflow.crash.reporter.utils; public class CrashReporterException extends RuntimeException { diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterExceptionHandler.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterExceptionHandler.java similarity index 90% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterExceptionHandler.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterExceptionHandler.java index 3cb1bbc..689b560 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterExceptionHandler.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterExceptionHandler.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.utils; +package com.zeoflow.crash.reporter.utils; public class CrashReporterExceptionHandler implements Thread.UncaughtExceptionHandler { diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterNotInitializedException.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterNotInitializedException.java similarity index 96% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterNotInitializedException.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterNotInitializedException.java index 426e757..523d95a 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashReporterNotInitializedException.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashReporterNotInitializedException.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.utils; +package com.zeoflow.crash.reporter.utils; /** * Created by bali on 02/08/17. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashUtil.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashUtil.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashUtil.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashUtil.java index 8db8295..4a13031 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/CrashUtil.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/CrashUtil.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.utils; +package com.zeoflow.crash.reporter.utils; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -13,7 +13,7 @@ import androidx.core.content.ContextCompat; import com.zeoflow.flow.kit.R; -import com.zeoflow.flow.kit.crash.reporter.CrashReporter; +import com.zeoflow.crash.reporter.CrashReporter; import java.io.BufferedWriter; import java.io.File; @@ -27,8 +27,8 @@ import java.util.Objects; import static android.content.Context.NOTIFICATION_SERVICE; -import static com.zeoflow.flow.kit.crash.reporter.utils.Constants.CHANNEL_NOTIFICATION_ID; -import static com.zeoflow.flow.kit.initializer.ZeoFlowApp.getContext; +import static com.zeoflow.crash.reporter.utils.Constants.CHANNEL_NOTIFICATION_ID; +import static com.zeoflow.initializer.ZeoFlowApp.getContext; public class CrashUtil { diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/FileUtils.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/FileUtils.java similarity index 98% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/FileUtils.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/FileUtils.java index 4ed37dd..a9ef8eb 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/FileUtils.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/FileUtils.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.utils; +package com.zeoflow.crash.reporter.utils; import android.text.TextUtils; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/SimplePageChangeListener.java b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/SimplePageChangeListener.java similarity index 89% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/SimplePageChangeListener.java rename to flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/SimplePageChangeListener.java index bfd89c7..a1afd5a 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/crash/reporter/utils/SimplePageChangeListener.java +++ b/flow-kit/src/main/java/com/zeoflow/crash/reporter/utils/SimplePageChangeListener.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.crash.reporter.utils; +package com.zeoflow.crash.reporter.utils; import androidx.viewpager.widget.ViewPager; diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/DefPackage.java b/flow-kit/src/main/java/com/zeoflow/flow/kit/DefPackage.java new file mode 100644 index 0000000..1614f29 --- /dev/null +++ b/flow-kit/src/main/java/com/zeoflow/flow/kit/DefPackage.java @@ -0,0 +1,17 @@ +package com.zeoflow.flow.kit; + +class DefPackage +{ + + /** + * Empty Class + * Class created and maintained only to keep the flow of the package + * R.class is located under com.zeoflow.flow.kit.* + * flow-kit resources are located under com.zeoflow.* + */ + private DefPackage() + { + + } + +} diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowApp.java b/flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowApp.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowApp.java rename to flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowApp.java index 3b79542..2fe1887 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowApp.java +++ b/flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowApp.java @@ -1,4 +1,4 @@ -package com.zeoflow.flow.kit.initializer; +package com.zeoflow.initializer; import android.content.BroadcastReceiver; import android.content.Context; @@ -9,12 +9,12 @@ import androidx.collection.ArrayMap; -import com.zeoflow.flow.kit.annotation.GuardedBy; -import com.zeoflow.flow.kit.annotation.KeepForApi; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.RequiresApi; -import com.zeoflow.flow.kit.annotation.SuppressLint; -import com.zeoflow.flow.kit.annotation.VisibleForTesting; +import com.zeoflow.annotation.GuardedBy; +import com.zeoflow.annotation.KeepForApi; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.RequiresApi; +import com.zeoflow.annotation.SuppressLint; +import com.zeoflow.annotation.VisibleForTesting; import java.util.ArrayList; import java.util.Collections; @@ -23,9 +23,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import static com.zeoflow.flow.kit.os.UserManagerCompat.isUserUnlocked; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkState; -import static com.zeoflow.flow.kit.core.utils.Preconditions.requireNonNull; +import static com.zeoflow.os.UserManagerCompat.isUserUnlocked; +import static com.zeoflow.core.utils.Preconditions.checkState; +import static com.zeoflow.core.utils.Preconditions.requireNonNull; public class ZeoFlowApp { diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowInitProvider.java b/flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowInitProvider.java similarity index 90% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowInitProvider.java rename to flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowInitProvider.java index 7668585..57ed98c 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowInitProvider.java +++ b/flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowInitProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.zeoflow.flow.kit.initializer; +package com.zeoflow.initializer; import android.app.Application; import android.content.ContentProvider; @@ -22,11 +22,11 @@ import android.database.Cursor; import android.net.Uri; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.annotation.VisibleForTesting; -import com.zeoflow.flow.kit.core.utils.Preconditions; -import com.zeoflow.flow.kit.crash.reporter.CrashReporter; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.annotation.VisibleForTesting; +import com.zeoflow.core.utils.Preconditions; +import com.zeoflow.crash.reporter.CrashReporter; public class ZeoFlowInitProvider extends ContentProvider { @@ -36,7 +36,7 @@ public class ZeoFlowInitProvider extends ContentProvider */ @VisibleForTesting static final String EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY = - "com.zeoflow.flow.kit.initializer"; + "com.zeoflow.initializer"; private static final String TAG = "ZeoFlowInitProvider"; /** diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowOptions.java b/flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowOptions.java similarity index 92% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowOptions.java rename to flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowOptions.java index fc197ab..cc1d313 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/initializer/ZeoFlowOptions.java +++ b/flow-kit/src/main/java/com/zeoflow/initializer/ZeoFlowOptions.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.zeoflow.flow.kit.initializer; +package com.zeoflow.initializer; import android.content.Context; import android.text.TextUtils; -import com.zeoflow.flow.kit.annotation.KeepForApi; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; -import com.zeoflow.flow.kit.core.manage.StringResourceValueReader; -import com.zeoflow.flow.kit.core.utils.Objects; +import com.zeoflow.annotation.KeepForApi; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; +import com.zeoflow.core.manage.StringResourceValueReader; +import com.zeoflow.core.utils.Objects; -import static com.zeoflow.flow.kit.core.manage.StringsVerify.isEmptyOrWhitespace; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotEmpty; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkState; +import static com.zeoflow.core.manage.StringsVerify.isEmptyOrWhitespace; +import static com.zeoflow.core.utils.Preconditions.checkNotEmpty; +import static com.zeoflow.core.utils.Preconditions.checkState; /** * Configurable ZeoFlow options. diff --git a/flow-kit/src/main/java/com/zeoflow/j/Compressor.java b/flow-kit/src/main/java/com/zeoflow/j/Compressor.java new file mode 100644 index 0000000..1be8e08 --- /dev/null +++ b/flow-kit/src/main/java/com/zeoflow/j/Compressor.java @@ -0,0 +1,108 @@ +package com.zeoflow.j; + +import android.content.Context; +import android.graphics.Bitmap; + +import com.zeoflow.utils.ImageUtil; + +import java.io.File; +import java.io.IOException; +import java.util.concurrent.Callable; + +import io.reactivex.Flowable; + +import static com.zeoflow.initializer.ZeoFlowApp.getContext; + +public class Compressor +{ + //max width and height values of the compressed image is taken as 612x816 + private int maxWidth = 612; + private int maxHeight = 816; + private Bitmap.CompressFormat compressFormat = Bitmap.CompressFormat.JPEG; + private int quality = 80; + private String destinationDirectoryPath; + + public Compressor() + { + destinationDirectoryPath = getContext().getCacheDir().getPath() + File.separator + "images"; + } + + public Compressor setMaxWidth(int maxWidth) + { + this.maxWidth = maxWidth; + return this; + } + + public Compressor setMaxHeight(int maxHeight) + { + this.maxHeight = maxHeight; + return this; + } + + public Compressor setCompressFormat(Bitmap.CompressFormat compressFormat) + { + this.compressFormat = compressFormat; + return this; + } + + public Compressor setQuality(int quality) + { + this.quality = quality; + return this; + } + + public Compressor setDestinationDirectoryPath(String destinationDirectoryPath) + { + this.destinationDirectoryPath = destinationDirectoryPath; + return this; + } + + public File compressToFile(File imageFile) throws IOException + { + return compressToFile(imageFile, imageFile.getName()); + } + + public File compressToFile(File imageFile, String compressedFileName) throws IOException + { + return ImageUtil.compressImage(imageFile, maxWidth, maxHeight, compressFormat, quality, + destinationDirectoryPath + File.separator + compressedFileName); + } + + public Bitmap compressToBitmap(File imageFile) throws IOException + { + return ImageUtil.decodeSampledBitmapFromFile(imageFile, maxWidth, maxHeight); + } + + public Flowable compressToFileAsFlowable(final File imageFile) + { + return compressToFileAsFlowable(imageFile, imageFile.getName()); + } + + public Flowable compressToFileAsFlowable(final File imageFile, final String compressedFileName) + { + return Flowable.defer((Callable>) () -> + { + try + { + return Flowable.just(compressToFile(imageFile, compressedFileName)); + } catch (IOException e) + { + return Flowable.error(e); + } + }); + } + + public Flowable compressToBitmapAsFlowable(final File imageFile) + { + return Flowable.defer((Callable>) () -> + { + try + { + return Flowable.just(compressToBitmap(imageFile)); + } catch (IOException e) + { + return Flowable.error(e); + } + }); + } +} diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/AndroidLogAdapter.java b/flow-kit/src/main/java/com/zeoflow/logger/AndroidLogAdapter.java similarity index 75% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/AndroidLogAdapter.java rename to flow-kit/src/main/java/com/zeoflow/logger/AndroidLogAdapter.java index edebc2c..b2a43f1 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/AndroidLogAdapter.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/AndroidLogAdapter.java @@ -1,9 +1,9 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotNull; +import static com.zeoflow.core.utils.Preconditions.checkNotNull; public class AndroidLogAdapter implements LogAdapter { diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/CsvFormatStrategy.java b/flow-kit/src/main/java/com/zeoflow/logger/CsvFormatStrategy.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/CsvFormatStrategy.java rename to flow-kit/src/main/java/com/zeoflow/logger/CsvFormatStrategy.java index 21a68a3..3deefc7 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/CsvFormatStrategy.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/CsvFormatStrategy.java @@ -1,18 +1,18 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotNull; +import static com.zeoflow.core.utils.Preconditions.checkNotNull; /** * CSV formatted file logging for Android. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/DiskLogAdapter.java b/flow-kit/src/main/java/com/zeoflow/logger/DiskLogAdapter.java similarity index 79% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/DiskLogAdapter.java rename to flow-kit/src/main/java/com/zeoflow/logger/DiskLogAdapter.java index 499e165..b2a6809 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/DiskLogAdapter.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/DiskLogAdapter.java @@ -1,9 +1,9 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotNull; +import static com.zeoflow.core.utils.Preconditions.checkNotNull; /** * This is used to saves log messages to the disk. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/DiskLogStrategy.java b/flow-kit/src/main/java/com/zeoflow/logger/DiskLogStrategy.java similarity index 94% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/DiskLogStrategy.java rename to flow-kit/src/main/java/com/zeoflow/logger/DiskLogStrategy.java index 4209462..313a506 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/DiskLogStrategy.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/DiskLogStrategy.java @@ -1,17 +1,17 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; import android.os.Handler; import android.os.Looper; import android.os.Message; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotNull; +import static com.zeoflow.core.utils.Preconditions.checkNotNull; /** * Abstract class that takes care of background threading the file log operation on Android. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/FormatStrategy.java b/flow-kit/src/main/java/com/zeoflow/logger/FormatStrategy.java similarity index 64% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/FormatStrategy.java rename to flow-kit/src/main/java/com/zeoflow/logger/FormatStrategy.java index 89ea117..da9e1cf 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/FormatStrategy.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/FormatStrategy.java @@ -1,7 +1,7 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; /** * Used to determine how messages should be printed or saved. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogAdapter.java b/flow-kit/src/main/java/com/zeoflow/logger/LogAdapter.java similarity index 87% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogAdapter.java rename to flow-kit/src/main/java/com/zeoflow/logger/LogAdapter.java index 8f6e0d1..f79fd61 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogAdapter.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/LogAdapter.java @@ -1,7 +1,7 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; /** * Provides a common interface to emits logs through. This is a required contract for Logger. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogStrategy.java b/flow-kit/src/main/java/com/zeoflow/logger/LogStrategy.java similarity index 81% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogStrategy.java rename to flow-kit/src/main/java/com/zeoflow/logger/LogStrategy.java index 3520417..b840852 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogStrategy.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/LogStrategy.java @@ -1,7 +1,7 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; /** * Determines destination target for the logs such as Disk, Logcat etc. diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogcatLogStrategy.java b/flow-kit/src/main/java/com/zeoflow/logger/LogcatLogStrategy.java similarity index 72% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogcatLogStrategy.java rename to flow-kit/src/main/java/com/zeoflow/logger/LogcatLogStrategy.java index 129ea24..1c5cd0d 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LogcatLogStrategy.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/LogcatLogStrategy.java @@ -1,12 +1,12 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; import android.util.Log; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotNull; +import static com.zeoflow.core.utils.Preconditions.checkNotNull; /** * LogCat implementation for {@link LogStrategy} diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Logger.java b/flow-kit/src/main/java/com/zeoflow/logger/Logger.java similarity index 95% rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Logger.java rename to flow-kit/src/main/java/com/zeoflow/logger/Logger.java index a63a669..a10de8a 100644 --- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Logger.java +++ b/flow-kit/src/main/java/com/zeoflow/logger/Logger.java @@ -1,9 +1,9 @@ -package com.zeoflow.flow.kit.logger; +package com.zeoflow.logger; -import com.zeoflow.flow.kit.annotation.NonNull; -import com.zeoflow.flow.kit.annotation.Nullable; +import com.zeoflow.annotation.NonNull; +import com.zeoflow.annotation.Nullable; -import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotNull; +import static com.zeoflow.core.utils.Preconditions.checkNotNull; /** *
diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LoggerPrinter.java b/flow-kit/src/main/java/com/zeoflow/logger/LoggerPrinter.java
similarity index 91%
rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LoggerPrinter.java
rename to flow-kit/src/main/java/com/zeoflow/logger/LoggerPrinter.java
index f695922..cd0a18a 100644
--- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/LoggerPrinter.java
+++ b/flow-kit/src/main/java/com/zeoflow/logger/LoggerPrinter.java
@@ -1,7 +1,7 @@
-package com.zeoflow.flow.kit.logger;
+package com.zeoflow.logger;
 
-import com.zeoflow.flow.kit.annotation.NonNull;
-import com.zeoflow.flow.kit.annotation.Nullable;
+import com.zeoflow.annotation.NonNull;
+import com.zeoflow.annotation.Nullable;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -20,13 +20,13 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotNull;
-import static com.zeoflow.flow.kit.logger.Logger.ASSERT;
-import static com.zeoflow.flow.kit.logger.Logger.DEBUG;
-import static com.zeoflow.flow.kit.logger.Logger.ERROR;
-import static com.zeoflow.flow.kit.logger.Logger.INFO;
-import static com.zeoflow.flow.kit.logger.Logger.VERBOSE;
-import static com.zeoflow.flow.kit.logger.Logger.WARN;
+import static com.zeoflow.core.utils.Preconditions.checkNotNull;
+import static com.zeoflow.logger.Logger.ASSERT;
+import static com.zeoflow.logger.Logger.DEBUG;
+import static com.zeoflow.logger.Logger.ERROR;
+import static com.zeoflow.logger.Logger.INFO;
+import static com.zeoflow.logger.Logger.VERBOSE;
+import static com.zeoflow.logger.Logger.WARN;
 
 class LoggerPrinter implements Printer
 {
diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/PrettyFormatStrategy.java b/flow-kit/src/main/java/com/zeoflow/logger/PrettyFormatStrategy.java
similarity index 97%
rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/PrettyFormatStrategy.java
rename to flow-kit/src/main/java/com/zeoflow/logger/PrettyFormatStrategy.java
index b788e06..530cf0c 100644
--- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/PrettyFormatStrategy.java
+++ b/flow-kit/src/main/java/com/zeoflow/logger/PrettyFormatStrategy.java
@@ -1,9 +1,9 @@
-package com.zeoflow.flow.kit.logger;
+package com.zeoflow.logger;
 
-import com.zeoflow.flow.kit.annotation.NonNull;
-import com.zeoflow.flow.kit.annotation.Nullable;
+import com.zeoflow.annotation.NonNull;
+import com.zeoflow.annotation.Nullable;
 
-import static com.zeoflow.flow.kit.core.utils.Preconditions.checkNotNull;
+import static com.zeoflow.core.utils.Preconditions.checkNotNull;
 
 /**
  * Draws borders around the given log message along with additional information such as :
diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Printer.java b/flow-kit/src/main/java/com/zeoflow/logger/Printer.java
similarity index 89%
rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Printer.java
rename to flow-kit/src/main/java/com/zeoflow/logger/Printer.java
index ad72032..541b41c 100644
--- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Printer.java
+++ b/flow-kit/src/main/java/com/zeoflow/logger/Printer.java
@@ -1,7 +1,7 @@
-package com.zeoflow.flow.kit.logger;
+package com.zeoflow.logger;
 
-import com.zeoflow.flow.kit.annotation.NonNull;
-import com.zeoflow.flow.kit.annotation.Nullable;
+import com.zeoflow.annotation.NonNull;
+import com.zeoflow.annotation.Nullable;
 
 /**
  * A proxy interface to enable additional operations.
diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Utils.java b/flow-kit/src/main/java/com/zeoflow/logger/Utils.java
similarity index 92%
rename from flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Utils.java
rename to flow-kit/src/main/java/com/zeoflow/logger/Utils.java
index b306e89..102e34e 100644
--- a/flow-kit/src/main/java/com/zeoflow/flow/kit/logger/Utils.java
+++ b/flow-kit/src/main/java/com/zeoflow/logger/Utils.java
@@ -1,16 +1,16 @@
-package com.zeoflow.flow.kit.logger;
+package com.zeoflow.logger;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 
-import static com.zeoflow.flow.kit.logger.Logger.ASSERT;
-import static com.zeoflow.flow.kit.logger.Logger.DEBUG;
-import static com.zeoflow.flow.kit.logger.Logger.ERROR;
-import static com.zeoflow.flow.kit.logger.Logger.INFO;
-import static com.zeoflow.flow.kit.logger.Logger.VERBOSE;
-import static com.zeoflow.flow.kit.logger.Logger.WARN;
+import static com.zeoflow.logger.Logger.ASSERT;
+import static com.zeoflow.logger.Logger.DEBUG;
+import static com.zeoflow.logger.Logger.ERROR;
+import static com.zeoflow.logger.Logger.INFO;
+import static com.zeoflow.logger.Logger.VERBOSE;
+import static com.zeoflow.logger.Logger.WARN;
 
 /**
  * Provides convenient methods to some common operations
diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/model/Extra.java b/flow-kit/src/main/java/com/zeoflow/model/Extra.java
similarity index 91%
rename from flow-kit/src/main/java/com/zeoflow/flow/kit/model/Extra.java
rename to flow-kit/src/main/java/com/zeoflow/model/Extra.java
index 2616556..9a5a8c9 100644
--- a/flow-kit/src/main/java/com/zeoflow/flow/kit/model/Extra.java
+++ b/flow-kit/src/main/java/com/zeoflow/model/Extra.java
@@ -1,4 +1,4 @@
-package com.zeoflow.flow.kit.model;
+package com.zeoflow.model;
 
 import com.zeoflow.zson.JsonElement;
 
diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/os/UserManagerCompat.java b/flow-kit/src/main/java/com/zeoflow/os/UserManagerCompat.java
similarity index 94%
rename from flow-kit/src/main/java/com/zeoflow/flow/kit/os/UserManagerCompat.java
rename to flow-kit/src/main/java/com/zeoflow/os/UserManagerCompat.java
index c54e378..c99cbd4 100644
--- a/flow-kit/src/main/java/com/zeoflow/flow/kit/os/UserManagerCompat.java
+++ b/flow-kit/src/main/java/com/zeoflow/os/UserManagerCompat.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.zeoflow.flow.kit.os;
+package com.zeoflow.os;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.UserManager;
 
-import com.zeoflow.flow.kit.annotation.NonNull;
+import com.zeoflow.annotation.NonNull;
 
 /**
  * Helper for accessing features in {@link UserManager} in a backwards compatible
diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/utils/ContentCompat.java b/flow-kit/src/main/java/com/zeoflow/utils/ContentCompat.java
similarity index 99%
rename from flow-kit/src/main/java/com/zeoflow/flow/kit/utils/ContentCompat.java
rename to flow-kit/src/main/java/com/zeoflow/utils/ContentCompat.java
index 30f57ed..3bbd9f1 100644
--- a/flow-kit/src/main/java/com/zeoflow/flow/kit/utils/ContentCompat.java
+++ b/flow-kit/src/main/java/com/zeoflow/utils/ContentCompat.java
@@ -1,4 +1,4 @@
-package com.zeoflow.flow.kit.utils;
+package com.zeoflow.utils;
 
 import android.accounts.AccountManager;
 import android.annotation.SuppressLint;
@@ -136,7 +136,7 @@
 import static android.content.Context.WINDOW_SERVICE;
 import static android.os.Build.VERSION.SDK_INT;
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
-import static com.zeoflow.flow.kit.initializer.ZeoFlowApp.getContext;
+import static com.zeoflow.initializer.ZeoFlowApp.getContext;
 
 public class ContentCompat
 {
diff --git a/flow-kit/src/main/java/com/zeoflow/flow/kit/utils/AssetsHelper.java b/flow-kit/src/main/java/com/zeoflow/utils/FileUtil.java
similarity index 94%
rename from flow-kit/src/main/java/com/zeoflow/flow/kit/utils/AssetsHelper.java
rename to flow-kit/src/main/java/com/zeoflow/utils/FileUtil.java
index d74eda9..e9366a0 100644
--- a/flow-kit/src/main/java/com/zeoflow/flow/kit/utils/AssetsHelper.java
+++ b/flow-kit/src/main/java/com/zeoflow/utils/FileUtil.java
@@ -1,4 +1,4 @@
-package com.zeoflow.flow.kit.utils;
+package com.zeoflow.utils;
 
 import android.content.res.AssetManager;
 
@@ -7,7 +7,7 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
-public class AssetsHelper
+public class FileUtil
 {
 
     public static String readFile(AssetManager assets, String fileName)
diff --git a/flow-kit/src/main/java/com/zeoflow/utils/ImageUtil.java b/flow-kit/src/main/java/com/zeoflow/utils/ImageUtil.java
new file mode 100644
index 0000000..832c160
--- /dev/null
+++ b/flow-kit/src/main/java/com/zeoflow/utils/ImageUtil.java
@@ -0,0 +1,103 @@
+package com.zeoflow.utils;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
+import android.media.ExifInterface;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ImageUtil
+{
+
+    private ImageUtil()
+    {
+
+    }
+
+    public static File compressImage(File imageFile, int reqWidth, int reqHeight, Bitmap.CompressFormat compressFormat, int quality, String destinationPath) throws IOException
+    {
+        FileOutputStream fileOutputStream = null;
+        File file = new File(destinationPath).getParentFile();
+        assert file != null;
+        if (!file.exists())
+        {
+            file.mkdirs();
+        }
+        try
+        {
+            fileOutputStream = new FileOutputStream(destinationPath);
+            // write the compressed bitmap at the destination specified by destinationPath.
+            decodeSampledBitmapFromFile(imageFile, reqWidth, reqHeight).compress(compressFormat, quality, fileOutputStream);
+        } finally
+        {
+            if (fileOutputStream != null)
+            {
+                fileOutputStream.flush();
+                fileOutputStream.close();
+            }
+        }
+
+        return new File(destinationPath);
+    }
+
+    public static Bitmap decodeSampledBitmapFromFile(File imageFile, int reqWidth, int reqHeight) throws IOException
+    {
+        // First decode with inJustDecodeBounds=true to check dimensions
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(imageFile.getAbsolutePath(), options);
+
+        // Calculate inSampleSize
+        options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
+
+        // Decode bitmap with inSampleSize set
+        options.inJustDecodeBounds = false;
+
+        Bitmap scaledBitmap = BitmapFactory.decodeFile(imageFile.getAbsolutePath(), options);
+
+        //check the rotation of the image and display it properly
+        ExifInterface exif;
+        exif = new ExifInterface(imageFile.getAbsolutePath());
+        int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0);
+        Matrix matrix = new Matrix();
+        if (orientation == 6)
+        {
+            matrix.postRotate(90);
+        } else if (orientation == 3)
+        {
+            matrix.postRotate(180);
+        } else if (orientation == 8)
+        {
+            matrix.postRotate(270);
+        }
+        scaledBitmap = Bitmap.createBitmap(scaledBitmap, 0, 0, scaledBitmap.getWidth(), scaledBitmap.getHeight(), matrix, true);
+        return scaledBitmap;
+    }
+
+    public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight)
+    {
+        // Raw height and width of image
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth)
+        {
+
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / inSampleSize) >= reqHeight && (halfWidth / inSampleSize) >= reqWidth)
+            {
+                inSampleSize *= 2;
+            }
+        }
+
+        return inSampleSize;
+    }
+}
diff --git a/flow-kit/src/main/res/layout/crash_reporter_activity.xml b/flow-kit/src/main/res/layout/crash_reporter_activity.xml
index e4511f3..1f2dece 100644
--- a/flow-kit/src/main/res/layout/crash_reporter_activity.xml
+++ b/flow-kit/src/main/res/layout/crash_reporter_activity.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#ffffff"
-    tools:context=".crash.reporter.ui.CrashReporterActivity">
+    tools:context="com.zeoflow.crash.reporter.ui.CrashReporterActivity">