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: multiple reports of floating header issues on some Android devices. #873

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

fix: multiple reports of floating header issues on some Android devices. #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f61eafd
chore: update dependencies
aanorbel Dec 23, 2024
8431123
fix: `fitsSystemWindows` error
aanorbel Dec 24, 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: 3 additions & 1 deletion app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@

import androidx.annotation.Nullable;

import org.openobservatory.ooniprobe.R;
import org.openobservatory.ooniprobe.fragment.onboarding.Onboarding1Fragment;

public class OnboardingActivity extends AbstractActivity {

@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportFragmentManager().beginTransaction().replace(android.R.id.content, new Onboarding1Fragment()).commit();
setContentView(R.layout.activity_blank);
getSupportFragmentManager().beginTransaction().replace(R.id.content, new Onboarding1Fragment()).commit();
}
}
5 changes: 3 additions & 2 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ public static Intent newIntent(Context context, @XmlRes int preferenceResId, Str

@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
fragment = PreferenceFragment.newInstance(getIntent().getIntExtra(PreferenceFragment.ARG_PREFERENCES_RES_ID, 0), android.R.id.content, getIntent().getStringExtra(PreferenceFragment.ARG_PREFERENCE_ROOT));
getSupportFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
setContentView(R.layout.activity_blank);
fragment = PreferenceFragment.newInstance(getIntent().getIntExtra(PreferenceFragment.ARG_PREFERENCES_RES_ID, 0), R.id.content, getIntent().getStringExtra(PreferenceFragment.ARG_PREFERENCE_ROOT));
getSupportFragmentManager().beginTransaction().replace(R.id.content, fragment).commit();
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_add_descriptor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:fitsSystemWindows="true">

<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/layout/activity_blank.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.PreferenceActivity">

<FrameLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_customwebsite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.customwebsites.CustomWebsiteActivity">

<com.google.android.material.appbar.AppBarLayout
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_log.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.LogActivity">

<Spinner
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:fitsSystemWindows="true">

<FrameLayout
android:id="@+id/content"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_measurement_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_oonirun.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.OoniRunActivity">

<com.google.android.material.appbar.AppBarLayout
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_overview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar_layout"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_proxy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_white"
android:fitsSystemWindows="true"
tools:context=".activity.ProxyActivity">

<ScrollView
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_result_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.ResultDetailActivity">

<com.google.android.material.appbar.AppBarLayout
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_review_descriptor_updates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.reviewdescriptorupdates.ReviewDescriptorUpdatesActivity">

<com.google.android.material.appbar.AppBarLayout
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_run_tests.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.runtests.RunTestsActivity">

<androidx.appcompat.widget.Toolbar
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_running.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:keepScreenOn="true"
android:orientation="vertical">
android:orientation="vertical"
android:fitsSystemWindows="true">

<RelativeLayout
android:layout_width="wrap_content"
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
androidGradlePlugin = "8.6.1"
barista = "4.3.0"
countlySdk = "24.7.4"
desugar_jdk_libs_nio = "2.1.2"
desugar_jdk_libs_nio = "2.1.4"
faker = "2.0.4"
mockito = "5.14.2"
robolectric = "4.13"
Expand All @@ -15,12 +15,12 @@ kotlin = "1.9.24"

# Android X
androidxCore = "1.6.1"
androidxRunner = "1.6.1"
androidxRunner = "1.6.2"
androidxAppCompat = "1.7.0"
androidxConstraintlayout = "2.2.0"
androidxLifecycleProcess = "2.8.6"
androidxLifecycleProcess = "2.8.7"
androidxPreference = "1.2.1"
workRuntime = "2.9.1"
workRuntime = "2.10.0"
androidxLocalbroadcastmanager = "1.1.0"
androidxLegacySupportV4 = "1.0.0"
androidxJunit = "1.2.1"
Expand All @@ -31,11 +31,11 @@ googleGson = "2.11.0"
googleGuava = "33.3.1-android"
googleMaterial = "1.12.0"
googleDagger = "2.52"
googleFirebaseBon = "33.5.1"
googleFirebaseBon = "33.7.0"
googlePlayAppUpdate = "2.1.0"

# OONI
compileSdk = "34"
compileSdk = "35"
lottie = "6.6.0"
markwon = "4.6.2"
shapeofview = "1.4.7"
Expand All @@ -50,7 +50,7 @@ retrofitLoggingInterceptor = "4.12.0"

# Firebase Services
# https://firebase.google.com/support/release-notes/android
gms-googleServices = "4.4.1"
gms-googleServices = "4.4.2"

[libraries]
# Dependencies of the included build-logic
Expand Down
Loading