Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Edge to edge #91

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix: Edge to edge #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80b0622
Bump compile and target sdk to 35 (Android 15)
KCeh Dec 31, 2024
a11bde3
Fix SDK 35 compile errors
KCeh Dec 31, 2024
69edebd
Fix edge to edge support
KCeh Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ext {

buildConfig = [
"minSdk" : 21,
"compileSdk": 34,
"targetSdk" : 34,
"compileSdk": 35,
"targetSdk" : 35,
"buildTools": "34.0.0"
]
releaseConfig = [
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ktlintplugin = "11.3.1"
ktlint = "0.45.2"
cpd = "3.3"
dokka = "1.8.10"
chucker = "4.0.0"
chucker = "4.1.0"
collar = "1.4.0"
dbinspector = "5.4.9"
leakcanary = "2.11"
Expand Down
2 changes: 1 addition & 1 deletion sentinel/src/main/kotlin/com/infinum/sentinel/data/models/raw/ApplicationData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ internal data class ApplicationData(
val applicationIcon: Drawable,
val applicationName: String,
val versionCode: String,
val versionName: String,
val versionName: String?,
val firstInstall: String,
val lastUpdate: String,
val minSdk: String,
Expand Down
2 changes: 1 addition & 1 deletion sentinel/src/main/kotlin/com/infinum/sentinel/data/sources/raw/formatters/HtmlFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ internal class HtmlFormatter(
.apply {
applicationCollector().let {
addDiv(R.string.sentinel_version_code, it.versionCode)
addDiv(R.string.sentinel_version_name, it.versionName)
addDiv(R.string.sentinel_version_name, it.versionName ?: "")
addDiv(R.string.sentinel_first_install, it.firstInstall)
addDiv(R.string.sentinel_last_update, it.lastUpdate)
addDiv(R.string.sentinel_min_sdk, it.minSdk)
Expand Down
2 changes: 1 addition & 1 deletion sentinel/src/main/kotlin/com/infinum/sentinel/data/sources/raw/formatters/JsonFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ internal class JsonFormatter(
JSONObject().apply {
applicationCollector().let {
addKey(R.string.sentinel_version_code, it.versionCode)
addKey(R.string.sentinel_version_name, it.versionName)
addKey(R.string.sentinel_version_name, it.versionName ?: "")
addKey(R.string.sentinel_first_install, it.firstInstall)
addKey(R.string.sentinel_last_update, it.lastUpdate)
addKey(R.string.sentinel_min_sdk, it.minSdk)
Expand Down
2 changes: 1 addition & 1 deletion sentinel/src/main/kotlin/com/infinum/sentinel/data/sources/raw/formatters/XmlFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ internal class XmlFormatter(
startTag(NAMESPACE, APPLICATION)
applicationCollector().let {
addNode(R.string.sentinel_version_code, it.versionCode)
addNode(R.string.sentinel_version_name, it.versionName)
addNode(R.string.sentinel_version_name, it.versionName ?: "")
addNode(R.string.sentinel_first_install, it.firstInstall)
addNode(R.string.sentinel_last_update, it.lastUpdate)
addNode(R.string.sentinel_min_sdk, it.minSdk)
Expand Down
2 changes: 1 addition & 1 deletion .../kotlin/com/infinum/sentinel/data/sources/raw/formatters/shared/StringBuilderFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ internal abstract class StringBuilderFormatter {

internal fun addApplicationData(builder: StringBuilder, data: ApplicationData) {
addLine(builder, R.string.sentinel_version_code, data.versionCode)
addLine(builder, R.string.sentinel_version_name, data.versionName)
addLine(builder, R.string.sentinel_version_name, data.versionName ?: "")
addLine(builder, R.string.sentinel_first_install, data.firstInstall)
addLine(builder, R.string.sentinel_last_update, data.lastUpdate)
addLine(builder, R.string.sentinel_min_sdk, data.minSdk)
Expand Down
2 changes: 1 addition & 1 deletion sentinel/src/main/kotlin/com/infinum/sentinel/ui/main/application/ApplicationFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ internal class ApplicationFragment :
when (state) {
is ApplicationState.Data -> with(binding) {
versionCodeView.data = state.value.versionCode
versionNameView.data = state.value.versionName
versionNameView.data = state.value.versionName ?: ""
firstInstallView.data = state.value.firstInstall
lastUpdateView.data = state.value.lastUpdate
minSdkView.data = state.value.minSdk
Expand Down
1 change: 1 addition & 0 deletions sentinel/src/main/res/layout/sentinel_fragment_bundle_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/recyclerView">
Expand Down
1 change: 1 addition & 0 deletions sentinel/src/main/res/layout/sentinel_fragment_bundles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/recyclerView">
Expand Down
1 change: 1 addition & 0 deletions sentinel/src/main/res/layout/sentinel_fragment_certificate_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/recyclerView">
Expand Down
1 change: 1 addition & 0 deletions sentinel/src/main/res/layout/sentinel_fragment_certificates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/recyclerView">
Expand Down
1 change: 1 addition & 0 deletions sentinel/src/main/res/layout/sentinel_fragment_crash_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/recyclerView">
Expand Down
1 change: 1 addition & 0 deletions sentinel/src/main/res/layout/sentinel_fragment_crashes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/recyclerView">
Expand Down
1 change: 1 addition & 0 deletions sentinel/src/main/res/layout/sentinel_fragment_preference_editor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/nestedScrollView">
Expand Down
1 change: 1 addition & 0 deletions sentinel/src/main/res/layout/sentinel_fragment_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
Copy link
Contributor

@AsimRibo AsimRibo Jan 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't fitsSystemWindows go to root parent so it handles both top and bottom insets?

app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/nestedScrollView">
Expand Down
1 change: 1 addition & 0 deletions tool-timber/src/main/res/layout/sentinel_activity_logger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/recyclerView">
Expand Down
1 change: 1 addition & 0 deletions tool-timber/src/main/res/layout/sentinel_activity_logs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:fitsSystemWindows="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@id/recyclerView">
Expand Down
Loading