Skip to content

Commit df9de43

Browse files
Update UI layouts and increment versionCode
This commit includes the following changes: - Incremented `versionCode` to 49. - Updated the `ossLicensesPlugin` version to `0.10.6`. - Implemented edge-to-edge display in `HelpActivity` using `EdgeToEdgeDelegate`. - Modified layout paddings to margins in `fragment_about.xml` and `activity_help.xml`. - Added `android:fitsSystemWindows="true"` to the root layout in `activity_help.xml`. - Reordered attributes and added horizontal margin to an AdView in `activity_view_binding_tutorial.xml`.
1 parent 2180b75 commit df9de43

File tree

7 files changed

+15
-12
lines changed

7 files changed

+15
-12
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
applicationId 'com.d4rk.androidtutorials.java'
1414
minSdk 23
1515
targetSdk 36
16-
versionCode 48
16+
versionCode 49
1717
versionName '5.0.2'
1818
vectorDrawables.useSupportLibrary = true
1919
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.d4rk.androidtutorials.java.databinding.DialogVersionInfoBinding;
2020
import com.d4rk.androidtutorials.java.ui.components.navigation.BaseActivity;
2121
import com.d4rk.androidtutorials.java.ui.screens.help.repository.HelpRepository;
22+
import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
2223
import com.d4rk.androidtutorials.java.utils.OpenSourceLicensesUtils;
2324
import com.google.android.material.snackbar.Snackbar;
2425
import com.google.android.play.core.review.ReviewInfo;
@@ -35,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
3536
super.onCreate(savedInstanceState);
3637
ActivityHelpBinding binding = ActivityHelpBinding.inflate(getLayoutInflater());
3738
setContentView(binding.getRoot());
38-
39+
EdgeToEdgeDelegate.apply(this, binding.getRoot());
3940
helpViewModel = new ViewModelProvider(this).get(HelpViewModel.class);
4041

4142
getSupportFragmentManager().beginTransaction()

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
android:id="@+id/container"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
android:paddingHorizontal="24dp"
8-
android:paddingVertical="24dp">
7+
android:layout_marginHorizontal="24dp"
8+
android:layout_marginVertical="24dp"
9+
android:fitsSystemWindows="true">
910

1011
<com.google.android.material.textview.MaterialTextView
1112
android:id="@+id/text_view_faq"

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@
3535
android:id="@+id/bindingInstructionText"
3636
android:layout_width="match_parent"
3737
android:layout_height="wrap_content"
38-
android:paddingBottom="16dp"
3938
android:paddingHorizontal="16dp"
39+
android:paddingBottom="16dp"
4040
android:text="@string/summary_enable_binding"
4141
app:layout_constraintTop_toBottomOf="@id/bindingSetupText" />
4242

4343
<com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
4444
android:id="@+id/ad_view"
4545
android:layout_width="match_parent"
4646
android:layout_height="wrap_content"
47+
android:layout_marginHorizontal="24dp"
4748
app:layout_constraintTop_toBottomOf="@id/bindingInstructionText" />
4849

4950
<com.google.android.material.card.MaterialCardView
@@ -53,8 +54,8 @@
5354
android:layout_height="wrap_content"
5455
android:layout_marginHorizontal="24dp"
5556
android:layout_marginTop="24dp"
56-
app:contentPadding="4dp"
5757
app:cardCornerRadius="24dp"
58+
app:contentPadding="4dp"
5859
app:layout_constraintEnd_toEndOf="parent"
5960
app:layout_constraintStart_toStartOf="parent"
6061
app:layout_constraintTop_toBottomOf="@id/ad_view">
@@ -83,8 +84,8 @@
8384
android:layout_width="match_parent"
8485
android:layout_height="wrap_content"
8586
android:layout_marginHorizontal="24dp"
86-
app:contentPadding="4dp"
8787
app:cardCornerRadius="24dp"
88+
app:contentPadding="4dp"
8889
app:layout_constraintEnd_toEndOf="parent"
8990
app:layout_constraintStart_toStartOf="parent"
9091
app:layout_constraintTop_toBottomOf="@id/bindingActivitiesUseText">
@@ -113,8 +114,8 @@
113114
android:layout_width="match_parent"
114115
android:layout_height="wrap_content"
115116
android:layout_marginHorizontal="24dp"
116-
app:contentPadding="4dp"
117117
app:cardCornerRadius="24dp"
118+
app:contentPadding="4dp"
118119
app:layout_constraintEnd_toEndOf="parent"
119120
app:layout_constraintStart_toStartOf="parent"
120121
app:layout_constraintTop_toBottomOf="@id/bindingFragmentsUseText">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<androidx.constraintlayout.widget.ConstraintLayout
1010
android:layout_width="match_parent"
1111
android:layout_height="wrap_content"
12-
android:paddingHorizontal="24dp"
13-
android:paddingVertical="24dp">
12+
android:layout_marginHorizontal="24dp"
13+
android:layout_marginVertical="24dp">
1414

1515
<com.google.android.material.card.MaterialCardView
1616
android:id="@+id/card_view_about"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
agp = "8.13.0"
33
firebaseCrashlyticsPlugin = "3.0.6"
44
googleServices = "4.4.3"
5-
ossLicensesPlugin = "0.10.7"
5+
ossLicensesPlugin = "0.10.6"
66
appcompat = "1.7.1"
77
appUpdate = "2.1.0"
88
billing = "8.0.0"

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pluginManagement {
88
resolutionStrategy {
99
eachPlugin {
1010
if (requested.id.id == 'com.google.android.gms.oss-licenses-plugin') {
11-
useModule('com.google.android.gms:oss-licenses-plugin:0.10.7')
11+
useModule('com.google.android.gms:oss-licenses-plugin:0.10.6')
1212
}
1313
}
1414
}

0 commit comments

Comments
 (0)