From 749be67b72df8b97b24afe1fb06a3d3f54183302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Sat, 16 May 2020 11:00:37 +0200 Subject: [PATCH] Refactor top-level packages --- app/src/main/AndroidManifest.xml | 12 +++++----- .../io/bartek/ttsserver/TTSApplication.kt | 2 +- .../{ => core}/sonos/queue/SonosQueue.kt | 12 +++++----- .../{ => core}/sonos/worker/SonosWorker.kt | 10 ++++----- .../{ => core}/tts/engine/TTSEngine.kt | 14 ++++++------ .../{ => core}/tts/exception/TTSException.kt | 2 +- .../ttsserver/{ => core}/tts/listener/Lock.kt | 2 +- .../tts/listener/TTSProcessListener.kt | 2 +- .../{ => core}/tts/model/TTSStream.kt | 2 +- .../{ => core}/tts/status/TTSStatus.kt | 2 +- .../{ => core}/tts/status/TTSStatusHolder.kt | 3 +-- .../ttsserver/{ => core}/util/NetworkUtil.kt | 2 +- .../ttsserver/{ => core}/web/dto/BaseDTO.kt | 2 +- .../ttsserver/{ => core}/web/dto/DTO.kt | 2 +- .../ttsserver/{ => core}/web/dto/SonosDTO.kt | 2 +- .../{ => core}/web/endpoint/Endpoint.kt | 2 +- .../web/endpoint/EndpointMatcher.kt | 2 +- .../{ => core}/web/server/WebServer.kt | 22 +++++++++---------- .../{ => core}/web/server/WebServerFactory.kt | 8 +++---- .../di/{ => component}/AppComponent.kt | 4 +++- .../di/{ => module}/AndroidModule.kt | 10 ++++----- .../ttsserver/di/{ => module}/TTSModule.kt | 19 +++++++++------- .../{ => foreground}/ForegroundService.kt | 14 +++++++----- .../ForegroundNotificationFactory.kt | 8 ++++--- .../service/{ => state}/ServiceState.kt | 2 +- .../ttsserver/{ => ui}/help/HelpActivity.kt | 2 +- .../ttsserver/{ => ui/main}/MainActivity.kt | 11 +++++----- .../preference/IntEditTextPreference.kt | 2 +- .../{ => ui}/preference/Preference.kt | 2 +- .../preference/PreferencesActivity.kt | 2 +- .../preference/PreferencesFragment.kt | 6 ++--- app/src/main/res/layout/activity_help.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/xml/preferences.xml | 2 +- 34 files changed, 101 insertions(+), 92 deletions(-) rename app/src/main/java/io/bartek/ttsserver/{ => core}/sonos/queue/SonosQueue.kt (74%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/sonos/worker/SonosWorker.kt (82%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/tts/engine/TTSEngine.kt (87%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/tts/exception/TTSException.kt (53%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/tts/listener/Lock.kt (77%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/tts/listener/TTSProcessListener.kt (93%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/tts/model/TTSStream.kt (68%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/tts/status/TTSStatus.kt (86%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/tts/status/TTSStatusHolder.kt (72%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/util/NetworkUtil.kt (94%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/web/dto/BaseDTO.kt (90%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/web/dto/DTO.kt (91%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/web/dto/SonosDTO.kt (92%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/web/endpoint/Endpoint.kt (85%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/web/endpoint/EndpointMatcher.kt (88%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/web/server/WebServer.kt (89%) rename app/src/main/java/io/bartek/ttsserver/{ => core}/web/server/WebServerFactory.kt (67%) rename app/src/main/java/io/bartek/ttsserver/di/{ => component}/AppComponent.kt (83%) rename app/src/main/java/io/bartek/ttsserver/di/{ => module}/AndroidModule.kt (63%) rename app/src/main/java/io/bartek/ttsserver/di/{ => module}/TTSModule.kt (72%) rename app/src/main/java/io/bartek/ttsserver/service/{ => foreground}/ForegroundService.kt (83%) rename app/src/main/java/io/bartek/ttsserver/service/{ => notification}/ForegroundNotificationFactory.kt (92%) rename app/src/main/java/io/bartek/ttsserver/service/{ => state}/ServiceState.kt (54%) rename app/src/main/java/io/bartek/ttsserver/{ => ui}/help/HelpActivity.kt (95%) rename app/src/main/java/io/bartek/ttsserver/{ => ui/main}/MainActivity.kt (92%) rename app/src/main/java/io/bartek/ttsserver/{ => ui}/preference/IntEditTextPreference.kt (95%) rename app/src/main/java/io/bartek/ttsserver/{ => ui}/preference/Preference.kt (90%) rename app/src/main/java/io/bartek/ttsserver/{ => ui}/preference/PreferencesActivity.kt (92%) rename app/src/main/java/io/bartek/ttsserver/{ => ui}/preference/PreferencesFragment.kt (95%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index abb92cc..b5977be 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,22 +26,22 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> + android:name="io.bartek.ttsserver.ui.help.HelpActivity" + android:parentActivityName=".ttsserver.ui.main.MainActivity" /> + android:parentActivityName=".ttsserver.ui.main.MainActivity" /> diff --git a/app/src/main/java/io/bartek/ttsserver/TTSApplication.kt b/app/src/main/java/io/bartek/ttsserver/TTSApplication.kt index c3f3c7a..6877793 100644 --- a/app/src/main/java/io/bartek/ttsserver/TTSApplication.kt +++ b/app/src/main/java/io/bartek/ttsserver/TTSApplication.kt @@ -1,7 +1,7 @@ package io.bartek.ttsserver import dagger.android.support.DaggerApplication -import io.bartek.ttsserver.di.DaggerAppComponent +import io.bartek.ttsserver.di.component.DaggerAppComponent class TTSApplication : DaggerApplication() { override fun applicationInjector() = DaggerAppComponent.builder().create(this).let { diff --git a/app/src/main/java/io/bartek/ttsserver/sonos/queue/SonosQueue.kt b/app/src/main/java/io/bartek/ttsserver/core/sonos/queue/SonosQueue.kt similarity index 74% rename from app/src/main/java/io/bartek/ttsserver/sonos/queue/SonosQueue.kt rename to app/src/main/java/io/bartek/ttsserver/core/sonos/queue/SonosQueue.kt index 41a4321..717f5e4 100644 --- a/app/src/main/java/io/bartek/ttsserver/sonos/queue/SonosQueue.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/sonos/queue/SonosQueue.kt @@ -1,11 +1,11 @@ -package io.bartek.ttsserver.sonos.queue +package io.bartek.ttsserver.core.sonos.queue import android.content.SharedPreferences -import io.bartek.ttsserver.preference.PreferenceKey -import io.bartek.ttsserver.sonos.worker.SonosWorker -import io.bartek.ttsserver.tts.engine.TTSEngine -import io.bartek.ttsserver.util.NetworkUtil -import io.bartek.ttsserver.web.dto.SonosDTO +import io.bartek.ttsserver.ui.preference.PreferenceKey +import io.bartek.ttsserver.core.sonos.worker.SonosWorker +import io.bartek.ttsserver.core.tts.engine.TTSEngine +import io.bartek.ttsserver.core.util.NetworkUtil +import io.bartek.ttsserver.core.web.dto.SonosDTO import java.util.concurrent.BlockingQueue import java.util.concurrent.LinkedBlockingQueue diff --git a/app/src/main/java/io/bartek/ttsserver/sonos/worker/SonosWorker.kt b/app/src/main/java/io/bartek/ttsserver/core/sonos/worker/SonosWorker.kt similarity index 82% rename from app/src/main/java/io/bartek/ttsserver/sonos/worker/SonosWorker.kt rename to app/src/main/java/io/bartek/ttsserver/core/sonos/worker/SonosWorker.kt index b03cd6b..8ceabeb 100644 --- a/app/src/main/java/io/bartek/ttsserver/sonos/worker/SonosWorker.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/sonos/worker/SonosWorker.kt @@ -1,12 +1,12 @@ -package io.bartek.ttsserver.sonos.worker +package io.bartek.ttsserver.core.sonos.worker import com.vmichalak.sonoscontroller.SonosDevice import com.vmichalak.sonoscontroller.SonosDiscovery import com.vmichalak.sonoscontroller.model.PlayState -import io.bartek.ttsserver.service.ForegroundService -import io.bartek.ttsserver.service.ServiceState -import io.bartek.ttsserver.tts.engine.TTSEngine -import io.bartek.ttsserver.web.dto.SonosDTO +import io.bartek.ttsserver.service.foreground.ForegroundService +import io.bartek.ttsserver.service.state.ServiceState +import io.bartek.ttsserver.core.tts.engine.TTSEngine +import io.bartek.ttsserver.core.web.dto.SonosDTO import java.util.concurrent.BlockingQueue class SonosWorker( diff --git a/app/src/main/java/io/bartek/ttsserver/tts/engine/TTSEngine.kt b/app/src/main/java/io/bartek/ttsserver/core/tts/engine/TTSEngine.kt similarity index 87% rename from app/src/main/java/io/bartek/ttsserver/tts/engine/TTSEngine.kt rename to app/src/main/java/io/bartek/ttsserver/core/tts/engine/TTSEngine.kt index 5f04cd4..34059cb 100644 --- a/app/src/main/java/io/bartek/ttsserver/tts/engine/TTSEngine.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/tts/engine/TTSEngine.kt @@ -1,13 +1,13 @@ -package io.bartek.ttsserver.tts.engine +package io.bartek.ttsserver.core.tts.engine import android.content.Context import android.speech.tts.TextToSpeech -import io.bartek.ttsserver.tts.exception.TTSException -import io.bartek.ttsserver.tts.listener.Lock -import io.bartek.ttsserver.tts.listener.TTSProcessListener -import io.bartek.ttsserver.tts.model.TTSStream -import io.bartek.ttsserver.tts.status.TTSStatus -import io.bartek.ttsserver.tts.status.TTSStatusHolder +import io.bartek.ttsserver.core.tts.exception.TTSException +import io.bartek.ttsserver.core.tts.listener.Lock +import io.bartek.ttsserver.core.tts.listener.TTSProcessListener +import io.bartek.ttsserver.core.tts.model.TTSStream +import io.bartek.ttsserver.core.tts.status.TTSStatus +import io.bartek.ttsserver.core.tts.status.TTSStatusHolder import java.io.BufferedInputStream import java.io.File import java.io.FileInputStream diff --git a/app/src/main/java/io/bartek/ttsserver/tts/exception/TTSException.kt b/app/src/main/java/io/bartek/ttsserver/core/tts/exception/TTSException.kt similarity index 53% rename from app/src/main/java/io/bartek/ttsserver/tts/exception/TTSException.kt rename to app/src/main/java/io/bartek/ttsserver/core/tts/exception/TTSException.kt index 8276aed..3239992 100644 --- a/app/src/main/java/io/bartek/ttsserver/tts/exception/TTSException.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/tts/exception/TTSException.kt @@ -1,3 +1,3 @@ -package io.bartek.ttsserver.tts.exception +package io.bartek.ttsserver.core.tts.exception class TTSException : Exception("TTS process failed") \ No newline at end of file diff --git a/app/src/main/java/io/bartek/ttsserver/tts/listener/Lock.kt b/app/src/main/java/io/bartek/ttsserver/core/tts/listener/Lock.kt similarity index 77% rename from app/src/main/java/io/bartek/ttsserver/tts/listener/Lock.kt rename to app/src/main/java/io/bartek/ttsserver/core/tts/listener/Lock.kt index 8d2d485..6a84872 100644 --- a/app/src/main/java/io/bartek/ttsserver/tts/listener/Lock.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/tts/listener/Lock.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.tts.listener +package io.bartek.ttsserver.core.tts.listener @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") // TODO: Investigate the Kotlin way to achieve the same diff --git a/app/src/main/java/io/bartek/ttsserver/tts/listener/TTSProcessListener.kt b/app/src/main/java/io/bartek/ttsserver/core/tts/listener/TTSProcessListener.kt similarity index 93% rename from app/src/main/java/io/bartek/ttsserver/tts/listener/TTSProcessListener.kt rename to app/src/main/java/io/bartek/ttsserver/core/tts/listener/TTSProcessListener.kt index 1d55060..e550bc3 100644 --- a/app/src/main/java/io/bartek/ttsserver/tts/listener/TTSProcessListener.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/tts/listener/TTSProcessListener.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.tts.listener +package io.bartek.ttsserver.core.tts.listener import android.speech.tts.UtteranceProgressListener diff --git a/app/src/main/java/io/bartek/ttsserver/tts/model/TTSStream.kt b/app/src/main/java/io/bartek/ttsserver/core/tts/model/TTSStream.kt similarity index 68% rename from app/src/main/java/io/bartek/ttsserver/tts/model/TTSStream.kt rename to app/src/main/java/io/bartek/ttsserver/core/tts/model/TTSStream.kt index bdf346b..36f44ef 100644 --- a/app/src/main/java/io/bartek/ttsserver/tts/model/TTSStream.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/tts/model/TTSStream.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.tts.model +package io.bartek.ttsserver.core.tts.model import java.io.InputStream diff --git a/app/src/main/java/io/bartek/ttsserver/tts/status/TTSStatus.kt b/app/src/main/java/io/bartek/ttsserver/core/tts/status/TTSStatus.kt similarity index 86% rename from app/src/main/java/io/bartek/ttsserver/tts/status/TTSStatus.kt rename to app/src/main/java/io/bartek/ttsserver/core/tts/status/TTSStatus.kt index 23b4a7a..14f5cf8 100644 --- a/app/src/main/java/io/bartek/ttsserver/tts/status/TTSStatus.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/tts/status/TTSStatus.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.tts.status +package io.bartek.ttsserver.core.tts.status import android.speech.tts.TextToSpeech diff --git a/app/src/main/java/io/bartek/ttsserver/tts/status/TTSStatusHolder.kt b/app/src/main/java/io/bartek/ttsserver/core/tts/status/TTSStatusHolder.kt similarity index 72% rename from app/src/main/java/io/bartek/ttsserver/tts/status/TTSStatusHolder.kt rename to app/src/main/java/io/bartek/ttsserver/core/tts/status/TTSStatusHolder.kt index 93ebda1..6cb2595 100644 --- a/app/src/main/java/io/bartek/ttsserver/tts/status/TTSStatusHolder.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/tts/status/TTSStatusHolder.kt @@ -1,7 +1,6 @@ -package io.bartek.ttsserver.tts.status +package io.bartek.ttsserver.core.tts.status import android.speech.tts.TextToSpeech -import io.bartek.ttsserver.tts.status.TTSStatus class TTSStatusHolder : TextToSpeech.OnInitListener { var status = TTSStatus.UNLOADED diff --git a/app/src/main/java/io/bartek/ttsserver/util/NetworkUtil.kt b/app/src/main/java/io/bartek/ttsserver/core/util/NetworkUtil.kt similarity index 94% rename from app/src/main/java/io/bartek/ttsserver/util/NetworkUtil.kt rename to app/src/main/java/io/bartek/ttsserver/core/util/NetworkUtil.kt index dc000c3..c33c5c9 100644 --- a/app/src/main/java/io/bartek/ttsserver/util/NetworkUtil.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/util/NetworkUtil.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.util +package io.bartek.ttsserver.core.util import android.content.Context import android.content.Context.WIFI_SERVICE diff --git a/app/src/main/java/io/bartek/ttsserver/web/dto/BaseDTO.kt b/app/src/main/java/io/bartek/ttsserver/core/web/dto/BaseDTO.kt similarity index 90% rename from app/src/main/java/io/bartek/ttsserver/web/dto/BaseDTO.kt rename to app/src/main/java/io/bartek/ttsserver/core/web/dto/BaseDTO.kt index f3c58d9..489f037 100644 --- a/app/src/main/java/io/bartek/ttsserver/web/dto/BaseDTO.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/web/dto/BaseDTO.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.web.dto +package io.bartek.ttsserver.core.web.dto import org.json.JSONObject import java.util.* diff --git a/app/src/main/java/io/bartek/ttsserver/web/dto/DTO.kt b/app/src/main/java/io/bartek/ttsserver/core/web/dto/DTO.kt similarity index 91% rename from app/src/main/java/io/bartek/ttsserver/web/dto/DTO.kt rename to app/src/main/java/io/bartek/ttsserver/core/web/dto/DTO.kt index a35443d..f26047e 100644 --- a/app/src/main/java/io/bartek/ttsserver/web/dto/DTO.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/web/dto/DTO.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.web.dto +package io.bartek.ttsserver.core.web.dto import fi.iki.elonen.NanoHTTPD.Response import fi.iki.elonen.NanoHTTPD.ResponseException diff --git a/app/src/main/java/io/bartek/ttsserver/web/dto/SonosDTO.kt b/app/src/main/java/io/bartek/ttsserver/core/web/dto/SonosDTO.kt similarity index 92% rename from app/src/main/java/io/bartek/ttsserver/web/dto/SonosDTO.kt rename to app/src/main/java/io/bartek/ttsserver/core/web/dto/SonosDTO.kt index 9fe3d53..32879aa 100644 --- a/app/src/main/java/io/bartek/ttsserver/web/dto/SonosDTO.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/web/dto/SonosDTO.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.web.dto +package io.bartek.ttsserver.core.web.dto import org.json.JSONObject import java.util.* diff --git a/app/src/main/java/io/bartek/ttsserver/web/endpoint/Endpoint.kt b/app/src/main/java/io/bartek/ttsserver/core/web/endpoint/Endpoint.kt similarity index 85% rename from app/src/main/java/io/bartek/ttsserver/web/endpoint/Endpoint.kt rename to app/src/main/java/io/bartek/ttsserver/core/web/endpoint/Endpoint.kt index 928f816..6ce66b6 100644 --- a/app/src/main/java/io/bartek/ttsserver/web/endpoint/Endpoint.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/web/endpoint/Endpoint.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.web.endpoint +package io.bartek.ttsserver.core.web.endpoint enum class Endpoint(val uri: String, val id: Int) { UNKNOWN("/", 1), diff --git a/app/src/main/java/io/bartek/ttsserver/web/endpoint/EndpointMatcher.kt b/app/src/main/java/io/bartek/ttsserver/core/web/endpoint/EndpointMatcher.kt similarity index 88% rename from app/src/main/java/io/bartek/ttsserver/web/endpoint/EndpointMatcher.kt rename to app/src/main/java/io/bartek/ttsserver/core/web/endpoint/EndpointMatcher.kt index e78bf79..c7d5970 100644 --- a/app/src/main/java/io/bartek/ttsserver/web/endpoint/EndpointMatcher.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/web/endpoint/EndpointMatcher.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.web.endpoint +package io.bartek.ttsserver.core.web.endpoint import android.content.UriMatcher import android.net.Uri diff --git a/app/src/main/java/io/bartek/ttsserver/web/server/WebServer.kt b/app/src/main/java/io/bartek/ttsserver/core/web/server/WebServer.kt similarity index 89% rename from app/src/main/java/io/bartek/ttsserver/web/server/WebServer.kt rename to app/src/main/java/io/bartek/ttsserver/core/web/server/WebServer.kt index 1f54ec2..40dd717 100644 --- a/app/src/main/java/io/bartek/ttsserver/web/server/WebServer.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/web/server/WebServer.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.web.server +package io.bartek.ttsserver.core.web.server import android.content.Context import android.content.Intent @@ -7,16 +7,16 @@ import android.net.Uri import androidx.localbroadcastmanager.content.LocalBroadcastManager import fi.iki.elonen.NanoHTTPD import fi.iki.elonen.NanoHTTPD.Response.Status.* -import io.bartek.ttsserver.preference.PreferenceKey -import io.bartek.ttsserver.service.ForegroundService -import io.bartek.ttsserver.service.ServiceState -import io.bartek.ttsserver.sonos.queue.SonosQueue -import io.bartek.ttsserver.tts.engine.TTSEngine -import io.bartek.ttsserver.tts.status.TTSStatus -import io.bartek.ttsserver.web.dto.BaseDTO -import io.bartek.ttsserver.web.dto.SonosDTO -import io.bartek.ttsserver.web.endpoint.Endpoint -import io.bartek.ttsserver.web.endpoint.EndpointMatcher +import io.bartek.ttsserver.ui.preference.PreferenceKey +import io.bartek.ttsserver.service.foreground.ForegroundService +import io.bartek.ttsserver.service.state.ServiceState +import io.bartek.ttsserver.core.sonos.queue.SonosQueue +import io.bartek.ttsserver.core.tts.engine.TTSEngine +import io.bartek.ttsserver.core.tts.status.TTSStatus +import io.bartek.ttsserver.core.web.dto.BaseDTO +import io.bartek.ttsserver.core.web.dto.SonosDTO +import io.bartek.ttsserver.core.web.endpoint.Endpoint +import io.bartek.ttsserver.core.web.endpoint.EndpointMatcher import java.io.BufferedInputStream import java.io.File import java.io.FileInputStream diff --git a/app/src/main/java/io/bartek/ttsserver/web/server/WebServerFactory.kt b/app/src/main/java/io/bartek/ttsserver/core/web/server/WebServerFactory.kt similarity index 67% rename from app/src/main/java/io/bartek/ttsserver/web/server/WebServerFactory.kt rename to app/src/main/java/io/bartek/ttsserver/core/web/server/WebServerFactory.kt index efe0f07..7115690 100644 --- a/app/src/main/java/io/bartek/ttsserver/web/server/WebServerFactory.kt +++ b/app/src/main/java/io/bartek/ttsserver/core/web/server/WebServerFactory.kt @@ -1,10 +1,10 @@ -package io.bartek.ttsserver.web.server +package io.bartek.ttsserver.core.web.server import android.content.Context import android.content.SharedPreferences -import io.bartek.ttsserver.preference.PreferenceKey -import io.bartek.ttsserver.sonos.queue.SonosQueue -import io.bartek.ttsserver.tts.engine.TTSEngine +import io.bartek.ttsserver.ui.preference.PreferenceKey +import io.bartek.ttsserver.core.sonos.queue.SonosQueue +import io.bartek.ttsserver.core.tts.engine.TTSEngine class WebServerFactory( private val preferences: SharedPreferences, diff --git a/app/src/main/java/io/bartek/ttsserver/di/AppComponent.kt b/app/src/main/java/io/bartek/ttsserver/di/component/AppComponent.kt similarity index 83% rename from app/src/main/java/io/bartek/ttsserver/di/AppComponent.kt rename to app/src/main/java/io/bartek/ttsserver/di/component/AppComponent.kt index 61e2353..7214892 100644 --- a/app/src/main/java/io/bartek/ttsserver/di/AppComponent.kt +++ b/app/src/main/java/io/bartek/ttsserver/di/component/AppComponent.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.di +package io.bartek.ttsserver.di.component import android.content.Context import dagger.BindsInstance @@ -6,6 +6,8 @@ import dagger.Component import dagger.android.AndroidInjector import dagger.android.support.AndroidSupportInjectionModule import io.bartek.ttsserver.TTSApplication +import io.bartek.ttsserver.di.module.AndroidModule +import io.bartek.ttsserver.di.module.TTSModule import javax.inject.Singleton @Singleton diff --git a/app/src/main/java/io/bartek/ttsserver/di/AndroidModule.kt b/app/src/main/java/io/bartek/ttsserver/di/module/AndroidModule.kt similarity index 63% rename from app/src/main/java/io/bartek/ttsserver/di/AndroidModule.kt rename to app/src/main/java/io/bartek/ttsserver/di/module/AndroidModule.kt index c85069c..e343546 100644 --- a/app/src/main/java/io/bartek/ttsserver/di/AndroidModule.kt +++ b/app/src/main/java/io/bartek/ttsserver/di/module/AndroidModule.kt @@ -1,11 +1,11 @@ -package io.bartek.ttsserver.di +package io.bartek.ttsserver.di.module import dagger.Module import dagger.android.ContributesAndroidInjector -import io.bartek.ttsserver.MainActivity -import io.bartek.ttsserver.help.HelpActivity -import io.bartek.ttsserver.preference.PreferencesActivity -import io.bartek.ttsserver.service.ForegroundService +import io.bartek.ttsserver.ui.main.MainActivity +import io.bartek.ttsserver.ui.help.HelpActivity +import io.bartek.ttsserver.ui.preference.PreferencesActivity +import io.bartek.ttsserver.service.foreground.ForegroundService @Module abstract class AndroidModule { diff --git a/app/src/main/java/io/bartek/ttsserver/di/TTSModule.kt b/app/src/main/java/io/bartek/ttsserver/di/module/TTSModule.kt similarity index 72% rename from app/src/main/java/io/bartek/ttsserver/di/TTSModule.kt rename to app/src/main/java/io/bartek/ttsserver/di/module/TTSModule.kt index cb7b370..80a636a 100644 --- a/app/src/main/java/io/bartek/ttsserver/di/TTSModule.kt +++ b/app/src/main/java/io/bartek/ttsserver/di/module/TTSModule.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.di +package io.bartek.ttsserver.di.module import android.content.Context import android.content.SharedPreferences @@ -6,12 +6,12 @@ import android.speech.tts.TextToSpeech import androidx.preference.PreferenceManager import dagger.Module import dagger.Provides -import io.bartek.ttsserver.service.ForegroundNotificationFactory -import io.bartek.ttsserver.sonos.queue.SonosQueue -import io.bartek.ttsserver.tts.engine.TTSEngine -import io.bartek.ttsserver.tts.status.TTSStatusHolder -import io.bartek.ttsserver.util.NetworkUtil -import io.bartek.ttsserver.web.server.WebServerFactory +import io.bartek.ttsserver.service.notification.ForegroundNotificationFactory +import io.bartek.ttsserver.core.sonos.queue.SonosQueue +import io.bartek.ttsserver.core.tts.engine.TTSEngine +import io.bartek.ttsserver.core.tts.status.TTSStatusHolder +import io.bartek.ttsserver.core.util.NetworkUtil +import io.bartek.ttsserver.core.web.server.WebServerFactory import javax.inject.Singleton @Module @@ -61,5 +61,8 @@ class TTSModule { @Provides @Singleton - fun foregroundNotificationFactory(context: Context) = ForegroundNotificationFactory(context) + fun foregroundNotificationFactory(context: Context) = + ForegroundNotificationFactory( + context + ) } \ No newline at end of file diff --git a/app/src/main/java/io/bartek/ttsserver/service/ForegroundService.kt b/app/src/main/java/io/bartek/ttsserver/service/foreground/ForegroundService.kt similarity index 83% rename from app/src/main/java/io/bartek/ttsserver/service/ForegroundService.kt rename to app/src/main/java/io/bartek/ttsserver/service/foreground/ForegroundService.kt index c8da712..9f7f5b0 100644 --- a/app/src/main/java/io/bartek/ttsserver/service/ForegroundService.kt +++ b/app/src/main/java/io/bartek/ttsserver/service/foreground/ForegroundService.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.service +package io.bartek.ttsserver.service.foreground import android.annotation.SuppressLint import android.content.Context @@ -6,9 +6,11 @@ import android.content.Intent import android.content.SharedPreferences import android.os.PowerManager import dagger.android.DaggerService -import io.bartek.ttsserver.preference.PreferenceKey -import io.bartek.ttsserver.web.server.WebServer -import io.bartek.ttsserver.web.server.WebServerFactory +import io.bartek.ttsserver.ui.preference.PreferenceKey +import io.bartek.ttsserver.core.web.server.WebServer +import io.bartek.ttsserver.core.web.server.WebServerFactory +import io.bartek.ttsserver.service.notification.ForegroundNotificationFactory +import io.bartek.ttsserver.service.state.ServiceState import javax.inject.Inject @@ -57,7 +59,9 @@ class ForegroundService : DaggerService() { isServiceStarted = true wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).run { - newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_TAG).apply { + newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, + WAKELOCK_TAG + ).apply { acquire() } } diff --git a/app/src/main/java/io/bartek/ttsserver/service/ForegroundNotificationFactory.kt b/app/src/main/java/io/bartek/ttsserver/service/notification/ForegroundNotificationFactory.kt similarity index 92% rename from app/src/main/java/io/bartek/ttsserver/service/ForegroundNotificationFactory.kt rename to app/src/main/java/io/bartek/ttsserver/service/notification/ForegroundNotificationFactory.kt index 9733e88..db0d795 100644 --- a/app/src/main/java/io/bartek/ttsserver/service/ForegroundNotificationFactory.kt +++ b/app/src/main/java/io/bartek/ttsserver/service/notification/ForegroundNotificationFactory.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.service +package io.bartek.ttsserver.service.notification import android.annotation.SuppressLint import android.app.Notification @@ -9,7 +9,7 @@ import android.content.Context import android.content.Intent import android.os.Build import io.bartek.R -import io.bartek.ttsserver.MainActivity +import io.bartek.ttsserver.ui.main.MainActivity class ForegroundNotificationFactory(private val context: Context) { private val oreo: Boolean @@ -57,7 +57,9 @@ class ForegroundNotificationFactory(private val context: Context) { @Suppress("DEPRECATION") @SuppressLint("NewApi") private fun provideNotificationBuilder() = - if (oreo) Notification.Builder(context, NOTIFICATION_CHANNEL_ID) + if (oreo) Notification.Builder(context, + NOTIFICATION_CHANNEL_ID + ) else Notification.Builder(context) companion object { diff --git a/app/src/main/java/io/bartek/ttsserver/service/ServiceState.kt b/app/src/main/java/io/bartek/ttsserver/service/state/ServiceState.kt similarity index 54% rename from app/src/main/java/io/bartek/ttsserver/service/ServiceState.kt rename to app/src/main/java/io/bartek/ttsserver/service/state/ServiceState.kt index 610b503..fc790fb 100644 --- a/app/src/main/java/io/bartek/ttsserver/service/ServiceState.kt +++ b/app/src/main/java/io/bartek/ttsserver/service/state/ServiceState.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.service +package io.bartek.ttsserver.service.state enum class ServiceState { RUNNING, diff --git a/app/src/main/java/io/bartek/ttsserver/help/HelpActivity.kt b/app/src/main/java/io/bartek/ttsserver/ui/help/HelpActivity.kt similarity index 95% rename from app/src/main/java/io/bartek/ttsserver/help/HelpActivity.kt rename to app/src/main/java/io/bartek/ttsserver/ui/help/HelpActivity.kt index 7a61789..a857d1a 100644 --- a/app/src/main/java/io/bartek/ttsserver/help/HelpActivity.kt +++ b/app/src/main/java/io/bartek/ttsserver/ui/help/HelpActivity.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.help +package io.bartek.ttsserver.ui.help import android.os.Bundle import android.webkit.WebView diff --git a/app/src/main/java/io/bartek/ttsserver/MainActivity.kt b/app/src/main/java/io/bartek/ttsserver/ui/main/MainActivity.kt similarity index 92% rename from app/src/main/java/io/bartek/ttsserver/MainActivity.kt rename to app/src/main/java/io/bartek/ttsserver/ui/main/MainActivity.kt index 89c31de..21f91c1 100644 --- a/app/src/main/java/io/bartek/ttsserver/MainActivity.kt +++ b/app/src/main/java/io/bartek/ttsserver/ui/main/MainActivity.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver +package io.bartek.ttsserver.ui.main import android.content.BroadcastReceiver import android.content.Context @@ -10,15 +10,14 @@ import android.view.Menu import android.view.MenuItem import android.view.View import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatImageButton import androidx.localbroadcastmanager.content.LocalBroadcastManager import dagger.android.support.DaggerAppCompatActivity import io.bartek.R -import io.bartek.ttsserver.help.HelpActivity -import io.bartek.ttsserver.preference.PreferencesActivity -import io.bartek.ttsserver.service.ForegroundService -import io.bartek.ttsserver.service.ServiceState +import io.bartek.ttsserver.ui.help.HelpActivity +import io.bartek.ttsserver.ui.preference.PreferencesActivity +import io.bartek.ttsserver.service.foreground.ForegroundService +import io.bartek.ttsserver.service.state.ServiceState import javax.inject.Inject diff --git a/app/src/main/java/io/bartek/ttsserver/preference/IntEditTextPreference.kt b/app/src/main/java/io/bartek/ttsserver/ui/preference/IntEditTextPreference.kt similarity index 95% rename from app/src/main/java/io/bartek/ttsserver/preference/IntEditTextPreference.kt rename to app/src/main/java/io/bartek/ttsserver/ui/preference/IntEditTextPreference.kt index 1eb9960..1235256 100644 --- a/app/src/main/java/io/bartek/ttsserver/preference/IntEditTextPreference.kt +++ b/app/src/main/java/io/bartek/ttsserver/ui/preference/IntEditTextPreference.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.preference +package io.bartek.ttsserver.ui.preference import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/bartek/ttsserver/preference/Preference.kt b/app/src/main/java/io/bartek/ttsserver/ui/preference/Preference.kt similarity index 90% rename from app/src/main/java/io/bartek/ttsserver/preference/Preference.kt rename to app/src/main/java/io/bartek/ttsserver/ui/preference/Preference.kt index f55f07e..66d3c7b 100644 --- a/app/src/main/java/io/bartek/ttsserver/preference/Preference.kt +++ b/app/src/main/java/io/bartek/ttsserver/ui/preference/Preference.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.preference +package io.bartek.ttsserver.ui.preference object PreferenceKey { diff --git a/app/src/main/java/io/bartek/ttsserver/preference/PreferencesActivity.kt b/app/src/main/java/io/bartek/ttsserver/ui/preference/PreferencesActivity.kt similarity index 92% rename from app/src/main/java/io/bartek/ttsserver/preference/PreferencesActivity.kt rename to app/src/main/java/io/bartek/ttsserver/ui/preference/PreferencesActivity.kt index 82dda4f..7616eeb 100644 --- a/app/src/main/java/io/bartek/ttsserver/preference/PreferencesActivity.kt +++ b/app/src/main/java/io/bartek/ttsserver/ui/preference/PreferencesActivity.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.preference +package io.bartek.ttsserver.ui.preference import android.os.Bundle import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/io/bartek/ttsserver/preference/PreferencesFragment.kt b/app/src/main/java/io/bartek/ttsserver/ui/preference/PreferencesFragment.kt similarity index 95% rename from app/src/main/java/io/bartek/ttsserver/preference/PreferencesFragment.kt rename to app/src/main/java/io/bartek/ttsserver/ui/preference/PreferencesFragment.kt index d8e4f6c..ba3694c 100644 --- a/app/src/main/java/io/bartek/ttsserver/preference/PreferencesFragment.kt +++ b/app/src/main/java/io/bartek/ttsserver/ui/preference/PreferencesFragment.kt @@ -1,4 +1,4 @@ -package io.bartek.ttsserver.preference +package io.bartek.ttsserver.ui.preference import android.content.BroadcastReceiver import android.content.Context @@ -12,8 +12,8 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference import io.bartek.R -import io.bartek.ttsserver.service.ForegroundService -import io.bartek.ttsserver.service.ServiceState +import io.bartek.ttsserver.service.foreground.ForegroundService +import io.bartek.ttsserver.service.state.ServiceState class PreferencesFragment : PreferenceFragmentCompat() { private lateinit var portPreference: IntEditTextPreference diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml index 264daeb..e4b04b3 100644 --- a/app/src/main/res/layout/activity_help.xml +++ b/app/src/main/res/layout/activity_help.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ttsserver.help.HelpActivity"> + tools:context=".ttsserver.ui.help.HelpActivity"> + tools:context=".ttsserver.ui.main.MainActivity"> -