Skip to content

Commit 350da38

Browse files
committed
server provider added
1 parent 53f9de2 commit 350da38

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ dependencies {
6969
implementation("cafe.adriel.voyager:voyager-transitions:$voyagerVersion")
7070
implementation("cafe.adriel.voyager:voyager-androidx:$voyagerVersion")
7171

72-
// implementation(project(":libLocalServer"))
73-
implementation 'com.github.fcat97:local-server:1.0.5'
72+
implementation(project(":libLocalServer"))
73+
//implementation 'com.github.fcat97:local-server:1.0.5'
7474
}

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
android:exported="true"
2424
android:label="@string/app_name"
2525
android:theme="@style/Theme.LocalHostTest">
26-
<!--<intent-filter>
26+
<intent-filter>
2727
<action android:name="android.intent.action.MAIN" />
2828

2929
<category android:name="android.intent.category.LAUNCHER" />
30-
</intent-filter>-->
30+
</intent-filter>
3131
</activity>
3232
<activity
3333
android:name=".xmlUi.activity.DistViewActivity"
3434
android:exported="true"
3535
android:label="@string/app_name"
3636
android:theme="@style/Theme.LocalHostTest">
37-
<intent-filter>
37+
<!--<intent-filter>
3838
<action android:name="android.intent.action.MAIN" />
3939
4040
<category android:name="android.intent.category.LAUNCHER" />
41-
</intent-filter>
41+
</intent-filter>-->
4242
</activity>
4343
</application>
4444

app/src/main/java/media/uqab/localhosttest/composeUi/screen/HomeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import com.tos.libLocalServer.ServerState
5858
import media.uqab.localhosttest.R
5959
import media.uqab.localhosttest.data.UiEvent
6060
import media.uqab.localhosttest.data.model.Dist
61-
import media.uqab.localhosttest.data.server.ServerProvider
61+
import com.tos.libLocalServer.ServerProvider
6262
import media.uqab.localhosttest.composeUi.theme.serverUpColor
6363
import media.uqab.localhosttest.composeUi.viewModel.HomeViewModel
6464

app/src/main/java/media/uqab/localhosttest/composeUi/viewModel/HomeViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import media.uqab.localhosttest.DistHelper
1212
import media.uqab.localhosttest.MyApp
1313
import media.uqab.localhosttest.data.UiEvent
1414
import media.uqab.localhosttest.data.model.Dist
15-
import media.uqab.localhosttest.data.server.ServerProvider
15+
import com.tos.libLocalServer.ServerProvider
1616

1717

1818
class HomeViewModel: ScreenModel {

app/src/main/java/media/uqab/localhosttest/xmlUi/activity/DistViewActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import androidx.lifecycle.lifecycleScope
1313
import com.tos.libLocalServer.ServerState
1414
import kotlinx.coroutines.launch
1515
import media.uqab.localhosttest.DistHelper
16-
import media.uqab.localhosttest.data.server.ServerProvider
16+
import com.tos.libLocalServer.ServerProvider
1717

1818
class DistViewActivity: ComponentActivity() {
1919
private lateinit var webView: WebView

libLocalServer/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ afterEvaluate {
4040
publications {
4141
maven(MavenPublication) {
4242
group = 'com.tos.libLocalServer'
43-
version = '1.0.6'
43+
version = '1.0.7'
4444
artifactId = "libLocalServer"
4545
from components.release
4646

app/src/main/java/media/uqab/localhosttest/data/server/ServerProvider.kt renamed to libLocalServer/src/main/java/com/tos/libLocalServer/ServerProvider.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package media.uqab.localhosttest.data.server
1+
package com.tos.libLocalServer
22

3-
import com.tos.libLocalServer.ServerState
43
import com.tos.libLocalServer.nano.NanoServer
54

65
object ServerProvider {

libLocalServer/src/main/java/com/tos/libLocalServer/nano/NanoServer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import java.io.FileInputStream
1212
*
1313
* @author github/fCat97
1414
*/
15-
class NanoServer: Server {
15+
internal class NanoServer: Server {
1616
companion object {
1717
private const val TAG = "NanoServer"
1818
private const val PORT = 9099

0 commit comments

Comments
 (0)