From 953e4acd1589579030439a90eecff5e30b16fdc6 Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Thu, 8 Dec 2022 18:33:13 +0100 Subject: [PATCH] Move activity to own package Signed-off-by: Severin Kaderli --- src/MagSend/app/src/main/AndroidManifest.xml | 12 ++++++------ .../kaderli/magsend/{ => activity}/BaseActivity.kt | 3 ++- .../magsend/{ => activity}/BaseSensorActivity.kt | 3 +-- .../magsend/{ => activity}/CalibrationActivity.kt | 3 ++- .../kaderli/magsend/{ => activity}/MainActivity.kt | 3 ++- .../magsend/{ => activity}/ReceiveActivity.kt | 5 ++--- .../app/src/main/res/layout/activity_calibration.xml | 2 +- .../app/src/main/res/layout/activity_main.xml | 2 +- .../app/src/main/res/layout/activity_receive.xml | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) rename src/MagSend/app/src/main/java/dev/kaderli/magsend/{ => activity}/BaseActivity.kt (91%) rename src/MagSend/app/src/main/java/dev/kaderli/magsend/{ => activity}/BaseSensorActivity.kt (95%) rename src/MagSend/app/src/main/java/dev/kaderli/magsend/{ => activity}/CalibrationActivity.kt (94%) rename src/MagSend/app/src/main/java/dev/kaderli/magsend/{ => activity}/MainActivity.kt (85%) rename src/MagSend/app/src/main/java/dev/kaderli/magsend/{ => activity}/ReceiveActivity.kt (98%) diff --git a/src/MagSend/app/src/main/AndroidManifest.xml b/src/MagSend/app/src/main/AndroidManifest.xml index 0265053..a0e7876 100644 --- a/src/MagSend/app/src/main/AndroidManifest.xml +++ b/src/MagSend/app/src/main/AndroidManifest.xml @@ -13,32 +13,32 @@ android:theme="@style/Theme.MagSend" tools:targetApi="31"> + android:parentActivityName=".activity.MainActivity"> + android:parentActivityName=".activity.MainActivity"> diff --git a/src/MagSend/app/src/main/java/dev/kaderli/magsend/BaseActivity.kt b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseActivity.kt similarity index 91% rename from src/MagSend/app/src/main/java/dev/kaderli/magsend/BaseActivity.kt rename to src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseActivity.kt index 97f2ec0..4ba0ac3 100644 --- a/src/MagSend/app/src/main/java/dev/kaderli/magsend/BaseActivity.kt +++ b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseActivity.kt @@ -1,8 +1,9 @@ -package dev.kaderli.magsend +package dev.kaderli.magsend.activity import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar +import dev.kaderli.magsend.R abstract class BaseActivity : AppCompatActivity() { diff --git a/src/MagSend/app/src/main/java/dev/kaderli/magsend/BaseSensorActivity.kt b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseSensorActivity.kt similarity index 95% rename from src/MagSend/app/src/main/java/dev/kaderli/magsend/BaseSensorActivity.kt rename to src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseSensorActivity.kt index 1060df3..1827142 100644 --- a/src/MagSend/app/src/main/java/dev/kaderli/magsend/BaseSensorActivity.kt +++ b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseSensorActivity.kt @@ -1,11 +1,10 @@ -package dev.kaderli.magsend +package dev.kaderli.magsend.activity import android.content.Context import android.hardware.Sensor import android.hardware.SensorEvent import android.hardware.SensorEventListener import android.hardware.SensorManager -import android.os.Bundle import kotlin.math.pow import kotlin.math.sqrt diff --git a/src/MagSend/app/src/main/java/dev/kaderli/magsend/CalibrationActivity.kt b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/CalibrationActivity.kt similarity index 94% rename from src/MagSend/app/src/main/java/dev/kaderli/magsend/CalibrationActivity.kt rename to src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/CalibrationActivity.kt index 84afc6b..c72ba24 100644 --- a/src/MagSend/app/src/main/java/dev/kaderli/magsend/CalibrationActivity.kt +++ b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/CalibrationActivity.kt @@ -1,4 +1,4 @@ -package dev.kaderli.magsend +package dev.kaderli.magsend.activity import android.os.Bundle import android.widget.TextView @@ -6,6 +6,7 @@ import com.github.mikephil.charting.charts.LineChart import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.data.LineData import com.github.mikephil.charting.data.LineDataSet +import dev.kaderli.magsend.R class CalibrationActivity : BaseSensorActivity() { private lateinit var calibrationValue: TextView diff --git a/src/MagSend/app/src/main/java/dev/kaderli/magsend/MainActivity.kt b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/MainActivity.kt similarity index 85% rename from src/MagSend/app/src/main/java/dev/kaderli/magsend/MainActivity.kt rename to src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/MainActivity.kt index bb7046d..75506e6 100644 --- a/src/MagSend/app/src/main/java/dev/kaderli/magsend/MainActivity.kt +++ b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/MainActivity.kt @@ -1,7 +1,8 @@ -package dev.kaderli.magsend +package dev.kaderli.magsend.activity import android.content.Intent import android.view.View +import dev.kaderli.magsend.R class MainActivity : BaseActivity() { diff --git a/src/MagSend/app/src/main/java/dev/kaderli/magsend/ReceiveActivity.kt b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/ReceiveActivity.kt similarity index 98% rename from src/MagSend/app/src/main/java/dev/kaderli/magsend/ReceiveActivity.kt rename to src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/ReceiveActivity.kt index 69ee708..86e7690 100644 --- a/src/MagSend/app/src/main/java/dev/kaderli/magsend/ReceiveActivity.kt +++ b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/ReceiveActivity.kt @@ -1,16 +1,15 @@ -package dev.kaderli.magsend +package dev.kaderli.magsend.activity import android.os.Bundle import android.util.Log import android.view.View import android.widget.TextView import androidx.core.content.ContextCompat +import dev.kaderli.magsend.R import dev.kaderli.magsend.model.Sample import dev.kaderli.magsend.model.Signal import java.lang.Integer.min -const val NEEDED_SAMPLES_PER_SECOND = 190 - class ReceiveActivity : BaseSensorActivity() { private lateinit var preambleStatus: TextView private lateinit var headerStatus: TextView diff --git a/src/MagSend/app/src/main/res/layout/activity_calibration.xml b/src/MagSend/app/src/main/res/layout/activity_calibration.xml index 919b8f2..3a94f56 100644 --- a/src/MagSend/app/src/main/res/layout/activity_calibration.xml +++ b/src/MagSend/app/src/main/res/layout/activity_calibration.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".CalibrationActivity"> + tools:context=".activity.CalibrationActivity"> diff --git a/src/MagSend/app/src/main/res/layout/activity_main.xml b/src/MagSend/app/src/main/res/layout/activity_main.xml index d0fa853..c01e9dd 100644 --- a/src/MagSend/app/src/main/res/layout/activity_main.xml +++ b/src/MagSend/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".activity.MainActivity"> diff --git a/src/MagSend/app/src/main/res/layout/activity_receive.xml b/src/MagSend/app/src/main/res/layout/activity_receive.xml index ba3c5e3..12cd56b 100644 --- a/src/MagSend/app/src/main/res/layout/activity_receive.xml +++ b/src/MagSend/app/src/main/res/layout/activity_receive.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ReceiveActivity"> + tools:context=".activity.ReceiveActivity">