From 7b58d602c9cd070cb27d9366cdb7195f9079eeae Mon Sep 17 00:00:00 2001 From: Vladimir Date: Thu, 27 Aug 2020 15:05:52 +0500 Subject: [PATCH] renamed packages --- pagination/src/main/res/layout/view_pagination.xml | 4 ++-- .../roboswag/{components => }/views/MaterialLoadingBar.java | 3 ++- .../{components => }/views/MaterialProgressDrawable.java | 2 +- .../roboswag/{components => }/views/TypefacedEditText.java | 6 ++++-- .../roboswag/{components => }/views/TypefacedTextView.java | 6 ++++-- .../{components => }/views/internal/AttributesUtils.java | 0 .../views}/widget/AmountWithDecimalDecorator.kt | 2 +- .../{ => roboswag/views}/widget/LoadingContentView.kt | 2 +- .../ru/touchin/{ => roboswag/views}/widget/Switcher.java | 2 +- 9 files changed, 16 insertions(+), 11 deletions(-) rename views/src/main/java/ru/touchin/roboswag/{components => }/views/MaterialLoadingBar.java (98%) rename views/src/main/java/ru/touchin/roboswag/{components => }/views/MaterialProgressDrawable.java (99%) rename views/src/main/java/ru/touchin/roboswag/{components => }/views/TypefacedEditText.java (98%) rename views/src/main/java/ru/touchin/roboswag/{components => }/views/TypefacedTextView.java (99%) rename views/src/main/java/ru/touchin/roboswag/{components => }/views/internal/AttributesUtils.java (100%) rename views/src/main/java/ru/touchin/{ => roboswag/views}/widget/AmountWithDecimalDecorator.kt (99%) rename views/src/main/java/ru/touchin/{ => roboswag/views}/widget/LoadingContentView.kt (98%) rename views/src/main/java/ru/touchin/{ => roboswag/views}/widget/Switcher.java (98%) diff --git a/pagination/src/main/res/layout/view_pagination.xml b/pagination/src/main/res/layout/view_pagination.xml index b022ded..a930418 100644 --- a/pagination/src/main/res/layout/view_pagination.xml +++ b/pagination/src/main/res/layout/view_pagination.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -28,6 +28,6 @@ android:layout_height="match_parent" android:clipToPadding="false" /> - + diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java b/views/src/main/java/ru/touchin/roboswag/views/MaterialLoadingBar.java similarity index 98% rename from views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java rename to views/src/main/java/ru/touchin/roboswag/views/MaterialLoadingBar.java index 2592c8a..83b5cfa 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java +++ b/views/src/main/java/ru/touchin/roboswag/views/MaterialLoadingBar.java @@ -17,7 +17,7 @@ * */ -package ru.touchin.roboswag.components.views; +package ru.touchin.roboswag.views; import android.content.Context; import android.content.res.TypedArray; @@ -30,6 +30,7 @@ import android.util.AttributeSet; import android.util.TypedValue; import ru.touchin.roboswag.components.utils.UiUtils; +import ru.touchin.roboswag.components.views.R; /** * Created by Ilia Kurtov on 07/12/2016. diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java b/views/src/main/java/ru/touchin/roboswag/views/MaterialProgressDrawable.java similarity index 99% rename from views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java rename to views/src/main/java/ru/touchin/roboswag/views/MaterialProgressDrawable.java index 667a757..b102bb3 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java +++ b/views/src/main/java/ru/touchin/roboswag/views/MaterialProgressDrawable.java @@ -17,7 +17,7 @@ * */ -package ru.touchin.roboswag.components.views; +package ru.touchin.roboswag.views; import android.content.Context; import android.graphics.Canvas; diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java b/views/src/main/java/ru/touchin/roboswag/views/TypefacedEditText.java similarity index 98% rename from views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java rename to views/src/main/java/ru/touchin/roboswag/views/TypefacedEditText.java index 6730704..5253fdf 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java +++ b/views/src/main/java/ru/touchin/roboswag/views/TypefacedEditText.java @@ -17,7 +17,7 @@ * */ -package ru.touchin.roboswag.components.views; +package ru.touchin.roboswag.views; import android.content.Context; import android.content.res.TypedArray; @@ -40,7 +40,9 @@ import java.util.ArrayList; import java.util.List; import ru.touchin.defaults.DefaultTextWatcher; -import ru.touchin.roboswag.components.views.internal.AttributesUtils; +import ru.touchin.roboswag.components.views.BuildConfig; +import ru.touchin.roboswag.components.views.R; +import ru.touchin.roboswag.views.internal.AttributesUtils; import ru.touchin.roboswag.core.log.Lc; /** diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java b/views/src/main/java/ru/touchin/roboswag/views/TypefacedTextView.java similarity index 99% rename from views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java rename to views/src/main/java/ru/touchin/roboswag/views/TypefacedTextView.java index 8bce61a..8eaaf4d 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java +++ b/views/src/main/java/ru/touchin/roboswag/views/TypefacedTextView.java @@ -17,7 +17,7 @@ * */ -package ru.touchin.roboswag.components.views; +package ru.touchin.roboswag.views; import android.annotation.SuppressLint; import android.content.Context; @@ -34,7 +34,9 @@ import java.util.ArrayList; import java.util.List; import ru.touchin.roboswag.components.utils.UiUtils; -import ru.touchin.roboswag.components.views.internal.AttributesUtils; +import ru.touchin.roboswag.components.views.BuildConfig; +import ru.touchin.roboswag.components.views.R; +import ru.touchin.roboswag.views.internal.AttributesUtils; import ru.touchin.roboswag.core.log.Lc; /** diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java b/views/src/main/java/ru/touchin/roboswag/views/internal/AttributesUtils.java similarity index 100% rename from views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java rename to views/src/main/java/ru/touchin/roboswag/views/internal/AttributesUtils.java diff --git a/views/src/main/java/ru/touchin/widget/AmountWithDecimalDecorator.kt b/views/src/main/java/ru/touchin/roboswag/views/widget/AmountWithDecimalDecorator.kt similarity index 99% rename from views/src/main/java/ru/touchin/widget/AmountWithDecimalDecorator.kt rename to views/src/main/java/ru/touchin/roboswag/views/widget/AmountWithDecimalDecorator.kt index bd95453..f8e3c52 100644 --- a/views/src/main/java/ru/touchin/widget/AmountWithDecimalDecorator.kt +++ b/views/src/main/java/ru/touchin/roboswag/views/widget/AmountWithDecimalDecorator.kt @@ -1,4 +1,4 @@ -package ru.touchin.widget +package ru.touchin.roboswag.views.widget import android.widget.EditText import androidx.core.widget.doOnTextChanged diff --git a/views/src/main/java/ru/touchin/widget/LoadingContentView.kt b/views/src/main/java/ru/touchin/roboswag/views/widget/LoadingContentView.kt similarity index 98% rename from views/src/main/java/ru/touchin/widget/LoadingContentView.kt rename to views/src/main/java/ru/touchin/roboswag/views/widget/LoadingContentView.kt index f079bf5..0409fb3 100644 --- a/views/src/main/java/ru/touchin/widget/LoadingContentView.kt +++ b/views/src/main/java/ru/touchin/roboswag/views/widget/LoadingContentView.kt @@ -1,4 +1,4 @@ -package ru.touchin.widget +package ru.touchin.roboswag.views.widget import android.content.Context import android.util.AttributeSet diff --git a/views/src/main/java/ru/touchin/widget/Switcher.java b/views/src/main/java/ru/touchin/roboswag/views/widget/Switcher.java similarity index 98% rename from views/src/main/java/ru/touchin/widget/Switcher.java rename to views/src/main/java/ru/touchin/roboswag/views/widget/Switcher.java index 25be341..dd0ab2a 100644 --- a/views/src/main/java/ru/touchin/widget/Switcher.java +++ b/views/src/main/java/ru/touchin/roboswag/views/widget/Switcher.java @@ -1,4 +1,4 @@ -package ru.touchin.widget; +package ru.touchin.roboswag.views.widget; import android.content.Context; import android.content.res.TypedArray;