Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 381dd9e

Browse files
committed
minor changes
1 parent ae1c082 commit 381dd9e

File tree

7 files changed

+79
-163
lines changed

7 files changed

+79
-163
lines changed

app/src/main/res/layout/fragment_nothing_tab.xml

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,4 @@
3333

3434
</de.dlyt.yanndroid.oneui.view.NestedScrollView>
3535

36-
</de.dlyt.yanndroid.oneui.layout.SwipeRefreshLayout>
37-
38-
<!--
39-
<?xml version="1.0" encoding="utf-8"?>
40-
<de.dlyt.yanndroid.oneui.view.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
41-
xmlns:app="http://schemas.android.com/apk/res-auto"
42-
android:layout_width="match_parent"
43-
android:layout_height="match_parent"
44-
android:background="@color/item_background_color"
45-
android:fillViewport="true"
46-
android:scrollbars="vertical"
47-
app:layout_behavior="@string/sesl_appbar_scrolling_view_behavior">
48-
49-
<LinearLayout
50-
android:id="@+id/nothing_layout"
51-
android:layout_width="match_parent"
52-
android:layout_height="match_parent"
53-
android:layout_gravity="center"
54-
android:gravity="center"
55-
android:orientation="vertical">
56-
57-
<com.google.android.material.textview.MaterialTextView
58-
style="?textAppearanceListItem"
59-
android:layout_width="wrap_content"
60-
android:layout_height="wrap_content"
61-
android:text="@string/nothing"
62-
android:textAlignment="viewStart"
63-
android:textSize="18sp" />
64-
65-
</LinearLayout>
66-
67-
</de.dlyt.yanndroid.oneui.view.NestedScrollView>
68-
-->
36+
</de.dlyt.yanndroid.oneui.layout.SwipeRefreshLayout>

yanndroid/oneui/src/main/java/androidx/Styleable.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/layout/SwipeRefreshLayout.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,21 +428,17 @@ private void startProgressAlphaMaxAnimation() {
428428
}
429429

430430
private Animation startAlphaAnimation(final int i, final int i2) {
431-
/*AnonymousClass4 r0 = new Animation() {
432-
*//* class androidx.swiperefreshlayout.widget.SwipeRefreshLayout.AnonymousClass4 *//*
433-
431+
Animation r0 = new Animation() {
434432
public void applyTransformation(float f, Transformation transformation) {
435433
CircularProgressDrawable circularProgressDrawable = SwipeRefreshLayout.this.mProgress;
436-
int i = i;
437434
circularProgressDrawable.setAlpha((int) (((float) i) + (((float) (i2 - i)) * f)));
438435
}
439436
};
440437
r0.setDuration(300);
441438
this.mCircleView.setAnimationListener(null);
442439
this.mCircleView.clearAnimation();
443440
this.mCircleView.startAnimation(r0);
444-
return r0;*/
445-
return null;
441+
return r0;
446442
}
447443

448444
@Deprecated

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/view/OptionButton.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import android.widget.ImageView;
1111
import android.widget.LinearLayout;
1212

13-
import androidx.Styleable;
1413
import androidx.annotation.IntDef;
1514
import androidx.annotation.Nullable;
1615
import androidx.appcompat.util.SeslMisc;
@@ -54,12 +53,8 @@ public OptionButton(Context context, @Nullable AttributeSet attrs) {
5453
mCounter = attr.getInteger(R.styleable.OptionButton_counter, 0);
5554
attr.recycle();
5655

57-
58-
TypedArray switchbar_attr = context.obtainStyledAttributes(attrs, Styleable.styleable.SeslSwitchBar, R.attr.seslSwitchBarStyle, 0);
59-
mOnTextColor = switchbar_attr.getColor(Styleable.styleable.SeslSwitchBar_seslSwitchBarTextActivatedColor, ContextCompat.getColor(getContext(), R.color.sesl_switchbar_text_color));
60-
mOffTextColor = switchbar_attr.getColor(Styleable.styleable.SeslSwitchBar_seslSwitchBarTextColor, ContextCompat.getColor(getContext(), R.color.sesl_switchbar_text_color));
61-
switchbar_attr.recycle();
62-
56+
mOnTextColor = ContextCompat.getColor(getContext(), R.color.sesl_switchbar_text_color);
57+
mOffTextColor = ContextCompat.getColor(getContext(), R.color.sesl_switchbar_off_text_color);
6358

6459
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
6560
inflater.inflate(R.layout.samsung_drawer_optionbutton, this, true);

0 commit comments

Comments
 (0)