Skip to content

Commit c0c2873

Browse files
Ayush0ChaudharyAyush0Chaudhary
authored
Merge pull request #108 from Ayush0Chaudhary/network
Network connectivity and privacy policy
2 parents 76aa281 + 2ea1c9a commit c0c2873

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+594
-228
lines changed

‎app/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ if (localPropertiesFile.exists()) {
1616
}
1717

1818
android {
19-
namespace = "com.blurr.app"
19+
namespace = "com.blurr.voice"
2020
compileSdk = 35
2121

2222
defaultConfig {
23-
applicationId = "com.blurr.app"
23+
applicationId = "com.blurr.voice"
2424
minSdk = 24
2525
targetSdk = 35
26-
versionCode = 1
27-
versionName = "1.0"
26+
versionCode = 2
27+
versionName = "1.0.1"
2828

2929
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3030
}

‎app/src/androidTest/java/com/blurr/app/ExampleInstrumentedTest.kt‎ renamed to ‎app/src/androidTest/java/com/blurr/voice/ExampleInstrumentedTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4

‎app/src/main/java/com/blurr/app/AudioWaveView.kt‎ renamed to ‎app/src/main/java/com/blurr/voice/AudioWaveView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import android.animation.ValueAnimator
44
import android.content.Context

‎app/src/main/java/com/blurr/app/ChatActivity.kt‎ renamed to ‎app/src/main/java/com/blurr/voice/ChatActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import android.os.Bundle
44
import android.widget.Button

‎app/src/main/java/com/blurr/app/ChatAdapter.kt‎ renamed to ‎app/src/main/java/com/blurr/voice/ChatAdapter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import android.view.Gravity
44
import android.view.LayoutInflater

‎app/src/main/java/com/blurr/app/ContentModerationService.kt‎ renamed to ‎app/src/main/java/com/blurr/voice/ContentModerationService.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import android.app.Notification
44
import android.app.NotificationChannel
@@ -14,14 +14,14 @@ import android.os.Looper
1414
import android.util.Log
1515
import androidx.annotation.RequiresApi
1616
import androidx.core.app.NotificationCompat
17-
import com.blurr.app.R // Make sure to import your R class
18-
import com.blurr.app.agent.Judge
19-
import com.blurr.app.api.Eyes
20-
import com.blurr.app.api.Finger
21-
import com.blurr.app.utilities.Persistent
22-
import com.blurr.app.utilities.TTSManager
23-
import com.blurr.app.utilities.addResponse
24-
import com.blurr.app.utilities.getReasoningModelApiResponse
17+
import com.blurr.voice.R // Make sure to import your R class
18+
import com.blurr.voice.agent.Judge
19+
import com.blurr.voice.api.Eyes
20+
import com.blurr.voice.api.Finger
21+
import com.blurr.voice.utilities.Persistent
22+
import com.blurr.voice.utilities.TTSManager
23+
import com.blurr.voice.utilities.addResponse
24+
import com.blurr.voice.utilities.getReasoningModelApiResponse
2525
import kotlinx.coroutines.CoroutineScope
2626
import kotlinx.coroutines.Dispatchers
2727
import kotlinx.coroutines.launch

‎app/src/main/java/com/blurr/app/ConversationalAgentService.kt‎ renamed to ‎app/src/main/java/com/blurr/voice/ConversationalAgentService.kt‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import android.app.Notification
44
import android.app.NotificationChannel
55
import android.app.NotificationManager
66
import android.app.Service
7-
import android.content.Context
87
import android.content.Intent
98
import android.graphics.PixelFormat
109
import android.graphics.drawable.GradientDrawable
@@ -17,25 +16,24 @@ import android.util.Log
1716
import android.view.View
1817
import android.view.WindowManager
1918
import androidx.core.app.NotificationCompat
20-
import com.blurr.app.agent.AgentConfig
21-
import com.blurr.app.agent.ClarificationAgent
22-
import com.blurr.app.agent.InfoPool
23-
import com.blurr.app.agent.VisionHelper
24-
import com.blurr.app.agent.VisionMode
25-
import com.blurr.app.services.AgentTaskService
26-
import com.blurr.app.utilities.SpeechCoordinator
19+
import com.blurr.voice.agent.AgentConfig
20+
import com.blurr.voice.agent.ClarificationAgent
21+
import com.blurr.voice.agent.InfoPool
22+
import com.blurr.voice.agent.VisionHelper
23+
import com.blurr.voice.agent.VisionMode
24+
import com.blurr.voice.services.AgentTaskService
25+
import com.blurr.voice.utilities.SpeechCoordinator
2726
import android.os.Handler
2827
import android.os.Looper
2928
import android.view.Gravity
3029
import android.widget.TextView
3130
import androidx.annotation.RequiresApi
3231
import androidx.core.graphics.toColorInt
33-
import com.blurr.app.utilities.STTVisualizer
34-
import com.blurr.app.utilities.TTSManager
35-
import com.blurr.app.utilities.addResponse
36-
import com.blurr.app.utilities.getReasoningModelApiResponse
37-
import com.blurr.app.data.MemoryManager
38-
import com.blurr.app.data.MemoryExtractor
32+
import com.blurr.voice.utilities.TTSManager
33+
import com.blurr.voice.utilities.addResponse
34+
import com.blurr.voice.utilities.getReasoningModelApiResponse
35+
import com.blurr.voice.data.MemoryManager
36+
import com.blurr.voice.data.MemoryExtractor
3937
import com.google.ai.client.generativeai.type.TextPart
4038
import kotlinx.coroutines.CoroutineScope
4139
import kotlinx.coroutines.Dispatchers

‎app/src/main/java/com/blurr/app/DialogueActivity.kt‎ renamed to ‎app/src/main/java/com/blurr/voice/DialogueActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import android.content.Intent
44
import android.os.Bundle
@@ -7,8 +7,8 @@ import android.view.inputmethod.EditorInfo
77
import android.widget.*
88
import androidx.appcompat.app.AppCompatActivity
99
import androidx.lifecycle.lifecycleScope
10-
import com.blurr.app.utilities.TTSManager
11-
import com.blurr.app.utilities.STTManager
10+
import com.blurr.voice.utilities.TTSManager
11+
import com.blurr.voice.utilities.STTManager
1212
import kotlinx.coroutines.*
1313
import kotlinx.coroutines.delay
1414

‎app/src/main/java/com/blurr/app/GlowBorderView.kt‎ renamed to ‎app/src/main/java/com/blurr/voice/GlowBorderView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import android.content.Context
44
import android.graphics.*

‎app/src/main/java/com/blurr/app/MainActivity.kt‎ renamed to ‎app/src/main/java/com/blurr/voice/MainActivity.kt‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.blurr.app
1+
package com.blurr.voice
22

33
import android.Manifest
44
import android.annotation.SuppressLint
5-
import android.content.ComponentCallbacks2
65
import android.content.Intent
76
import android.content.pm.PackageManager
87
import android.graphics.Color
@@ -12,7 +11,7 @@ import android.util.Log
1211
import android.widget.*
1312
import androidx.annotation.RequiresApi
1413
import androidx.appcompat.app.AppCompatActivity
15-
import com.blurr.app.api.Finger
14+
import com.blurr.voice.api.Finger
1615
import kotlinx.coroutines.*
1716
import kotlinx.coroutines.delay
1817

@@ -24,24 +23,21 @@ import android.provider.Settings
2423
import androidx.activity.result.contract.ActivityResultContracts
2524
import androidx.core.content.ContextCompat
2625
import androidx.lifecycle.lifecycleScope
27-
import com.blurr.app.agent.DeepSearch
28-
import com.blurr.app.agent.VisionMode
29-
import com.blurr.app.agent.ClarificationAgent
30-
import com.blurr.app.agent.InfoPool
31-
import com.blurr.app.agent.AgentConfig
32-
import com.blurr.app.utilities.TTSManager
33-
import com.blurr.app.utilities.STTManager
34-
import com.blurr.app.utilities.UserIdManager
26+
import com.blurr.voice.agent.DeepSearch
27+
import com.blurr.voice.agent.VisionMode
28+
import com.blurr.voice.agent.ClarificationAgent
29+
import com.blurr.voice.agent.InfoPool
30+
import com.blurr.voice.agent.AgentConfig
31+
import com.blurr.voice.utilities.TTSManager
32+
import com.blurr.voice.utilities.STTManager
33+
import com.blurr.voice.utilities.UserIdManager
3534
import androidx.core.graphics.toColorInt
3635
import androidx.core.net.toUri
37-
import com.blurr.app.agent.VisionHelper
38-
import com.blurr.app.ConversationalAgentService
39-
import com.blurr.app.services.WakeWordService
40-
import com.blurr.app.services.EnhancedWakeWordService
41-
import com.blurr.app.utilities.getReasoningModelApiResponse
36+
import com.blurr.voice.agent.VisionHelper
37+
import com.blurr.voice.utilities.getReasoningModelApiResponse
4238
import android.view.View
43-
import com.blurr.app.services.AgentTaskService
44-
import com.blurr.app.utilities.PermissionManager
39+
import com.blurr.voice.services.AgentTaskService
40+
import com.blurr.voice.utilities.PermissionManager
4541

4642
class MainActivity : AppCompatActivity() {
4743

0 commit comments

Comments
 (0)