Change root package

This commit is contained in:
2020-05-19 18:32:33 +02:00
parent 51d0e698c7
commit d1ea5641df
39 changed files with 118 additions and 119 deletions

View File

@@ -8,7 +8,7 @@ android {
buildToolsVersion "29.0.3"
defaultConfig {
applicationId "io.bartek"
applicationId "com.bartlomiejpluta"
minSdkVersion 22
targetSdkVersion 29
versionCode 1

View File

@@ -1,4 +1,4 @@
package io.bartek
package com.bartlomiejpluta
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
@@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("io.bartek", appContext.packageName)
assertEquals("com.bartlomiejpluta", appContext.packageName)
}
}

View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="io.bartek">
package="com.bartlomiejpluta">
<permission
android:name="io.bartek.permission.TTS_HTTP_SERVICE"
android:name="com.bartlomiejpluta.permission.TTS_HTTP_SERVICE"
android:description="@string/permission_http_server_description"
android:label="@string/permission_http_server_label"
android:protectionLevel="normal" />
@@ -13,10 +13,10 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="io.bartek.permission.TTS_HTTP_SERVICE" />
<uses-permission android:name="com.bartlomiejpluta.permission.TTS_HTTP_SERVICE" />
<application
android:name=".ttsserver.TTSApplication"
android:name="com.bartlomiejpluta.ttsserver.TTSApplication"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
@@ -26,22 +26,22 @@
android:usesCleartextTraffic="true"
tools:targetApi="m">
<activity
android:name="io.bartek.ttsserver.ui.help.HelpActivity"
android:parentActivityName=".ttsserver.ui.main.MainActivity" />
android:name="com.bartlomiejpluta.ttsserver.ui.help.HelpActivity"
android:parentActivityName="com.bartlomiejpluta.ttsserver.ui.main.MainActivity" />
<activity
android:name="io.bartek.ttsserver.ui.preference.PreferencesActivity"
android:name="com.bartlomiejpluta.ttsserver.ui.preference.PreferencesActivity"
android:label="@string/title_activity_preferences"
android:parentActivityName=".ttsserver.ui.main.MainActivity" />
android:parentActivityName="com.bartlomiejpluta.ttsserver.ui.main.MainActivity" />
<service
android:name="io.bartek.ttsserver.service.foreground.ForegroundService"
android:name="com.bartlomiejpluta.ttsserver.service.foreground.ForegroundService"
android:enabled="true"
android:exported="true"
android:permission="io.bartek.permission.TTS_HTTP_SERVICE" />
android:permission="com.bartlomiejpluta.permission.TTS_HTTP_SERVICE" />
<activity
android:name=".ttsserver.ui.main.MainActivity"
android:name="com.bartlomiejpluta.ttsserver.ui.main.MainActivity"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

View File

@@ -1,7 +1,7 @@
package io.bartek.ttsserver
package com.bartlomiejpluta.ttsserver
import com.bartlomiejpluta.ttsserver.di.component.DaggerAppComponent
import dagger.android.support.DaggerApplication
import io.bartek.ttsserver.di.component.DaggerAppComponent
class TTSApplication : DaggerApplication() {
override fun applicationInjector() = DaggerAppComponent.builder().create(this).let {

View File

@@ -1,9 +1,9 @@
package io.bartek.ttsserver.core.sonos.queue
package com.bartlomiejpluta.ttsserver.core.sonos.queue
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 com.bartlomiejpluta.ttsserver.core.sonos.worker.SonosWorker
import com.bartlomiejpluta.ttsserver.core.tts.engine.TTSEngine
import com.bartlomiejpluta.ttsserver.core.util.NetworkUtil
import com.bartlomiejpluta.ttsserver.core.web.dto.SonosDTO
import java.util.concurrent.BlockingQueue
import java.util.concurrent.LinkedBlockingQueue

View File

@@ -1,10 +1,10 @@
package io.bartek.ttsserver.core.sonos.worker
package com.bartlomiejpluta.ttsserver.core.sonos.worker
import com.bartlomiejpluta.ttsserver.core.tts.engine.TTSEngine
import com.bartlomiejpluta.ttsserver.core.web.dto.SonosDTO
import com.bartlomiejpluta.ttsserver.service.foreground.ForegroundService
import com.bartlomiejpluta.ttsserver.service.state.ServiceState
import com.vmichalak.sonoscontroller.SonosDiscovery
import io.bartek.ttsserver.core.tts.engine.TTSEngine
import io.bartek.ttsserver.core.web.dto.SonosDTO
import io.bartek.ttsserver.service.foreground.ForegroundService
import io.bartek.ttsserver.service.state.ServiceState
import java.util.concurrent.BlockingQueue
class SonosWorker(

View File

@@ -1,11 +1,11 @@
package io.bartek.ttsserver.core.tts.engine
package com.bartlomiejpluta.ttsserver.core.tts.engine
import android.content.Context
import android.speech.tts.TextToSpeech
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 com.bartlomiejpluta.ttsserver.core.tts.listener.TTSProcessListener
import com.bartlomiejpluta.ttsserver.core.tts.model.TTSStream
import com.bartlomiejpluta.ttsserver.core.tts.status.TTSStatus
import com.bartlomiejpluta.ttsserver.core.tts.status.TTSStatusHolder
import java.io.BufferedInputStream
import java.io.File
import java.io.FileInputStream

View File

@@ -0,0 +1,3 @@
package com.bartlomiejpluta.ttsserver.core.tts.exception
class TTSException : Exception("TTS process failed")

View File

@@ -1,7 +1,7 @@
package io.bartek.ttsserver.core.tts.listener
package com.bartlomiejpluta.ttsserver.core.tts.listener
import android.speech.tts.UtteranceProgressListener
import io.bartek.ttsserver.core.tts.exception.TTSException
import com.bartlomiejpluta.ttsserver.core.tts.exception.TTSException
import java.util.concurrent.LinkedBlockingQueue
class TTSProcessListener(private val uuid: String) : UtteranceProgressListener() {

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.core.tts.model
package com.bartlomiejpluta.ttsserver.core.tts.model
import java.io.InputStream

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.core.tts.status
package com.bartlomiejpluta.ttsserver.core.tts.status
import android.speech.tts.TextToSpeech

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.core.tts.status
package com.bartlomiejpluta.ttsserver.core.tts.status
import android.speech.tts.TextToSpeech

View File

@@ -1,10 +1,10 @@
package io.bartek.ttsserver.core.util
package com.bartlomiejpluta.ttsserver.core.util
import android.content.Context
import android.content.Context.WIFI_SERVICE
import android.content.SharedPreferences
import android.net.wifi.WifiManager
import io.bartek.ttsserver.ui.preference.PreferenceKey
import com.bartlomiejpluta.ttsserver.ui.preference.PreferenceKey
import java.net.InetAddress

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.core.web.dto
package com.bartlomiejpluta.ttsserver.core.web.dto
import java.util.*

View File

@@ -1,7 +1,7 @@
package io.bartek.ttsserver.core.web.dto
package com.bartlomiejpluta.ttsserver.core.web.dto
import com.bartlomiejpluta.ttsserver.core.web.exception.WebException
import fi.iki.elonen.NanoHTTPD.Response
import io.bartek.ttsserver.core.web.exception.WebException
import org.json.JSONObject
abstract class DTO(json: String) : JSONObject(json) {

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.core.web.dto
package com.bartlomiejpluta.ttsserver.core.web.dto
import java.util.*

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.core.web.endpoint
package com.bartlomiejpluta.ttsserver.core.web.endpoint
enum class Endpoint(val uri: String, val id: Int) {
UNKNOWN("/", 1),

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.core.web.endpoint
package com.bartlomiejpluta.ttsserver.core.web.endpoint
import android.content.UriMatcher
import android.net.Uri

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.core.web.exception
package com.bartlomiejpluta.ttsserver.core.web.exception
import fi.iki.elonen.NanoHTTPD.Response
import org.json.JSONObject

View File

@@ -1,23 +1,23 @@
package io.bartek.ttsserver.core.web.server
package com.bartlomiejpluta.ttsserver.core.web.server
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import android.net.Uri
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.bartlomiejpluta.ttsserver.core.sonos.queue.SonosQueue
import com.bartlomiejpluta.ttsserver.core.tts.engine.TTSEngine
import com.bartlomiejpluta.ttsserver.core.tts.status.TTSStatus
import com.bartlomiejpluta.ttsserver.core.web.dto.BaseDTO
import com.bartlomiejpluta.ttsserver.core.web.dto.SonosDTO
import com.bartlomiejpluta.ttsserver.core.web.endpoint.Endpoint
import com.bartlomiejpluta.ttsserver.core.web.endpoint.EndpointMatcher
import com.bartlomiejpluta.ttsserver.core.web.exception.WebException
import com.bartlomiejpluta.ttsserver.service.foreground.ForegroundService
import com.bartlomiejpluta.ttsserver.service.state.ServiceState
import com.bartlomiejpluta.ttsserver.ui.preference.PreferenceKey
import fi.iki.elonen.NanoHTTPD
import fi.iki.elonen.NanoHTTPD.Response.Status.*
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 io.bartek.ttsserver.core.web.exception.WebException
import io.bartek.ttsserver.service.foreground.ForegroundService
import io.bartek.ttsserver.service.state.ServiceState
import io.bartek.ttsserver.ui.preference.PreferenceKey
import org.json.JSONObject
import java.io.BufferedInputStream
import java.io.File

View File

@@ -1,10 +1,10 @@
package io.bartek.ttsserver.core.web.server
package com.bartlomiejpluta.ttsserver.core.web.server
import android.content.Context
import android.content.SharedPreferences
import io.bartek.ttsserver.ui.preference.PreferenceKey
import io.bartek.ttsserver.core.sonos.queue.SonosQueue
import io.bartek.ttsserver.core.tts.engine.TTSEngine
import com.bartlomiejpluta.ttsserver.core.sonos.queue.SonosQueue
import com.bartlomiejpluta.ttsserver.core.tts.engine.TTSEngine
import com.bartlomiejpluta.ttsserver.ui.preference.PreferenceKey
class WebServerFactory(
private val preferences: SharedPreferences,

View File

@@ -1,13 +1,13 @@
package io.bartek.ttsserver.di.component
package com.bartlomiejpluta.ttsserver.di.component
import android.content.Context
import com.bartlomiejpluta.ttsserver.TTSApplication
import com.bartlomiejpluta.ttsserver.di.module.AndroidModule
import com.bartlomiejpluta.ttsserver.di.module.TTSModule
import dagger.BindsInstance
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

View File

@@ -1,11 +1,11 @@
package io.bartek.ttsserver.di.module
package com.bartlomiejpluta.ttsserver.di.module
import com.bartlomiejpluta.ttsserver.service.foreground.ForegroundService
import com.bartlomiejpluta.ttsserver.ui.help.HelpActivity
import com.bartlomiejpluta.ttsserver.ui.main.MainActivity
import com.bartlomiejpluta.ttsserver.ui.preference.PreferencesActivity
import dagger.Module
import dagger.android.ContributesAndroidInjector
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 {

View File

@@ -1,17 +1,17 @@
package io.bartek.ttsserver.di.module
package com.bartlomiejpluta.ttsserver.di.module
import android.content.Context
import android.content.SharedPreferences
import android.speech.tts.TextToSpeech
import androidx.preference.PreferenceManager
import com.bartlomiejpluta.ttsserver.core.sonos.queue.SonosQueue
import com.bartlomiejpluta.ttsserver.core.tts.engine.TTSEngine
import com.bartlomiejpluta.ttsserver.core.tts.status.TTSStatusHolder
import com.bartlomiejpluta.ttsserver.core.util.NetworkUtil
import com.bartlomiejpluta.ttsserver.core.web.server.WebServerFactory
import com.bartlomiejpluta.ttsserver.service.notification.ForegroundNotificationFactory
import dagger.Module
import dagger.Provides
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 io.bartek.ttsserver.service.notification.ForegroundNotificationFactory
import javax.inject.Singleton
@Module

View File

@@ -1,14 +1,14 @@
package io.bartek.ttsserver.service.foreground
package com.bartlomiejpluta.ttsserver.service.foreground
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.os.PowerManager
import com.bartlomiejpluta.ttsserver.core.web.server.WebServer
import com.bartlomiejpluta.ttsserver.core.web.server.WebServerFactory
import com.bartlomiejpluta.ttsserver.service.notification.ForegroundNotificationFactory
import com.bartlomiejpluta.ttsserver.service.state.ServiceState
import dagger.android.DaggerService
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
@@ -86,7 +86,7 @@ class ForegroundService : DaggerService() {
var state = ServiceState.STOPPED
private const val WAKELOCK_TAG = "ForegroundService::lock"
const val CHANGE_STATE = "io.bartek.ttsserver.service.CHANGE_STATE"
const val CHANGE_STATE = "com.bartlomiejpluta.ttsserver.service.CHANGE_STATE"
const val STATE = "STATE"
const val START = "START"
const val STOP = "STOP"

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.service.notification
package com.bartlomiejpluta.ttsserver.service.notification
import android.annotation.SuppressLint
import android.app.Notification
@@ -8,9 +8,9 @@ import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.os.Build
import io.bartek.R
import io.bartek.ttsserver.core.util.NetworkUtil
import io.bartek.ttsserver.ui.main.MainActivity
import com.bartlomiejpluta.R
import com.bartlomiejpluta.ttsserver.core.util.NetworkUtil
import com.bartlomiejpluta.ttsserver.ui.main.MainActivity
class ForegroundNotificationFactory(
private val context: Context,

View File

@@ -0,0 +1,6 @@
package com.bartlomiejpluta.ttsserver.service.state
enum class ServiceState {
RUNNING,
STOPPED
}

View File

@@ -1,9 +1,9 @@
package io.bartek.ttsserver.ui.help
package com.bartlomiejpluta.ttsserver.ui.help
import android.os.Bundle
import android.webkit.WebView
import androidx.appcompat.app.AppCompatActivity
import io.bartek.R
import com.bartlomiejpluta.R
import java.util.*
class HelpActivity : AppCompatActivity() {

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.ui.main
package com.bartlomiejpluta.ttsserver.ui.main
import android.content.*
import android.os.Build
@@ -9,13 +9,13 @@ import android.view.View
import android.widget.TextView
import androidx.appcompat.widget.AppCompatImageButton
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.bartlomiejpluta.R
import com.bartlomiejpluta.ttsserver.core.util.NetworkUtil
import com.bartlomiejpluta.ttsserver.service.foreground.ForegroundService
import com.bartlomiejpluta.ttsserver.service.state.ServiceState
import com.bartlomiejpluta.ttsserver.ui.help.HelpActivity
import com.bartlomiejpluta.ttsserver.ui.preference.PreferencesActivity
import dagger.android.support.DaggerAppCompatActivity
import io.bartek.R
import io.bartek.ttsserver.core.util.NetworkUtil
import io.bartek.ttsserver.service.foreground.ForegroundService
import io.bartek.ttsserver.service.state.ServiceState
import io.bartek.ttsserver.ui.help.HelpActivity
import io.bartek.ttsserver.ui.preference.PreferencesActivity
import javax.inject.Inject

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.ui.preference
package com.bartlomiejpluta.ttsserver.ui.preference
import android.content.Context
import android.util.AttributeSet

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.ui.preference
package com.bartlomiejpluta.ttsserver.ui.preference
object PreferenceKey {

View File

@@ -1,8 +1,8 @@
package io.bartek.ttsserver.ui.preference
package com.bartlomiejpluta.ttsserver.ui.preference
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import io.bartek.R
import com.bartlomiejpluta.R
class PreferencesActivity : AppCompatActivity() {

View File

@@ -1,4 +1,4 @@
package io.bartek.ttsserver.ui.preference
package com.bartlomiejpluta.ttsserver.ui.preference
import android.content.BroadcastReceiver
import android.content.Context
@@ -11,9 +11,9 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreference
import io.bartek.R
import io.bartek.ttsserver.service.foreground.ForegroundService
import io.bartek.ttsserver.service.state.ServiceState
import com.bartlomiejpluta.R
import com.bartlomiejpluta.ttsserver.service.foreground.ForegroundService
import com.bartlomiejpluta.ttsserver.service.state.ServiceState
class PreferencesFragment : PreferenceFragmentCompat() {
private lateinit var portPreference: IntEditTextPreference

View File

@@ -1,3 +0,0 @@
package io.bartek.ttsserver.core.tts.exception
class TTSException : Exception("TTS process failed")

View File

@@ -1,6 +0,0 @@
package io.bartek.ttsserver.service.state
enum class ServiceState {
RUNNING,
STOPPED
}

View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ttsserver.ui.help.HelpActivity">
tools:context="com.bartlomiejpluta.ttsserver.ui.help.HelpActivity">
<WebView
android:id="@+id/help_view"

View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ttsserver.ui.main.MainActivity">
tools:context="com.bartlomiejpluta.ttsserver.ui.main.MainActivity">
<TextView
android:id="@+id/server_status"

View File

@@ -2,7 +2,7 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:title="@string/preference_category_server" app:iconSpaceReserved="false">
<io.bartek.ttsserver.ui.preference.IntEditTextPreference
<com.bartlomiejpluta.ttsserver.ui.preference.IntEditTextPreference
android:defaultValue="8080"
android:inputType="number"
android:key="preference_port"

View File

@@ -1,9 +1,8 @@
package io.bartek
package com.bartlomiejpluta
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.Assert.*
/**
* Example local unit test, which will execute on the development machine (host).
*