Merge branch 'dev/design-update' of github.com:ooni/probe-android int…

…o chore/migrate-dashboard-and-overview-to-descriptors
ooni · Dec 6, 2023 · 599fe32 · 599fe32
2 parents 1b254ee + c0e47af
commit 599fe32
Show file tree

Hide file tree

Showing 33 changed files with 1,294 additions and 604 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'org.openobservatory.ooniprobe'
         minSdk libs.versions.minSdk.get().toInteger()
         targetSdk libs.versions.targetSdk.get().toInteger()
-        versionName '3.8.4'
-        versionCode 106
+        versionName '3.8.5'
+        versionCode 107
 		testInstrumentationRunner "org.openobservatory.ooniprobe.TestAndroidJUnitRunner"
 		buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.ooni.io/"'
 		buildConfigField 'String', 'NOTIFICATION_SERVER', '"https://countly.ooni.io"'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -102,11 +102,11 @@
 			</intent-filter>
 		</activity>
 		<activity
-			android:name=".activity.CustomWebsiteActivity"
+			android:name=".activity.customwebsites.CustomWebsiteActivity"
 			android:label="@string/Settings_Websites_CustomURL_Title"
 			android:exported="false"
 			android:parentActivityName=".activity.PreferenceActivity"
-			android:screenOrientation="userPortrait">
+			android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar">
 			<intent-filter>
 				<action android:name="${applicationId}.activity.CustomWebsiteActivity" />
 

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/CustomWebsiteActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/CustomWebsiteActivity.java
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
@@ -93,7 +93,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                         return false;
                 }
             });
-			// TODO(aanorbel): Fix change in state(theme change from notification) changing the selected item.
+            /* TODO(aanorbel): Fix change in state(theme change from notification) changes the selected item.
+                The proper fix would be to track the selected item as well as other properties in a `ViewModel`. */
             binding.bottomNavigation.setSelectedItemId(getIntent().getIntExtra(RES_ITEM, R.id.dashboard));
 			/* Check if we are restoring the activity from a saved state first.
 			 * If we have a message to show, show it as a snackbar.

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java
@@ -14,6 +14,7 @@
 
 import org.openobservatory.engine.BaseNettest;
 import org.openobservatory.ooniprobe.R;
+import org.openobservatory.ooniprobe.activity.customwebsites.CustomWebsiteActivity;
 import org.openobservatory.ooniprobe.common.OONIDescriptor;
 import org.openobservatory.ooniprobe.common.OONITests;
 import org.openobservatory.ooniprobe.common.PreferenceManager;