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 e3e3f99

Browse files
Refactor: Replace EdgeToEdgeDelegate with WindowCompat.enableEdgeToEdge
This commit replaces the custom `EdgeToEdgeDelegate.apply()` method with the AndroidX Core library's `WindowCompat.enableEdgeToEdge()` for enabling edge-to-edge display in various activities. This change simplifies the codebase by removing the custom utility class and leveraging the standard AndroidX API for edge-to-edge functionality. Additionally, minor code formatting and Javadoc updates were made in `NoCodeAdFragment.java` and `OnboardingViewModel.java`, and the field order in `Note.java` was adjusted.
1 parent 92f1ae3 commit e3e3f99

File tree

52 files changed

+147
-135
lines changed

Some content is hidden

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

52 files changed

+147
-135
lines changed

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/components/NoCodeAdFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public abstract class NoCodeAdFragment<T extends ViewBinding> extends Fragment {
3535
* Called after the binding has been created and the banner ad loaded.
3636
* Subclasses can override to perform additional setup.
3737
*
38-
* @param binding The binding instance.
38+
* @param binding The binding instance.
3939
* @param savedInstanceState Saved instance state.
4040
*/
4141
protected void onBindingCreated(@NonNull T binding, @Nullable Bundle savedInstanceState) {

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/components/navigation/BaseActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import androidx.appcompat.app.ActionBar;
1010
import androidx.appcompat.app.AppCompatActivity;
1111
import androidx.appcompat.view.menu.MenuBuilder;
12+
import androidx.core.view.WindowCompat;
1213

1314
import com.d4rk.androidtutorials.java.R;
14-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
1515

1616
public abstract class BaseActivity extends AppCompatActivity {
1717

@@ -20,7 +20,7 @@ protected void onPostCreate(@Nullable Bundle savedInstanceState) {
2020
super.onPostCreate(savedInstanceState);
2121
View container = findViewById(R.id.container);
2222
if (container != null) {
23-
EdgeToEdgeDelegate.apply(this, container);
23+
WindowCompat.enableEdgeToEdge(this.getWindow());
2424
}
2525
ActionBar actionBar = getSupportActionBar();
2626
if (actionBar != null) {

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.os.Bundle;
44

55
import androidx.annotation.NonNull;
6+
import androidx.core.view.WindowCompat;
67
import androidx.fragment.app.Fragment;
78
import androidx.lifecycle.ViewModelProvider;
89
import androidx.viewpager2.adapter.FragmentStateAdapter;
@@ -14,7 +15,6 @@
1415
import com.d4rk.androidtutorials.java.ui.screens.android.tabs.CodeFragment;
1516
import com.d4rk.androidtutorials.java.ui.screens.android.tabs.LayoutFragment;
1617
import com.d4rk.androidtutorials.java.ui.screens.android.tabs.NoCodeFragment;
17-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
1818
import com.google.android.material.tabs.TabLayoutMediator;
1919

2020
import dagger.hilt.android.AndroidEntryPoint;
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
3030
binding = ActivityTabLayoutBinding.inflate(getLayoutInflater());
3131
setContentView(binding.getRoot());
3232

33-
EdgeToEdgeDelegate.apply(this, binding.tabLayout);
33+
WindowCompat.enableEdgeToEdge(this.getWindow());
3434

3535
CodeViewModel viewModel = new ViewModelProvider(this).get(CodeViewModel.class);
3636

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
import android.os.Handler;
66
import android.os.Looper;
77

8+
import androidx.core.view.WindowCompat;
9+
810
import com.d4rk.androidtutorials.java.R;
911
import com.d4rk.androidtutorials.java.databinding.ActivityAlertDialogBinding;
1012
import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
1113
import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
12-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
1314
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
1415

1516
public class AlertDialogActivity extends UpNavigationActivity {
@@ -22,7 +23,7 @@ protected void onCreate(Bundle savedInstanceState) {
2223
binding = ActivityAlertDialogBinding.inflate(getLayoutInflater());
2324
setContentView(binding.getRoot());
2425

25-
EdgeToEdgeDelegate.apply(this, binding.container);
26+
WindowCompat.enableEdgeToEdge(this.getWindow());
2627

2728
MaterialAlertDialogBuilder alertDialog = createAlertDialog();
2829
binding.button.setOnClickListener(v -> alertDialog.show());

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
import android.os.Handler;
66
import android.os.Looper;
77

8+
import androidx.core.view.WindowCompat;
9+
810
import com.d4rk.androidtutorials.java.R;
911
import com.d4rk.androidtutorials.java.databinding.ActivitySnackBarBinding;
1012
import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
1113
import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
12-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
1314
import com.google.android.material.snackbar.Snackbar;
1415

1516
public class SnackBarActivity extends UpNavigationActivity {
@@ -22,7 +23,7 @@ protected void onCreate(Bundle savedInstanceState) {
2223
binding = ActivitySnackBarBinding.inflate(getLayoutInflater());
2324
setContentView(binding.getRoot());
2425

25-
EdgeToEdgeDelegate.apply(this, binding.container);
26+
WindowCompat.enableEdgeToEdge(this.getWindow());
2627

2728
binding.button.setOnClickListener(v -> {
2829
Snackbar snackbar = Snackbar.make(binding.getRoot(), R.string.snack_this_is_a_snackbar, Snackbar.LENGTH_INDEFINITE);

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import android.os.Looper;
77
import android.widget.Toast;
88

9+
import androidx.core.view.WindowCompat;
10+
911
import com.d4rk.androidtutorials.java.R;
1012
import com.d4rk.androidtutorials.java.databinding.ActivityToastBinding;
1113
import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
1214
import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
13-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
1415

1516
public class ToastActivity extends UpNavigationActivity {
1617
private final Handler handler = new Handler(Looper.getMainLooper());
@@ -22,7 +23,7 @@ protected void onCreate(Bundle savedInstanceState) {
2223
binding = ActivityToastBinding.inflate(getLayoutInflater());
2324
setContentView(binding.getRoot());
2425

25-
EdgeToEdgeDelegate.apply(this, binding.container);
26+
WindowCompat.enableEdgeToEdge(this.getWindow());
2627

2728
binding.button.setOnClickListener(v ->
2829
Toast.makeText(this, R.string.toast_this_is_a_toast, Toast.LENGTH_SHORT).show()

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistory.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import android.os.Bundle;
44

5+
import androidx.core.view.WindowCompat;
6+
57
import com.d4rk.androidtutorials.java.ads.AdUtils;
68
import com.d4rk.androidtutorials.java.databinding.ActivityAndroidHistoryBinding;
79
import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
8-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
910

1011
import me.zhanghai.android.fastscroll.FastScrollerBuilder;
1112

@@ -15,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
1516
super.onCreate(savedInstanceState);
1617
ActivityAndroidHistoryBinding binding = ActivityAndroidHistoryBinding.inflate(getLayoutInflater());
1718
setContentView(binding.getRoot());
18-
EdgeToEdgeDelegate.apply(this, binding.scrollView);
19+
WindowCompat.enableEdgeToEdge(this.getWindow());
1920

2021
AdUtils.loadBanner(binding.adView);
2122
AdUtils.loadBanner(binding.adViewBottom);

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/permissions/PermissionsTutorialActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import android.net.Uri;
55
import android.os.Bundle;
66

7+
import androidx.core.view.WindowCompat;
8+
79
import com.d4rk.androidtutorials.java.ads.AdUtils;
810
import com.d4rk.androidtutorials.java.databinding.ActivityPermissionsTutorialBinding;
911
import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
10-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
1112

1213
import me.zhanghai.android.fastscroll.FastScrollerBuilder;
1314

@@ -17,7 +18,7 @@ protected void onCreate(Bundle savedInstanceState) {
1718
super.onCreate(savedInstanceState);
1819
com.d4rk.androidtutorials.java.databinding.ActivityPermissionsTutorialBinding binding = ActivityPermissionsTutorialBinding.inflate(getLayoutInflater());
1920
setContentView(binding.getRoot());
20-
EdgeToEdgeDelegate.apply(this, binding.scrollView);
21+
WindowCompat.enableEdgeToEdge(this.getWindow());
2122

2223
AdUtils.loadBanner(binding.adViewBottom);
2324
AdUtils.loadBanner(binding.adViewLarge);

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
import android.widget.TableRow;
88
import android.widget.TextView;
99

10+
import androidx.core.view.WindowCompat;
11+
1012
import com.d4rk.androidtutorials.java.R;
1113
import com.d4rk.androidtutorials.java.ads.AdUtils;
1214
import com.d4rk.androidtutorials.java.data.model.AndroidVersion;
1315
import com.d4rk.androidtutorials.java.databinding.ActivityAndroidSdkBinding;
1416
import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
15-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
1617

1718
import java.util.Arrays;
1819
import java.util.List;
@@ -64,7 +65,8 @@ public class AndroidSDK extends UpNavigationActivity {
6465
protected void onCreate(Bundle savedInstanceState) {
6566
super.onCreate(savedInstanceState);
6667
binding = ActivityAndroidSdkBinding.inflate(getLayoutInflater());
67-
setContentView(binding.getRoot()); EdgeToEdgeDelegate.apply(this, binding.scrollView);
68+
setContentView(binding.getRoot());
69+
WindowCompat.enableEdgeToEdge(this.getWindow());
6870

6971
AdUtils.loadBanner(binding.adViewBottom);
7072
AdUtils.loadBanner(binding.adView);

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/BuildShortcutsActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import android.os.Bundle;
44

5+
import androidx.core.view.WindowCompat;
6+
57
import com.d4rk.androidtutorials.java.ads.AdUtils;
68
import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsBuildBinding;
79
import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
8-
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
910

1011
import me.zhanghai.android.fastscroll.FastScrollerBuilder;
1112

@@ -15,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
1516
super.onCreate(savedInstanceState);
1617
com.d4rk.androidtutorials.java.databinding.ActivityShortcutsBuildBinding binding = ActivityShortcutsBuildBinding.inflate(getLayoutInflater());
1718
setContentView(binding.getRoot());
18-
EdgeToEdgeDelegate.apply(this, binding.scrollView);
19+
WindowCompat.enableEdgeToEdge(this.getWindow());
1920

2021
AdUtils.loadBanner(binding.adView);
2122
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();

0 commit comments

Comments
(0)

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