TouchInstinct
/
RoboSwag
306
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/amount-edittext' into amount-edittext

This commit is contained in:
Vladimir 2020-08-27 15:40:08 +05:00
parent 55d71bf96b b9360231be
commit 2b7fb69320
9 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pagination/src/main/res/layout/view_pagination.xml
View File

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ru.touchin.widget.Switcher
<ru.touchin.roboswag.views.widget.Switcher
android:id="@+id/switcher"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -28,6 +28,6 @@
android:layout_height="match_parent"
android:clipToPadding="false" />
</ru.touchin.widget.Switcher>
</ru.touchin.roboswag.views.widget.Switcher>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

3
views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java → views/src/main/java/ru/touchin/roboswag/views/MaterialLoadingBar.java
View File

@ -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.

2
views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java → views/src/main/java/ru/touchin/roboswag/views/MaterialProgressDrawable.java
View File

@ -17,7 +17,7 @@
*
*/
package ru.touchin.roboswag.components.views;
package ru.touchin.roboswag.views;
import android.content.Context;
import android.graphics.Canvas;

6
views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java → views/src/main/java/ru/touchin/roboswag/views/TypefacedEditText.java
View File

@ -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;
/**

6
views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java → views/src/main/java/ru/touchin/roboswag/views/TypefacedTextView.java
View File

@ -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;
/**

2
views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java → views/src/main/java/ru/touchin/roboswag/views/internal/AttributesUtils.java
View File

@ -17,7 +17,7 @@
*
*/
package ru.touchin.roboswag.components.views.internal;
package ru.touchin.roboswag.views.internal;
import android.content.Context;
import android.content.res.TypedArray;

6
views/src/main/java/ru/touchin/widget/AmountWithDecimalDecorator.kt → views/src/main/java/ru/touchin/roboswag/views/widget/AmountWithDecimalDecorator.kt
View File

@ -1,4 +1,4 @@
package ru.touchin.widget
package ru.touchin.roboswag.views.widget
import android.widget.EditText
import androidx.core.widget.doOnTextChanged
@ -51,9 +51,7 @@ class AmountWithDecimalDecorator(
val cursorPosition = editText.selectionStart
try {
var currentText = text
possibleDecimalSeparators.forEach {
currentText = currentText.replace(it, decimalSeparator)
}
possibleDecimalSeparators.forEach { currentText = currentText.replace(it, decimalSeparator) }
if (isTextFormatIncorrect(currentText)) {
setTextWhenNewInputIncorrect(currentText, cursorPosition)

2
views/src/main/java/ru/touchin/widget/LoadingContentView.kt → views/src/main/java/ru/touchin/roboswag/views/widget/LoadingContentView.kt
View File

@ -1,4 +1,4 @@
package ru.touchin.widget
package ru.touchin.roboswag.views.widget
import android.content.Context
import android.util.AttributeSet

2
views/src/main/java/ru/touchin/widget/Switcher.java → views/src/main/java/ru/touchin/roboswag/views/widget/Switcher.java
View File

@ -1,4 +1,4 @@
package ru.touchin.widget;
package ru.touchin.roboswag.views.widget;
import android.content.Context;
import android.content.res.TypedArray;