Merge pull request #830 from modos189/feature/user-location

Add browser geolocation to user-location plugin

Author: modos189

build_mobile.py

@@ -80,8 +80,6 @@ def build_mobile(source, scripts_dir, out_dir=None, out_name=None):
         assets_dir,
         ignore=shutil.ignore_patterns(*settings.ignore_patterns),
     )
-    user_location_plug = source / 'plugins' / 'user-location.js'
-    build_plugin.process_file(user_location_plug, assets_dir)
 
     if settings.gradle_buildtype == 'copyonly':
         return

mobile/app/src/main/java/org/exarhteam/iitc_mobile/IITC_Mobile.java

@@ -343,6 +343,33 @@ public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
             final int mode = Integer.parseInt(mSharedPrefs.getString("pref_user_location_mode", "0"));
             if (mUserLocation.setLocationMode(mode))
                 mReloadNeeded = true;
+            
+            // Sync plugin checkbox state with location mode preference
+            boolean shouldBeEnabled = mode != 0;
+            boolean isCurrentlyEnabled = mSharedPrefs.getBoolean("user-location.user.js", false);
+            
+            if (shouldBeEnabled != isCurrentlyEnabled) {
+                SharedPreferences.Editor editor = mSharedPrefs.edit();
+                editor.putBoolean("user-location.user.js", shouldBeEnabled);
+                editor.apply();
+            }
+            return;
+        } else if (key.equals("user-location.user.js")) {
+            // Sync location mode preference when user-location plugin checkbox changes
+            boolean pluginEnabled = sharedPreferences.getBoolean(key, false);
+            String currentMode = mSharedPrefs.getString("pref_user_location_mode", "0");
+            
+            if (pluginEnabled && "0".equals(currentMode)) {
+                // Enable location mode when plugin is enabled (default to show position)
+                SharedPreferences.Editor editor = mSharedPrefs.edit();
+                editor.putString("pref_user_location_mode", "1");
+                editor.apply();
+            } else if (!pluginEnabled && !"0".equals(currentMode)) {
+                // Disable location mode when plugin is disabled
+                SharedPreferences.Editor editor = mSharedPrefs.edit();
+                editor.putString("pref_user_location_mode", "0");
+                editor.apply();
+            }
             return;
         } else if (key.equals("pref_language")) {
             final String lang = mSharedPrefs.getString("pref_language", this.getCurrentLanguage().toString());

mobile/app/src/main/java/org/exarhteam/iitc_mobile/IITC_WebViewClient.java

@@ -91,11 +91,6 @@ private void loadScripts(final IITC_WebView view) {
             scripts.add("plugin" + DOMAIN + "/" + plugin.filename);
         }
 
-        // Inject user location script if enabled
-        if (Integer.parseInt(mSharedPrefs.getString("pref_user_location_mode", "0")) != 0) {
-            scripts.add("script" + DOMAIN + "/user-location.user.js");
-        }
-
         scripts.add("script" + DOMAIN + "/total-conversion-build.user.js");
 
         final String js = "(function(){['" + TextUtils.join("','", scripts) + "'].forEach(function(src) {" +

mobile/plugins/user-location.js

@@ -5,8 +5,8 @@
 .user-location .container {
   height: 32px;
   width: 32px;
-          transform-origin: center;
   -webkit-transform-origin: center;
+  transform-origin: center;
 }
 
 .user-location .container .inner,
@@ -42,8 +42,8 @@
 }
 
 .user-location .circle .inner {
-  transform: scale(0.6);
   -webkit-transform: scale(0.6);
+  transform: scale(0.6);
 }
 
 .user-location .arrow .inner,
@@ -59,7 +59,7 @@
 }
 
 .user-location .arrow .inner {
-  transform: scale(0.6) translateY(15%);
   -webkit-transform: scale(0.6) translateY(15%);
+  transform: scale(0.6) translateY(15%);
 }