From f61eafdce920d6ed700d2d0796147d363b956db5 Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Mon, 23 Dec 2024 13:45:49 +0100 Subject: [PATCH 1/2] chore: update dependencies --- gradle/libs.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 616b8c720..e47f5c813 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" @@ -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" @@ -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" @@ -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 From 84311231bf5c226c517daaebd5dc307aa99273a8 Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Tue, 24 Dec 2024 11:17:02 +0100 Subject: [PATCH 2/2] fix: `fitsSystemWindows` error --- .../ooniprobe/activity/OnboardingActivity.java | 4 +++- .../ooniprobe/activity/PreferenceActivity.java | 5 +++-- .../main/res/layout/activity_add_descriptor.xml | 3 ++- app/src/main/res/layout/activity_blank.xml | 14 ++++++++++++++ app/src/main/res/layout/activity_customwebsite.xml | 1 + app/src/main/res/layout/activity_info.xml | 3 ++- app/src/main/res/layout/activity_log.xml | 1 + app/src/main/res/layout/activity_main.xml | 3 ++- .../res/layout/activity_measurement_detail.xml | 3 ++- app/src/main/res/layout/activity_oonirun.xml | 1 + app/src/main/res/layout/activity_overview.xml | 3 ++- app/src/main/res/layout/activity_proxy.xml | 1 + app/src/main/res/layout/activity_result_detail.xml | 1 + .../layout/activity_review_descriptor_updates.xml | 1 + app/src/main/res/layout/activity_run_tests.xml | 1 + app/src/main/res/layout/activity_running.xml | 3 ++- 16 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/layout/activity_blank.xml diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java index 40891e78d..7b24b3831 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/OnboardingActivity.java @@ -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(); } } diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java index a2753455b..026da39de 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/PreferenceActivity.java @@ -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 diff --git a/app/src/main/res/layout/activity_add_descriptor.xml b/app/src/main/res/layout/activity_add_descriptor.xml index b581bb3e2..1905265fe 100644 --- a/app/src/main/res/layout/activity_add_descriptor.xml +++ b/app/src/main/res/layout/activity_add_descriptor.xml @@ -16,7 +16,8 @@ + android:orientation="vertical" + android:fitsSystemWindows="true"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customwebsite.xml b/app/src/main/res/layout/activity_customwebsite.xml index 82c8c50cf..338bf2c13 100644 --- a/app/src/main/res/layout/activity_customwebsite.xml +++ b/app/src/main/res/layout/activity_customwebsite.xml @@ -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"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + android:orientation="vertical" + android:fitsSystemWindows="true"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + android:orientation="vertical" + android:fitsSystemWindows="true">