Skip to content

Commit e0a6952

Browse files
wiiznokeswiiznokes
committed
fix most warning on Android
1 parent ee124bb commit e0a6952

36 files changed

+180
-164
lines changed

‎Android/app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
android {
12-
namespace = "io.github.teamclouday.AndroidMic"
12+
namespace = "io.github.teamclouday.androidMic"
1313
compileSdk = 36
1414

1515
defaultConfig {

‎Android/app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<uses-permission android:name="android.permission.USB_PERMISSION" />
1818

1919
<application
20-
android:name="io.github.teamclouday.AndroidMic.AndroidMicApp"
20+
android:name="io.github.teamclouday.androidMic.AndroidMicApp"
2121
android:allowBackup="true"
2222
android:icon="@mipmap/ic_launcher"
2323
android:label="@string/app_name"
@@ -26,7 +26,7 @@
2626
android:theme="@style/Theme.AndroidMic">
2727

2828
<activity
29-
android:name="io.github.teamclouday.AndroidMic.ui.MainActivity"
29+
android:name="io.github.teamclouday.androidMic.ui.MainActivity"
3030
android:exported="true"
3131
android:theme="@style/Theme.AndroidMic">
3232
<intent-filter>
@@ -46,7 +46,7 @@
4646
</activity>
4747

4848
<service
49-
android:name="io.github.teamclouday.AndroidMic.domain.service.ForegroundService"
49+
android:name="io.github.teamclouday.androidMic.domain.service.ForegroundService"
5050
android:foregroundServiceType="microphone" />
5151

5252
</application>

Android/app/src/main/java/io/github/teamclouday/AndroidMic/AndroidMicApp.kt renamed to Android/app/src/main/java/io/github/teamclouday/androidMic/AndroidMicApp.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.teamclouday.AndroidMic
1+
package io.github.teamclouday.androidMic
22

33
import android.app.Application
44
import android.content.ComponentName
@@ -7,15 +7,15 @@ import android.content.ServiceConnection
77
import android.os.IBinder
88
import android.os.Messenger
99
import android.util.Log
10-
import io.github.teamclouday.AndroidMic.domain.service.BIND_SERVICE_ACTION
11-
import io.github.teamclouday.AndroidMic.domain.service.ForegroundService
12-
import io.github.teamclouday.AndroidMic.ui.MainActivity
10+
import io.github.teamclouday.androidMic.domain.service.BIND_SERVICE_ACTION
11+
import io.github.teamclouday.androidMic.domain.service.ForegroundService
12+
import io.github.teamclouday.androidMic.ui.MainActivity
1313
import kotlinx.coroutines.MainScope
1414
import kotlinx.coroutines.launch
1515

1616

17+
private const val TAG = "AndroidMicApp"
1718
class AndroidMicApp : Application() {
18-
private val TAG = "AndroidMicApp"
1919

2020

2121
companion object {

Android/app/src/main/java/io/github/teamclouday/AndroidMic/AppModule.kt renamed to Android/app/src/main/java/io/github/teamclouday/androidMic/AppModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package io.github.teamclouday.AndroidMic
1+
package io.github.teamclouday.androidMic
22

33
import android.content.Context
4-
import io.github.teamclouday.AndroidMic.ui.utils.UiHelper
4+
import io.github.teamclouday.androidMic.ui.utils.UiHelper
55

66

77
interface AppModule {

Android/app/src/main/java/io/github/teamclouday/AndroidMic/Preferences.kt renamed to Android/app/src/main/java/io/github/teamclouday/androidMic/Preferences.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package io.github.teamclouday.AndroidMic
1+
package io.github.teamclouday.androidMic
22

33
import android.content.Context
44
import android.os.Build
55
import androidx.annotation.RequiresApi
66
import androidx.compose.runtime.Composable
77
import androidx.compose.ui.res.stringResource
8-
import io.github.teamclouday.AndroidMic.utils.PreferencesManager
8+
import io.github.teamclouday.androidMic.ui.utils.UiHelper
9+
import io.github.teamclouday.androidMic.utils.PreferencesManager
910

1011
object DefaultStates {
1112
const val IP = "192.168."
@@ -92,4 +93,11 @@ enum class ChannelCount(val value: Int) {
9293
Stereo -> stringResource(R.string.stereo)
9394
}
9495
}
96+
97+
fun getString(uiHelper: UiHelper): String {
98+
return when (this) {
99+
Mono -> uiHelper.getString(R.string.mono)
100+
Stereo -> uiHelper.getString(R.string.stereo)
101+
}
102+
}
95103
}

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/audio/MicAudioManager.kt renamed to Android/app/src/main/java/io/github/teamclouday/androidMic/domain/audio/MicAudioManager.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.teamclouday.AndroidMic.domain.audio
1+
package io.github.teamclouday.androidMic.domain.audio
22

33
import android.Manifest
44
import android.content.Context
@@ -8,7 +8,7 @@ import android.media.AudioRecord
88
import android.media.MediaRecorder
99
import android.util.Log
1010
import androidx.core.content.ContextCompat
11-
import io.github.teamclouday.AndroidMic.domain.service.AudioPacket
11+
import io.github.teamclouday.androidMic.domain.service.AudioPacket
1212
import kotlinx.coroutines.CoroutineScope
1313
import kotlinx.coroutines.Job
1414
import kotlinx.coroutines.channels.awaitClose
@@ -19,6 +19,9 @@ import kotlinx.coroutines.launch
1919
import java.nio.ByteBuffer
2020
import java.nio.ByteOrder
2121

22+
23+
private const val TAG: String = "MicAM"
24+
2225
// manage microphone recording
2326
class MicAudioManager(
2427
ctx: Context,
@@ -28,7 +31,6 @@ class MicAudioManager(
2831
val channelCount: Int
2932

3033
) {
31-
private val TAG: String = "MicAM"
3234

3335
companion object {
3436
const val RECORD_DELAY_MS = 100L

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/service/Command.kt renamed to Android/app/src/main/java/io/github/teamclouday/androidMic/domain/service/Command.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package io.github.teamclouday.AndroidMic.domain.service
1+
package io.github.teamclouday.androidMic.domain.service
22

33
import android.os.Bundle
44
import android.os.Message
5-
import io.github.teamclouday.AndroidMic.AppPreferences
6-
import io.github.teamclouday.AndroidMic.AudioFormat
7-
import io.github.teamclouday.AndroidMic.ChannelCount
8-
import io.github.teamclouday.AndroidMic.Dialogs
9-
import io.github.teamclouday.AndroidMic.Mode
10-
import io.github.teamclouday.AndroidMic.SampleRates
11-
import io.github.teamclouday.AndroidMic.utils.Either
12-
import io.github.teamclouday.AndroidMic.utils.checkIp
13-
import io.github.teamclouday.AndroidMic.utils.checkPort
5+
import io.github.teamclouday.androidMic.AppPreferences
6+
import io.github.teamclouday.androidMic.AudioFormat
7+
import io.github.teamclouday.androidMic.ChannelCount
8+
import io.github.teamclouday.androidMic.Dialogs
9+
import io.github.teamclouday.androidMic.Mode
10+
import io.github.teamclouday.androidMic.SampleRates
11+
import io.github.teamclouday.androidMic.utils.Either
12+
import io.github.teamclouday.androidMic.utils.checkIp
13+
import io.github.teamclouday.androidMic.utils.checkPort
1414

1515
/**
1616
* Service -> UI
@@ -201,7 +201,7 @@ data class ResponseData(
201201

202202

203203
fun Bundle.getOrdinal(key: String): Int? {
204-
val v = this.getInt(key, Int.MIN_VALUE);
204+
val v = this.getInt(key, Int.MIN_VALUE)
205205

206206
return if (v == Int.MIN_VALUE) {
207207
null

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/service/ForegroundService.kt renamed to Android/app/src/main/java/io/github/teamclouday/androidMic/domain/service/ForegroundService.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.teamclouday.AndroidMic.domain.service
1+
package io.github.teamclouday.androidMic.domain.service
22

33
import android.app.NotificationChannel
44
import android.app.NotificationManager
@@ -13,11 +13,11 @@ import android.os.Message
1313
import android.os.Messenger
1414
import android.os.Process
1515
import android.util.Log
16-
import io.github.teamclouday.AndroidMic.Mode
17-
import io.github.teamclouday.AndroidMic.R
18-
import io.github.teamclouday.AndroidMic.domain.audio.MicAudioManager
19-
import io.github.teamclouday.AndroidMic.domain.streaming.MicStreamManager
20-
import io.github.teamclouday.AndroidMic.utils.ignore
16+
import io.github.teamclouday.androidMic.Mode
17+
import io.github.teamclouday.androidMic.R
18+
import io.github.teamclouday.androidMic.domain.audio.MicAudioManager
19+
import io.github.teamclouday.androidMic.domain.streaming.MicStreamManager
20+
import io.github.teamclouday.androidMic.utils.ignore
2121
import kotlinx.coroutines.CoroutineScope
2222
import kotlinx.coroutines.Dispatchers
2323
import kotlinx.coroutines.delay

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/service/Packets.kt renamed to Android/app/src/main/java/io/github/teamclouday/androidMic/domain/service/Packets.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.teamclouday.AndroidMic.domain.service
1+
package io.github.teamclouday.androidMic.domain.service
22

33
// definition of an audio packet
44
data class AudioPacket(

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/service/ServiceUtil.kt renamed to Android/app/src/main/java/io/github/teamclouday/androidMic/domain/service/ServiceUtil.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package io.github.teamclouday.AndroidMic.domain.service
1+
package io.github.teamclouday.androidMic.domain.service
22

33

44
import android.app.Notification
55
import android.app.PendingIntent
66
import android.content.Intent
77
import android.widget.Toast
88
import androidx.core.app.NotificationCompat
9-
import io.github.teamclouday.AndroidMic.R
10-
import io.github.teamclouday.AndroidMic.ui.MainActivity
9+
import io.github.teamclouday.androidMic.R
10+
import io.github.teamclouday.androidMic.ui.MainActivity
1111
import kotlinx.coroutines.CoroutineScope
1212
import kotlinx.coroutines.Dispatchers
1313
import kotlinx.coroutines.launch
@@ -53,7 +53,7 @@ class MessageUi(private val ctx: ForegroundService) {
5353
ctx.getString(R.string.stop_streaming),
5454
pStopStreamingIntent
5555
)
56-
);
56+
)
5757

5858
return builder.build()
5959
}

0 commit comments

Comments
 (0)