Skip to content

Commit 65b20a5

Browse files
author
Mihai-Cristian Condrea
committed
Refactor InsetsPadding to record
- Convert `InsetsPadding` class in `EdgeToEdgeDelegate.java` to a Java record. - Add `tools:targetApi="26"` to menu items to suppress lint warnings for `iconTint`. - Remove unused imports of `ConsentUtils` from `HomeFragment.java` and `AboutFragment.java`.
1 parent 1c38b1f commit 65b20a5

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.d4rk.androidtutorials.java.R;
1919
import com.d4rk.androidtutorials.java.ads.AdUtils;
2020
import com.d4rk.androidtutorials.java.databinding.FragmentAboutBinding;
21-
import com.d4rk.androidtutorials.java.utils.ConsentUtils;
2221

2322
import dagger.hilt.android.AndroidEntryPoint;
2423
import me.zhanghai.android.fastscroll.FastScrollerBuilder;

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.d4rk.androidtutorials.java.ads.AdUtils;
1515
import com.d4rk.androidtutorials.java.data.model.PromotedApp;
1616
import com.d4rk.androidtutorials.java.databinding.FragmentHomeBinding;
17-
import com.d4rk.androidtutorials.java.utils.ConsentUtils;
1817

1918
import dagger.hilt.android.AndroidEntryPoint;
2019
import me.zhanghai.android.fastscroll.FastScrollerBuilder;

app/src/main/java/com/d4rk/androidtutorials/java/utils/EdgeToEdgeDelegate.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,6 @@ public void onViewDetachedFromWindow(View v) {
120120
}
121121
}
122122

123-
private static final class InsetsPadding {
124-
final int start;
125-
final int top;
126-
final int end;
127-
final int bottom;
128-
129-
InsetsPadding(int start, int top, int end, int bottom) {
130-
this.start = start;
131-
this.top = top;
132-
this.end = end;
133-
this.bottom = bottom;
134-
}
123+
private record InsetsPadding(int start, int top, int end, int bottom) {
135124
}
136125
}
Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,53 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android"
2+
<menu xmlns:tools="http://schemas.android.com/tools"
3+
xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:app="http://schemas.android.com/apk/res-auto">
45
<item
56
android:id="@+id/view_in_google_play"
67
android:icon="@drawable/ic_play_store_tinted"
78
android:iconTint="?attr/colorOnSurface"
89
android:title="@string/view_in_google_play"
910
app:iconTint="?attr/colorOnSurface"
10-
app:showAsAction="never" />
11+
app:showAsAction="never"
12+
tools:targetApi="26" />
1113
<item
1214
android:id="@+id/version_info"
1315
android:icon="@drawable/ic_perm_device_information"
1416
android:iconTint="?attr/colorOnSurface"
1517
android:title="@string/version_info"
1618
app:iconTint="?attr/colorOnSurface"
17-
app:showAsAction="never" />
19+
app:showAsAction="never"
20+
tools:targetApi="26" />
1821
<item
1922
android:id="@+id/beta_program"
2023
android:icon="@drawable/ic_tips_and_updates"
2124
android:iconTint="?attr/colorOnSurface"
2225
android:title="@string/beta_program"
2326
app:iconTint="?attr/colorOnSurface"
24-
app:showAsAction="never" />
27+
app:showAsAction="never"
28+
tools:targetApi="26" />
2529
<item
2630
android:id="@+id/terms_of_service"
2731
android:icon="@drawable/ic_terms_of_service"
2832
android:iconTint="?attr/colorOnSurface"
2933
android:title="@string/terms_of_service"
3034
app:iconTint="?attr/colorOnSurface"
31-
app:showAsAction="never" />
35+
app:showAsAction="never"
36+
tools:targetApi="26" />
3237
<item
3338
android:id="@+id/privacy_policy"
3439
android:icon="@drawable/ic_privacy_policy"
3540
android:iconTint="?attr/colorOnSurface"
3641
android:title="@string/privacy_policy"
3742
app:iconTint="?attr/colorOnSurface"
38-
app:showAsAction="never" />
43+
app:showAsAction="never"
44+
tools:targetApi="26" />
3945
<item
4046
android:id="@+id/oss"
4147
android:icon="@drawable/ic_license"
4248
android:iconTint="?attr/colorOnSurface"
4349
android:title="@string/open_source_licenses"
4450
app:iconTint="?attr/colorOnSurface"
45-
app:showAsAction="never" />
51+
app:showAsAction="never"
52+
tools:targetApi="26" />
4653
</menu>
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android"
2+
<menu xmlns:tools="http://schemas.android.com/tools"
3+
xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:app="http://schemas.android.com/apk/res-auto">
45
<item
56
android:id="@+id/support"
67
android:icon="@drawable/ic_support"
78
android:iconTint="?attr/colorOnSurface"
89
android:title="@string/support_us"
9-
app:iconTint="?attr/colorOnSurface" />
10+
app:iconTint="?attr/colorOnSurface"
11+
tools:targetApi="26" />
1012
</menu>
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android"
2+
<menu xmlns:tools="http://schemas.android.com/tools"
3+
xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:app="http://schemas.android.com/apk/res-auto">
45
<item
56
android:id="@+id/action_share"
67
android:icon="@drawable/ic_share"
78
android:iconTint="?attr/colorOnSurface"
89
android:title="@string/share"
910
app:iconTint="?attr/colorOnSurface"
10-
app:showAsAction="ifRoom" />
11+
app:showAsAction="ifRoom"
12+
tools:targetApi="26" />
1113
</menu>

0 commit comments

Comments
 (0)