* app architecture adjustments

amoledwatchfaces · Sep 9, 2024 · e938b3a · e938b3a
1 parent 9b45522
commit e938b3a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
@@ -35,7 +35,7 @@
     </queries>
 
     <application
-        android:name=".MainApp"
+        android:name=".MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -99,7 +99,7 @@
                 android:value="true" />
         </service>
 
-        <receiver android:name=".DateAndBootReceiver"
+        <receiver android:name=".receiver.DateAndBootReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.TIME_SET" />
@@ -419,7 +419,7 @@
                 android:name="android.support.wearable.complications.SUPPORTED_TYPES"
                 android:value="SHORT_TEXT,LONG_TEXT,RANGED_VALUE" />
         </service>
-        <receiver android:name=".ComplicationTapBroadcastReceiver" />
+        <receiver android:name=".receiver.ComplicationTapBroadcastReceiver" />
 
         <activity
             android:name=".activity.FlashlightActivity"

diff --git a/...n/com/weartools/weekdayutccomp/MainApp.kt → ...artools/weekdayutccomp/MainApplication.kt b/...n/com/weartools/weekdayutccomp/MainApp.kt → ...artools/weekdayutccomp/MainApplication.kt
@@ -5,7 +5,7 @@ import androidx.work.Configuration
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class MainApp : Application(), Configuration.Provider{
+class MainApplication : Application(), Configuration.Provider{
 
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder()

diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/AssistComplicationService.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/AssistComplicationService.kt
@@ -35,8 +35,8 @@ import androidx.wear.watchface.complications.datasource.ComplicationRequest
 import androidx.wear.watchface.complications.datasource.SuspendingComplicationDataSourceService
 import com.weartools.weekdayutccomp.R
 import com.weartools.weekdayutccomp.R.drawable
-import com.weartools.weekdayutccomp.ComplicationTapBroadcastReceiver
-import com.weartools.weekdayutccomp.ComplicationToggleArgs
+import com.weartools.weekdayutccomp.receiver.ComplicationTapBroadcastReceiver
+import com.weartools.weekdayutccomp.receiver.ComplicationToggleArgs
 
 class AssistComplicationService : SuspendingComplicationDataSourceService() {
 

diff --git a/.../main/kotlin/com/weartools/weekdayutccomp/complication/BitcoinPriceComplicationService.kt b/.../main/kotlin/com/weartools/weekdayutccomp/complication/BitcoinPriceComplicationService.kt
@@ -35,8 +35,8 @@ import com.weartools.weekdayutccomp.R.drawable
 import com.weartools.weekdayutccomp.network.ApiService
 import com.weartools.weekdayutccomp.preferences.UserPreferences
 import com.weartools.weekdayutccomp.preferences.UserPreferencesRepository
-import com.weartools.weekdayutccomp.ComplicationTapBroadcastReceiver
-import com.weartools.weekdayutccomp.ComplicationToggleArgs
+import com.weartools.weekdayutccomp.receiver.ComplicationTapBroadcastReceiver
+import com.weartools.weekdayutccomp.receiver.ComplicationToggleArgs
 import com.weartools.weekdayutccomp.utils.isOnline
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.first

diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/DiceComplicationService.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/DiceComplicationService.kt
@@ -32,8 +32,8 @@ import androidx.wear.watchface.complications.data.SmallImageType
 import androidx.wear.watchface.complications.datasource.ComplicationRequest
 import androidx.wear.watchface.complications.datasource.SuspendingComplicationDataSourceService
 import com.weartools.weekdayutccomp.R.drawable
-import com.weartools.weekdayutccomp.ComplicationTapBroadcastReceiver
-import com.weartools.weekdayutccomp.ComplicationToggleArgs
+import com.weartools.weekdayutccomp.receiver.ComplicationTapBroadcastReceiver
+import com.weartools.weekdayutccomp.receiver.ComplicationToggleArgs
 
 
 class DiceComplicationService : SuspendingComplicationDataSourceService() {

diff --git a/...main/kotlin/com/weartools/weekdayutccomp/complication/EthereumPriceComplicationService.kt b/...main/kotlin/com/weartools/weekdayutccomp/complication/EthereumPriceComplicationService.kt
@@ -35,8 +35,8 @@ import com.weartools.weekdayutccomp.R.drawable
 import com.weartools.weekdayutccomp.network.ApiService
 import com.weartools.weekdayutccomp.preferences.UserPreferences
 import com.weartools.weekdayutccomp.preferences.UserPreferencesRepository
-import com.weartools.weekdayutccomp.ComplicationTapBroadcastReceiver
-import com.weartools.weekdayutccomp.ComplicationToggleArgs
+import com.weartools.weekdayutccomp.receiver.ComplicationTapBroadcastReceiver
+import com.weartools.weekdayutccomp.receiver.ComplicationToggleArgs
 import com.weartools.weekdayutccomp.utils.isOnline
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.first

diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/PayComplicationService.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/PayComplicationService.kt
@@ -26,8 +26,8 @@ import androidx.wear.watchface.complications.data.*
 import androidx.wear.watchface.complications.datasource.ComplicationRequest
 import androidx.wear.watchface.complications.datasource.SuspendingComplicationDataSourceService
 import com.weartools.weekdayutccomp.R.drawable
-import com.weartools.weekdayutccomp.ComplicationTapBroadcastReceiver
-import com.weartools.weekdayutccomp.ComplicationToggleArgs
+import com.weartools.weekdayutccomp.receiver.ComplicationTapBroadcastReceiver
+import com.weartools.weekdayutccomp.receiver.ComplicationToggleArgs
 
 class PayComplicationService : SuspendingComplicationDataSourceService() {
 

diff --git a/...ccomp/ComplicationTapBroadcastReceiver.kt → ...eiver/ComplicationTapBroadcastReceiver.kt b/...ccomp/ComplicationTapBroadcastReceiver.kt → ...eiver/ComplicationTapBroadcastReceiver.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.weartools.weekdayutccomp
+package com.weartools.weekdayutccomp.receiver
 
 import android.app.PendingIntent
 import android.content.BroadcastReceiver

diff --git a/...ols/weekdayutccomp/DateAndBootReceiver.kt → ...ayutccomp/receiver/DateAndBootReceiver.kt b/...ols/weekdayutccomp/DateAndBootReceiver.kt → ...ayutccomp/receiver/DateAndBootReceiver.kt
@@ -1,4 +1,4 @@
-package com.weartools.weekdayutccomp
+package com.weartools.weekdayutccomp.receiver
 
 import android.content.BroadcastReceiver
 import android.content.ComponentName