updates webserver

vicktor · Jun 7, 2023 · 1709492 · 1709492
1 parent ad0f8c2
commit 1709492
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "xyz.bauber.vampire"
         minSdk 28
         targetSdk 33
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 3
+        versionName "1.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/xyz/bauber/vampire/services/WebServerService.kt b/app/src/main/java/xyz/bauber/vampire/services/WebServerService.kt
@@ -24,7 +24,7 @@ class WebServerService : Service() {
 
         val notification = NotificationCompat.Builder(this, CHANNEL_ID)
             .setContentTitle(getString(R.string.webserver))
-            .setContentText(getString(R.string.ws_running))
+            .setContentText("$URL:$PORT")
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setSmallIcon(R.drawable.ic_notification)
             .build()
@@ -49,7 +49,7 @@ class WebServerService : Service() {
     private fun createNotificationChannel() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val name = getString(R.string.webserver)
-            val descriptionText = getString(R.string.ws_running)
+            val descriptionText = "$URL:$PORT"
             val importance = NotificationManager.IMPORTANCE_DEFAULT
             val channel = NotificationChannel(CHANNEL_ID, name, importance).apply {
                 description = descriptionText
@@ -63,5 +63,7 @@ class WebServerService : Service() {
     companion object {
         const val CHANNEL_ID = "VampireWebServerHttpChannel"
         const val NOTIFICATION_ID = 19701506
+        const val PORT = 5566
+        const val URL = "http://localhost"
     }
 }
diff --git a/app/src/main/java/xyz/bauber/vampire/webserver/WebServer.kt b/app/src/main/java/xyz/bauber/vampire/webserver/WebServer.kt
@@ -4,8 +4,10 @@ import com.google.gson.Gson
 import xyz.bauber.vampire.BaseApplication
 import xyz.bauber.vampire.database.DatabaseManager
 import fi.iki.elonen.NanoHTTPD
+import xyz.bauber.vampire.services.WebServerService.Companion.PORT
 
-class WebServer : NanoHTTPD(5566) {
+
+class WebServer : NanoHTTPD(PORT) {
     override fun serve(session: IHTTPSession): Response {
         val mimeType = "text/json"
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -60,9 +60,8 @@
 
     <ImageView
         android:id="@+id/imageView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
         android:src="@mipmap/ic_launcher_adaptive_fore"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -105,6 +104,7 @@
         app:layout_constraintEnd_toStartOf="@+id/save"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
+        android:background="#eee"
         android:focusableInTouchMode="true">
         <requestFocus />
     </EditText>