diff --git a/views/src/main/java/ru/touchin/roboswag/views/MaterialLoadingBar.java b/views/src/main/java/ru/touchin/roboswag/views/MaterialLoadingBar.java index 83b5cfa..1b495b2 100644 --- a/views/src/main/java/ru/touchin/roboswag/views/MaterialLoadingBar.java +++ b/views/src/main/java/ru/touchin/roboswag/views/MaterialLoadingBar.java @@ -30,7 +30,6 @@ 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/views/TypefacedEditText.java b/views/src/main/java/ru/touchin/roboswag/views/TypefacedEditText.java index 5253fdf..3d38246 100644 --- a/views/src/main/java/ru/touchin/roboswag/views/TypefacedEditText.java +++ b/views/src/main/java/ru/touchin/roboswag/views/TypefacedEditText.java @@ -40,8 +40,8 @@ import java.util.ArrayList; import java.util.List; import ru.touchin.defaults.DefaultTextWatcher; -import ru.touchin.roboswag.components.views.BuildConfig; -import ru.touchin.roboswag.components.views.R; +import ru.touchin.roboswag.views.BuildConfig; +import ru.touchin.roboswag.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/views/TypefacedTextView.java b/views/src/main/java/ru/touchin/roboswag/views/TypefacedTextView.java index 8eaaf4d..ea849ad 100644 --- a/views/src/main/java/ru/touchin/roboswag/views/TypefacedTextView.java +++ b/views/src/main/java/ru/touchin/roboswag/views/TypefacedTextView.java @@ -34,8 +34,8 @@ import java.util.ArrayList; import java.util.List; import ru.touchin.roboswag.components.utils.UiUtils; -import ru.touchin.roboswag.components.views.BuildConfig; -import ru.touchin.roboswag.components.views.R; +import ru.touchin.roboswag.views.BuildConfig; +import ru.touchin.roboswag.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/views/widget/LoadingContentView.kt b/views/src/main/java/ru/touchin/roboswag/views/widget/LoadingContentView.kt index 0409fb3..72c5f71 100644 --- a/views/src/main/java/ru/touchin/roboswag/views/widget/LoadingContentView.kt +++ b/views/src/main/java/ru/touchin/roboswag/views/widget/LoadingContentView.kt @@ -6,8 +6,8 @@ import android.view.LayoutInflater import androidx.core.content.withStyledAttributes import ru.touchin.extensions.observable import ru.touchin.extensions.setOnRippleClickListener -import ru.touchin.roboswag.components.views.R -import ru.touchin.roboswag.components.views.databinding.ProgressViewBinding +import ru.touchin.roboswag.views.databinding.ProgressViewBinding +import ru.touchin.roboswag.views.R import kotlin.properties.Delegates //TODO make customizable views list and views style diff --git a/views/src/main/java/ru/touchin/roboswag/views/widget/Switcher.java b/views/src/main/java/ru/touchin/roboswag/views/widget/Switcher.java index dd0ab2a..949f993 100644 --- a/views/src/main/java/ru/touchin/roboswag/views/widget/Switcher.java +++ b/views/src/main/java/ru/touchin/roboswag/views/widget/Switcher.java @@ -15,7 +15,7 @@ import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; -import ru.touchin.roboswag.components.views.R; +import ru.touchin.roboswag.views.R; public class Switcher extends FrameLayout {