Skip to content

Commit da863ad

Browse files
committed
Merge branch 'refactor'
2 parents 3120dc4 + 19a1c21 commit da863ad

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.codeerow.databinding.android.core" />
1+
<manifest package="com.codeerow.databinding.androidx.core.ktx" />
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.codeerow.databinding" />
1+
<manifest package="com.codeerow.databinding.androidx.core" />

androidx-core/src/main/java/com/codeerow/databinding/androidx/core/bindings/seekbar/ProgressBinding.java

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public ProgressBinding(SeekBar view, LifecycleOwner lifecycleOwner, MutableLiveD
3838

3939
@Override
4040
public void execute() {
41+
SeekBar view = viewRef.get();
42+
4143
value.observe(this.lifecycleOwner, new Observer<Integer>() {
4244
SeekBar view = viewRef.get();
4345

@@ -46,26 +48,26 @@ public void onChanged(Integer currentValue) {
4648
Integer previousValue = view.getProgress();
4749
if (previousValue.equals(currentValue)) return;
4850
else view.setProgress(currentValue);
51+
}
52+
});
4953

50-
if (twoWay) {
51-
view.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
52-
@Override
53-
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
54-
value.setValue(progress);
55-
}
54+
if (twoWay) {
55+
view.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
56+
@Override
57+
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
58+
value.setValue(progress);
59+
}
5660

57-
@Override
58-
public void onStartTrackingTouch(SeekBar seekBar) {
61+
@Override
62+
public void onStartTrackingTouch(SeekBar seekBar) {
5963

60-
}
64+
}
6165

62-
@Override
63-
public void onStopTrackingTouch(SeekBar seekBar) {
66+
@Override
67+
public void onStopTrackingTouch(SeekBar seekBar) {
6468

65-
}
66-
});
6769
}
68-
}
69-
});
70+
});
71+
}
7072
}
7173
}

androidx-core/src/main/java/com/codeerow/databinding/androidx/core/bindings/textview/TextBinding.java

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,34 @@ public TextBinding(TextView view, LifecycleOwner lifecycleOwner, MutableLiveData
4040

4141
@Override
4242
public void execute() {
43+
TextView view = viewRef.get();
4344
value.observe(lifecycleOwner, new Observer<String>() {
45+
4446
TextView view = viewRef.get();
4547

4648
@Override
4749
public void onChanged(String currentValue) {
4850
String previousValue = view.getText().toString();
4951
if (previousValue.equals(currentValue)) return;
5052
view.setText(currentValue);
51-
52-
if (twoWay) {
53-
view.addTextChangedListener(new TextWatcher() {
54-
@Override
55-
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
56-
}
57-
58-
@Override
59-
public void onTextChanged(CharSequence s, int start, int before, int count) {
60-
}
61-
62-
@Override
63-
public void afterTextChanged(Editable text) {
64-
value.setValue(text == null ? "" : text.toString());
65-
}
66-
});
67-
}
6853
}
6954
});
55+
56+
if (twoWay) {
57+
view.addTextChangedListener(new TextWatcher() {
58+
@Override
59+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
60+
}
61+
62+
@Override
63+
public void onTextChanged(CharSequence s, int start, int before, int count) {
64+
}
65+
66+
@Override
67+
public void afterTextChanged(Editable text) {
68+
value.setValue(text == null ? "" : text.toString());
69+
}
70+
});
71+
}
7072
}
7173
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.codeerow.databinding" />
1+
<manifest package="com.codeerow.databinding.androidx.recyclerview.ktx" />
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.codeerow.androidx_recyclerview" />
1+
<manifest package="com.codeerow.databinding.androidx.recyclerview" />

0 commit comments

Comments
 (0)