Create root package for code

This commit is contained in:
2020-05-11 16:23:28 +02:00
parent 394446308a
commit 28b9e95944
16 changed files with 37 additions and 36 deletions

View File

@@ -21,22 +21,22 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
android:name=".help.HelpActivity" android:name="io.bartek.ttsserver.help.HelpActivity"
android:parentActivityName=".MainActivity" /> android:parentActivityName=".ttsserver.MainActivity" />
<activity <activity
android:name=".preference.PreferencesActivity" android:name="io.bartek.ttsserver.preference.PreferencesActivity"
android:label="@string/title_activity_preferences" android:label="@string/title_activity_preferences"
android:parentActivityName=".MainActivity" /> android:parentActivityName=".ttsserver.MainActivity" />
<service <service
android:name=".service.ForegroundService" android:name="io.bartek.ttsserver.service.ForegroundService"
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
android:permission="io.bartek.permission.TTS_HTTP_SERVICE" /> android:permission="io.bartek.permission.TTS_HTTP_SERVICE" />
<activity <activity
android:name=".MainActivity" android:name=".ttsserver.MainActivity"
android:launchMode="singleTop"> android:launchMode="singleTop">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View File

@@ -1,4 +1,4 @@
package io.bartek package io.bartek.ttsserver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
@@ -13,10 +13,11 @@ import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.AppCompatImageButton import androidx.appcompat.widget.AppCompatImageButton
import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import io.bartek.help.HelpActivity import io.bartek.R
import io.bartek.preference.PreferencesActivity import io.bartek.ttsserver.help.HelpActivity
import io.bartek.service.ForegroundService import io.bartek.ttsserver.preference.PreferencesActivity
import io.bartek.service.ServiceState import io.bartek.ttsserver.service.ForegroundService
import io.bartek.ttsserver.service.ServiceState
class MainActivity : AppCompatActivity() { class MainActivity : AppCompatActivity() {

View File

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

View File

@@ -1,4 +1,4 @@
package io.bartek.help package io.bartek.ttsserver.help
import android.os.Bundle import android.os.Bundle
import android.webkit.WebView import android.webkit.WebView

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
package io.bartek.preference package io.bartek.ttsserver.preference
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity

View File

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

View File

@@ -1,4 +1,4 @@
package io.bartek.service package io.bartek.ttsserver.service
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Notification import android.app.Notification
@@ -8,8 +8,8 @@ import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build import android.os.Build
import io.bartek.MainActivity
import io.bartek.R import io.bartek.R
import io.bartek.ttsserver.MainActivity
class ForegroundNotificationFactory(private val context: Context) { class ForegroundNotificationFactory(private val context: Context) {
private val oreo: Boolean private val oreo: Boolean

View File

@@ -1,4 +1,4 @@
package io.bartek.service package io.bartek.ttsserver.service
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Service import android.app.Service
@@ -7,8 +7,8 @@ import android.content.Intent
import android.content.SharedPreferences import android.content.SharedPreferences
import android.os.PowerManager import android.os.PowerManager
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import io.bartek.preference.PreferenceKey import io.bartek.ttsserver.preference.PreferenceKey
import io.bartek.web.WebServer import io.bartek.ttsserver.web.WebServer
class ForegroundService : Service() { class ForegroundService : Service() {
@@ -79,7 +79,7 @@ class ForegroundService : Service() {
var state = ServiceState.STOPPED var state = ServiceState.STOPPED
private const val WAKELOCK_TAG = "ForegroundService::lock" private const val WAKELOCK_TAG = "ForegroundService::lock"
const val CHANGE_STATE = "io.bartek.service.CHANGE_STATE" const val CHANGE_STATE = "io.bartek.ttsserver.service.CHANGE_STATE"
const val STATE = "STATE" const val STATE = "STATE"
const val START = "START" const val START = "START"
const val STOP = "STOP" const val STOP = "STOP"

View File

@@ -1,4 +1,4 @@
package io.bartek.service package io.bartek.ttsserver.service
enum class ServiceState { enum class ServiceState {
RUNNING, RUNNING,

View File

@@ -1,9 +1,9 @@
package io.bartek.tts package io.bartek.ttsserver.tts
import android.content.Context import android.content.Context
import android.speech.tts.TextToSpeech import android.speech.tts.TextToSpeech
import android.speech.tts.UtteranceProgressListener import android.speech.tts.UtteranceProgressListener
import io.bartek.exception.TTSException import io.bartek.ttsserver.exception.TTSException
import java.io.BufferedInputStream import java.io.BufferedInputStream
import java.io.FileInputStream import java.io.FileInputStream
import java.io.InputStream import java.io.InputStream

View File

@@ -1,4 +1,4 @@
package io.bartek.web package io.bartek.ttsserver.web
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@@ -7,10 +7,10 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import fi.iki.elonen.NanoHTTPD import fi.iki.elonen.NanoHTTPD
import fi.iki.elonen.NanoHTTPD.Response.Status.* import fi.iki.elonen.NanoHTTPD.Response.Status.*
import io.bartek.preference.PreferenceKey import io.bartek.ttsserver.preference.PreferenceKey
import io.bartek.service.ForegroundService import io.bartek.ttsserver.service.ForegroundService
import io.bartek.service.ServiceState import io.bartek.ttsserver.service.ServiceState
import io.bartek.tts.TTS import io.bartek.ttsserver.tts.TTS
import org.json.JSONObject import org.json.JSONObject
import java.util.* import java.util.*

View File

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

View File

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

View File

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