From cc76e4f3cc4e4d958f398ed2899a8d653815985b Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Sun, 15 Mar 2026 06:52:23 +0000
Subject: fix: move weather feature to org/terst/nav package directories

Package declarations were already org.terst.nav.* but files lived under
com/example/androidapp/. Kotlin 2.0 (K2) compiler on CI fails when
package declarations don't match directory structure during kapt stub
generation. Moved all 20 files to their correct locations and renamed
MainActivity (weather) -> WeatherActivity to avoid confusion with the
nav app's MainActivity.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../debug/processDebugManifest/AndroidManifest.xml | 43 +++++++++++-----------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'android-app/app/build/intermediates/merged_manifests')

diff --git a/android-app/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml b/android-app/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml
index 4d32e28..e23803c 100644
--- a/android-app/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml
+++ b/android-app/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml
@@ -9,9 +9,11 @@
         android:targetSdkVersion="34" />
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <uses-feature
         android:glEsVersion="0x00030000"
@@ -22,7 +24,6 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
     <uses-permission android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION" />
@@ -44,7 +45,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AndroidApp" >
+        android:theme="@style/Theme.Nav" >
         <service
             android:name="org.terst.nav.LocationService"
             android:foregroundServiceType="location" />
@@ -58,6 +59,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.google.android.gms.common.api.GoogleApiActivity"
+            android:exported="false"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"
@@ -93,6 +98,20 @@
             android:directBootAware="true"
             android:exported="false"
             android:initOrder="100" />
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="org.terst.nav.androidx-startup"
+            android:exported="false" >
+            <meta-data
+                android:name="androidx.emoji2.text.EmojiCompatInitializer"
+                android:value="androidx.startup" />
+            <meta-data
+                android:name="androidx.lifecycle.ProcessLifecycleInitializer"
+                android:value="androidx.startup" />
+            <meta-data
+                android:name="androidx.profileinstaller.ProfileInstallerInitializer"
+                android:value="androidx.startup" />
+        </provider>
 
         <receiver
             android:name="com.google.android.gms.measurement.AppMeasurementReceiver"
@@ -114,30 +133,10 @@
             android:name="android.ext.adservices"
             android:required="false" />
 
-        <activity
-            android:name="com.google.android.gms.common.api.GoogleApiActivity"
-            android:exported="false"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="org.terst.nav.androidx-startup"
-            android:exported="false" >
-            <meta-data
-                android:name="androidx.emoji2.text.EmojiCompatInitializer"
-                android:value="androidx.startup" />
-            <meta-data
-                android:name="androidx.lifecycle.ProcessLifecycleInitializer"
-                android:value="androidx.startup" />
-            <meta-data
-                android:name="androidx.profileinstaller.ProfileInstallerInitializer"
-                android:value="androidx.startup" />
-        </provider>
-
         <receiver
             android:name="androidx.profileinstaller.ProfileInstallReceiver"
             android:directBootAware="false"
-- 
cgit v1.2.3