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

Commit c8094d4

Browse files
YanndroidYanndroid
committed
toolbar long title fix, started adding OneUI4 stuff
1 parent 381dd9e commit c8094d4

File tree

41 files changed

+712
-24
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+712
-24
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:icon="@mipmap/ic_launcher"
88
android:label="@string/app_name"
99
android:supportsRtl="true"
10-
android:theme="@style/OneUITheme">
10+
android:theme="@style/OneUI4Theme">
1111

1212
<meta-data
1313
android:name="SamsungBasicInteraction"
@@ -22,13 +22,13 @@
2222
<activity android:name=".SwitchBarActivity" />
2323
<activity
2424
android:name=".AboutActivity"
25-
android:theme="@style/OneUIAboutTheme" />
25+
android:theme="@style/OneUI4AboutTheme" />
2626
<activity
2727
android:name=".MainActivity"
2828
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" />
2929
<activity
3030
android:name=".SplashActivity"
31-
android:theme="@style/OneUISplashTheme">
31+
android:theme="@style/OneUI4SplashTheme">
3232
<intent-filter>
3333
<action android:name="android.intent.action.MAIN" />
3434

‎app/src/main/res/layout/fragment_views_tab.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636

3737
<ProgressBar
38-
style="@style/ProgressBarStyle.Horizontal"
38+
style="?android:progressBarStyleHorizontal"
3939
android:layout_width="match_parent"
4040
android:layout_height="wrap_content"
4141
android:indeterminate="true" />
@@ -50,22 +50,22 @@
5050
android:orientation="horizontal">
5151

5252
<ProgressBar
53-
style="@style/ProgressBarStyle.Circle.Large"
53+
style="?android:progressBarStyleLarge"
5454
android:layout_width="wrap_content"
5555
android:layout_height="wrap_content" />
5656

5757
<ProgressBar
58-
style="@style/ProgressBarStyle.Circle"
58+
style="?android:progressBarStyle"
5959
android:layout_width="wrap_content"
6060
android:layout_height="wrap_content" />
6161

6262
<ProgressBar
63-
style="@style/ProgressBarStyle.Circle.Small"
63+
style="?android:progressBarStyleSmall"
6464
android:layout_width="wrap_content"
6565
android:layout_height="wrap_content" />
6666

6767
<ProgressBar
68-
style="@style/ProgressBarStyle.Title"
68+
style="?android:progressBarStyleSmallTitle"
6969
android:layout_width="wrap_content"
7070
android:layout_height="wrap_content" />
7171

‎yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/view/SwitchBar.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ public SwitchBar(Context context, AttributeSet attributeSet, int i, int i2) {
7171
super(context, attributeSet, i, i2);
7272
this.mSwitchChangeListeners = new ArrayList();
7373
this.mSessionDesc = null;
74-
LayoutInflater.from(context).inflate(R.layout.samsung_switchbar, this);
74+
75+
TypedArray isOneUI4 = context.getTheme().obtainStyledAttributes(new int[]{R.attr.isOneUI4});
76+
LayoutInflater.from(context).inflate(isOneUI4.getBoolean(0, false) ? R.layout.samsung4_switchbar : R.layout.samsung_switchbar, this);
77+
isOneUI4.recycle();
78+
7579
Resources resources = getResources();
7680
TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.styleable.SeslSwitchBar, i, i2);
7781
this.mBackgroundColor = obtainStyledAttributes.getColor(R.styleable.SeslSwitchBar_seslSwitchBarBackgroundColor, resources.getColor(R.color.sesl_switchbar_off_background_color_light));

‎yanndroid/oneui/src/main/res/anim/sesl4_easing_sine_in_out_80.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<pathInterpolator android:controlX1="0.33" android:controlY1="0.0" android:controlX2="0.2" android:controlY2="1.0"
3+
xmlns:android="http://schemas.android.com/apk/res/android" />

‎yanndroid/oneui/src/main/res/anim/sesl4_easing_sine_in_out_90.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<pathInterpolator android:controlX1="0.33" android:controlY1="0.0" android:controlX2="0.1" android:controlY2="1.0"
3+
xmlns:android="http://schemas.android.com/apk/res/android" />

‎yanndroid/oneui/src/main/res/anim/sesl4_medium_line1_group5_path_6.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:ordering="together">
4+
<set android:ordering="sequentially">
5+
<objectAnimator
6+
android:duration="350"
7+
android:propertyName="pathData"
8+
android:repeatCount="infinite"
9+
android:valueFrom="M -2460.202 -517 C -2460.202 -517 -145.646 -517 -145.646 -517 C -141.228 -517 -137.646 -513.418 -137.646 -509 C -137.646 -504.582 -141.228 -501 -145.646 -501 C -145.646 -501 -2460.202 -501 -2460.202 -501 C -2464.62 -501 -2468.202 -504.582 -2468.202 -509 C -2468.202 -513.418 -2464.62 -517 -2460.202 -517 Z"
10+
android:valueTo="M -2460.202 -517 C -2460.202 -517 -145.646 -517 -145.646 -517 C -141.228 -517 -137.646 -513.418 -137.646 -509 C -137.646 -504.582 -141.228 -501 -145.646 -501 C -145.646 -501 -2460.202 -501 -2460.202 -501 C -2464.62 -501 -2468.202 -504.582 -2468.202 -509 C -2468.202 -513.418 -2464.62 -517 -2460.202 -517 Z"
11+
android:valueType="pathType" />
12+
<objectAnimator
13+
android:duration="933"
14+
android:interpolator="@anim/sesl4_easing_sine_in_out_80"
15+
android:propertyName="pathData"
16+
android:repeatCount="infinite"
17+
android:valueFrom="M -2460.202 -517 C -2460.202 -517 -145.646 -517 -145.646 -517 C -141.228 -517 -137.646 -513.418 -137.646 -509 C -137.646 -504.582 -141.228 -501 -145.646 -501 C -145.646 -501 -2460.202 -501 -2460.202 -501 C -2464.62 -501 -2468.202 -504.582 -2468.202 -509 C -2468.202 -513.418 -2464.62 -517 -2460.202 -517 Z"
18+
android:valueTo="M -132.515 -517 C -132.515 -517 -50.459 -517 -50.459 -517 C -46.041 -517 -42.459 -513.418 -42.459 -509 C -42.459 -504.582 -46.041 -501 -50.459 -501 C -50.459 -501 -132.515 -501 -132.515 -501 C -136.933 -501 -140.515 -504.582 -140.515 -509 C -140.515 -513.418 -136.933 -517 -132.515 -517 Z"
19+
android:valueType="pathType" />
20+
<objectAnimator
21+
android:duration="650"
22+
android:propertyName="pathData"
23+
android:repeatCount="infinite"
24+
android:valueFrom="M -132.515 -517 C -132.515 -517 -50.459 -517 -50.459 -517 C -46.041 -517 -42.459 -513.418 -42.459 -509 C -42.459 -504.582 -46.041 -501 -50.459 -501 C -50.459 -501 -132.515 -501 -132.515 -501 C -136.933 -501 -140.515 -504.582 -140.515 -509 C -140.515 -513.418 -136.933 -517 -132.515 -517 Z"
25+
android:valueTo="M -132.515 -517 C -132.515 -517 -50.459 -517 -50.459 -517 C -46.041 -517 -42.459 -513.418 -42.459 -509 C -42.459 -504.582 -46.041 -501 -50.459 -501 C -50.459 -501 -132.515 -501 -132.515 -501 C -136.933 -501 -140.515 -504.582 -140.515 -509 C -140.515 -513.418 -136.933 -517 -132.515 -517 Z"
26+
android:valueType="pathType" />
27+
</set>
28+
</set>

‎yanndroid/oneui/src/main/res/anim/sesl4_medium_line1_group5_translatex_4.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:ordering="together">
4+
<set android:ordering="sequentially">
5+
<objectAnimator
6+
android:duration="1283"
7+
android:interpolator="@anim/sesl4_easing_sine_in_out_90"
8+
android:propertyName="translateX"
9+
android:repeatCount="infinite"
10+
android:valueFrom="-1079.5"
11+
android:valueTo="2396.5" />
12+
</set>
13+
</set>

‎yanndroid/oneui/src/main/res/anim/sesl4_medium_line2_group5_path_10.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:ordering="together">
4+
<set android:ordering="sequentially">
5+
<objectAnimator
6+
android:duration="566"
7+
android:propertyName="pathData"
8+
android:repeatCount="infinite"
9+
android:valueFrom="M -1363.203 -517 C -1363.203 -517 -145.646 -517 -145.646 -517 C -141.228 -517 -137.646 -513.418 -137.646 -509 C -137.646 -504.582 -141.228 -501 -145.646 -501 C -145.646 -501 -1363.203 -501 -1363.203 -501 C -1367.621 -501 -1371.202 -504.582 -1371.202 -509 C -1371.202 -513.418 -1367.621 -517 -1363.203 -517 Z"
10+
android:valueTo="M -1363.203 -517 C -1363.203 -517 -145.646 -517 -145.646 -517 C -141.228 -517 -137.646 -513.418 -137.646 -509 C -137.646 -504.582 -141.228 -501 -145.646 -501 C -145.646 -501 -1363.203 -501 -1363.203 -501 C -1367.621 -501 -1371.202 -504.582 -1371.202 -509 C -1371.202 -513.418 -1367.621 -517 -1363.203 -517 Z"
11+
android:valueType="pathType" />
12+
<objectAnimator
13+
android:duration="983"
14+
android:interpolator="@anim/sesl4_easing_sine_in_out_90"
15+
android:propertyName="pathData"
16+
android:repeatCount="infinite"
17+
android:valueFrom="M -1363.203 -517 C -1363.203 -517 -145.646 -517 -145.646 -517 C -141.228 -517 -137.646 -513.418 -137.646 -509 C -137.646 -504.582 -141.228 -501 -145.646 -501 C -145.646 -501 -1363.203 -501 -1363.203 -501 C -1367.621 -501 -1371.202 -504.582 -1371.202 -509 C -1371.202 -513.418 -1367.621 -517 -1363.203 -517 Z"
18+
android:valueTo="M -148.765 -517 C -148.765 -517 -113.459 -517 -113.459 -517 C -109.041 -517 -105.459 -513.418 -105.459 -509 C -105.459 -504.582 -109.041 -501 -113.459 -501 C -113.459 -501 -148.765 -501 -148.765 -501 C -153.183 -501 -156.765 -504.582 -156.765 -509 C -156.765 -513.418 -153.183 -517 -148.765 -517 Z"
19+
android:valueType="pathType" />
20+
<objectAnimator
21+
android:duration="383"
22+
android:propertyName="pathData"
23+
android:repeatCount="infinite"
24+
android:valueFrom="M -148.765 -517 C -148.765 -517 -113.459 -517 -113.459 -517 C -109.041 -517 -105.459 -513.418 -105.459 -509 C -105.459 -504.582 -109.041 -501 -113.459 -501 C -113.459 -501 -148.765 -501 -148.765 -501 C -153.183 -501 -156.765 -504.582 -156.765 -509 C -156.765 -513.418 -153.183 -517 -148.765 -517 Z"
25+
android:valueTo="M -148.765 -517 C -148.765 -517 -113.459 -517 -113.459 -517 C -109.041 -517 -105.459 -513.418 -105.459 -509 C -105.459 -504.582 -109.041 -501 -113.459 -501 C -113.459 -501 -148.765 -501 -148.765 -501 C -153.183 -501 -156.765 -504.582 -156.765 -509 C -156.765 -513.418 -153.183 -517 -148.765 -517 Z"
26+
android:valueType="pathType" />
27+
</set>
28+
</set>

‎yanndroid/oneui/src/main/res/anim/sesl4_medium_line2_group5_translatex_8.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:ordering="together">
4+
<set android:ordering="sequentially">
5+
<objectAnimator
6+
android:duration="350"
7+
android:propertyName="translateX"
8+
android:repeatCount="infinite"
9+
android:valueFrom="-1085.5"
10+
android:valueTo="-1085.5" />
11+
<objectAnimator
12+
android:duration="1200"
13+
android:interpolator="@anim/sesl4_easing_sine_in_out_90"
14+
android:propertyName="translateX"
15+
android:repeatCount="infinite"
16+
android:valueFrom="-1085.5"
17+
android:valueTo="2416.5" />
18+
</set>
19+
</set>

‎yanndroid/oneui/src/main/res/anim/sesl4_medium_line3_group5_path_14.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:ordering="together">
4+
<set android:ordering="sequentially">
5+
<objectAnimator
6+
android:duration="500"
7+
android:propertyName="pathData"
8+
android:repeatCount="infinite"
9+
android:valueFrom="M -905.578 -517 C -905.578 -517 -144.021 -517 -144.021 -517 C -139.603 -517 -136.021 -513.418 -136.021 -509 C -136.021 -504.582 -139.603 -501 -144.021 -501 C -144.021 -501 -905.578 -501 -905.578 -501 C -909.996 -501 -913.577 -504.582 -913.577 -509 C -913.577 -513.418 -909.996 -517 -905.578 -517 Z"
10+
android:valueTo="M -905.578 -517 C -905.578 -517 -144.021 -517 -144.021 -517 C -139.603 -517 -136.021 -513.418 -136.021 -509 C -136.021 -504.582 -139.603 -501 -144.021 -501 C -144.021 -501 -905.578 -501 -905.578 -501 C -909.996 -501 -913.577 -504.582 -913.577 -509 C -913.577 -513.418 -909.996 -517 -905.578 -517 Z"
11+
android:valueType="pathType" />
12+
<objectAnimator
13+
android:duration="1250"
14+
android:interpolator="@anim/sesl4_easing_sine_in_out_90"
15+
android:propertyName="pathData"
16+
android:repeatCount="infinite"
17+
android:valueFrom="M -905.578 -517 C -905.578 -517 -144.021 -517 -144.021 -517 C -139.603 -517 -136.021 -513.418 -136.021 -509 C -136.021 -504.582 -139.603 -501 -144.021 -501 C -144.021 -501 -905.578 -501 -905.578 -501 C -909.996 -501 -913.577 -504.582 -913.577 -509 C -913.577 -513.418 -909.996 -517 -905.578 -517 Z"
18+
android:valueTo="M -148.765 -517 C -148.765 -517 -148.459 -517 -148.459 -517 C -144.041 -517 -140.459 -513.418 -140.459 -509 C -140.459 -504.582 -144.041 -501 -148.459 -501 C -148.459 -501 -148.765 -501 -148.765 -501 C -153.183 -501 -156.765 -504.582 -156.765 -509 C -156.765 -513.418 -153.183 -517 -148.765 -517 Z"
19+
android:valueType="pathType" />
20+
<objectAnimator
21+
android:duration="183"
22+
android:propertyName="pathData"
23+
android:repeatCount="infinite"
24+
android:valueFrom="M -148.765 -517 C -148.765 -517 -148.459 -517 -148.459 -517 C -144.041 -517 -140.459 -513.418 -140.459 -509 C -140.459 -504.582 -144.041 -501 -148.459 -501 C -148.459 -501 -148.765 -501 -148.765 -501 C -153.183 -501 -156.765 -504.582 -156.765 -509 C -156.765 -513.418 -153.183 -517 -148.765 -517 Z"
25+
android:valueTo="M -148.765 -517 C -148.765 -517 -148.459 -517 -148.459 -517 C -144.041 -517 -140.459 -513.418 -140.459 -509 C -140.459 -504.582 -144.041 -501 -148.459 -501 C -148.459 -501 -148.765 -501 -148.765 -501 C -153.183 -501 -156.765 -504.582 -156.765 -509 C -156.765 -513.418 -153.183 -517 -148.765 -517 Z"
26+
android:valueType="pathType" />
27+
</set>
28+
</set>

0 commit comments

Comments
 (0)