Merge pull request #747 from fmidev/feature/703-search-screen-url-han…

…dler issue-703: Added fmiweather://search url handler
fmidev · Jan 8, 2025 · 119c52c · 119c52c
2 parents 6425efe + cea0c41
commit 119c52c
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 11 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -50,7 +50,16 @@
         android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
         android:launchMode="singleTask"
         android:windowSoftInputMode="adjustResize"
-        android:exported="true" />
+        android:exported="true">
+
+        <intent-filter>
+          <action android:name="android.intent.action.VIEW" />
+          <category android:name="android.intent.category.DEFAULT" />
+          <category android:name="android.intent.category.BROWSABLE" />
+          <data android:scheme="fmiweather" />
+        </intent-filter>
+
+      </activity>
 
         <receiver android:name=".SmallForecastWidgetProvider" android:label="@string/small_widget" android:exported="false">
             <intent-filter>

diff --git a/android/app/src/main/java/fi/fmi/mobileweather/BaseWidgetConfigurationActivity.java b/android/app/src/main/java/fi/fmi/mobileweather/BaseWidgetConfigurationActivity.java
@@ -5,7 +5,6 @@
 import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID;
 import static android.content.res.Configuration.UI_MODE_NIGHT_MASK;
 import static android.content.res.Configuration.UI_MODE_NIGHT_NO;
-import static android.graphics.Color.BLACK;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
@@ -23,7 +22,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -42,7 +40,6 @@
 import android.content.pm.PackageManager;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.app.ActivityCompat;
 
 import com.reactnativecommunity.asyncstorage.AsyncLocalStorageUtil;
@@ -100,6 +97,8 @@ public void onResume(){
         } else {
             batteryOptimizationWarning.setVisibility(GONE);
         }
+
+        setLocationFavoritesButtons();
     }
 
     public static boolean isPowerSavingEnabled(Context context) {
@@ -159,11 +158,15 @@ private void setLocationFavoritesButtons() {
                         int geoId = current.getInt("id");
                         String name = current.getString("name");
 
-                        RadioButton favoriteRadioButton = (RadioButton) inflater.inflate(R.layout.favorite_radio_button, locationRadioGroup, false);
-                        favoriteRadioButton.setText(name);
-                        favoriteRadioButton.setTag(geoId);
-                        favoriteRadioButton.setId(geoId);
-                        locationRadioGroup.addView(favoriteRadioButton);
+                        RadioButton existingRadioButton = findViewById(geoId);
+
+                        if (existingRadioButton == null) {
+                            RadioButton favoriteRadioButton = (RadioButton) inflater.inflate(R.layout.favorite_radio_button, locationRadioGroup, false);
+                            favoriteRadioButton.setText(name);
+                            favoriteRadioButton.setTag(geoId);
+                            favoriteRadioButton.setId(geoId);
+                            locationRadioGroup.addView(favoriteRadioButton);
+                        }
                     }
                 } catch (JSONException e) {
                     Log.d("Widget Update", "Error parsing location favorites: " + e.getMessage());
@@ -189,7 +192,7 @@ private void setReadyButton() {
     }
 
     private void setAddFavoriteLocationsClickListener() {
-        Intent intent = new Intent(this, MainActivity.class);
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fmiweather://search"));
         Button addFavoriteLocationsButton = findViewById(R.id.addFavoriteLocationsButton);
         // on click send the intent to open the app main activity
         addFavoriteLocationsButton.setOnClickListener(v -> startActivity(intent));

diff --git a/src/navigators/TabNavigator.tsx b/src/navigators/TabNavigator.tsx
@@ -253,6 +253,7 @@ const Navigator: React.FC<Props> = ({
 
   const SearchScreenOptions = {
     ...CommonHeaderOptions,
+    path: 'search',
     headerBackTitleVisible: false,
     headerTitle: t('navigation:search'),
     headerRight: () => (
@@ -430,6 +431,19 @@ const Navigator: React.FC<Props> = ({
     );
   }
 
+  const linking = {
+    prefixes: ['fmiweather://'],
+    config: {
+      screens: {
+        Weather: {
+          screens: {
+            Search: 'search',
+          },
+        },
+      },
+    },
+  };
+
   return (
     <>
       <StatusBar
@@ -438,7 +452,10 @@ const Navigator: React.FC<Props> = ({
       />
       <NavigationContainer
         onStateChange={navigationTabChanged}
-        theme={useDarkTheme ? darkTheme : lightTheme}>
+        theme={useDarkTheme ? darkTheme : lightTheme}
+        /*
+        // @ts-ignore */
+        linking={linking}>
         <Tab.Navigator
           initialRouteName={initialTab}
           screenOptions={{