Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c652437

Browse files
Fix spring animation attributes and progress indicator styles
1 parent 352fb59 commit c652437

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<set xmlns:android="http://schemas.android.com/apk/res/android">
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
34
<spring
45
android:propertyName="translationX"
56
android:valueFrom="1000"
67
android:valueTo="0"
7-
android:stiffness="400"
8-
android:dampingRatio="0.85" />
8+
app:stiffness="400"
9+
app:dampingRatio="0.85" />
910
<spring
1011
android:propertyName="alpha"
1112
android:valueFrom="0"
1213
android:valueTo="1"
13-
android:stiffness="400"
14-
android:dampingRatio="0.85" />
14+
app:stiffness="400"
15+
app:dampingRatio="0.85" />
1516
</set>
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<set xmlns:android="http://schemas.android.com/apk/res/android">
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
34
<spring
45
android:propertyName="translationX"
56
android:valueFrom="0"
67
android:valueTo="-1000"
7-
android:stiffness="400"
8-
android:dampingRatio="0.85" />
8+
app:stiffness="400"
9+
app:dampingRatio="0.85" />
910
<spring
1011
android:propertyName="alpha"
1112
android:valueFrom="1"
1213
android:valueTo="0"
13-
android:stiffness="400"
14-
android:dampingRatio="0.85" />
14+
app:stiffness="400"
15+
app:dampingRatio="0.85" />
1516
</set>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
<com.google.android.material.progressindicator.LinearProgressIndicator
5757
android:id="@+id/progress_bar_horizontal"
58-
style="@style/Widget.Material3Expressive.LinearProgressIndicator.Wavy"
58+
style="@style/Widget.Material3.LinearProgressIndicator"
5959
android:layout_width="match_parent"
6060
android:layout_height="wrap_content"
6161
android:layout_margin="24dp"
@@ -78,7 +78,7 @@
7878

7979
<com.google.android.material.progressindicator.CircularProgressIndicator
8080
android:id="@+id/progress_bar"
81-
style="@style/Widget.Material3Expressive.CircularProgressIndicator.Wavy"
81+
style="@style/Widget.Material3.CircularProgressIndicator"
8282
android:layout_width="wrap_content"
8383
android:layout_height="wrap_content"
8484
android:layout_gravity="center"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /