diff --git a/android/motionUI/app/build.gradle b/android/motionUI/app/build.gradle index e579f1f0..71508770 100644 --- a/android/motionUI/app/build.gradle +++ b/android/motionUI/app/build.gradle @@ -19,12 +19,12 @@ android { keyAlias keystoreProperties['keyAlias'] } } - namespace 'com.example.motionui' + namespace 'app.motionui.android' compileSdk 34 defaultConfig { - applicationId "com.example.motionui" - minSdk 24 + applicationId "app.motionui.android" + minSdk 30 targetSdk 34 versionCode 1 versionName "1.0" diff --git a/android/motionUI/app/src/androidTest/java/com/example/motionui/ExampleInstrumentedTest.java b/android/motionUI/app/src/androidTest/java/com/example/motionui/ExampleInstrumentedTest.java index 461a0197..5d010464 100644 --- a/android/motionUI/app/src/androidTest/java/com/example/motionui/ExampleInstrumentedTest.java +++ b/android/motionUI/app/src/androidTest/java/com/example/motionui/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.example.motionui; +package app.motionui.android; import android.content.Context; diff --git a/android/motionUI/app/src/main/AndroidManifest.xml b/android/motionUI/app/src/main/AndroidManifest.xml index 73745859..ed21d468 100644 --- a/android/motionUI/app/src/main/AndroidManifest.xml +++ b/android/motionUI/app/src/main/AndroidManifest.xml @@ -23,10 +23,10 @@ android:usesCleartextTraffic="true" tools:targetApi="31"> @@ -35,7 +35,7 @@ diff --git a/android/motionUI/app/src/main/java/com/example/motionui/MainActivity.java b/android/motionUI/app/src/main/java/app/motionui/android/MainActivity.java similarity index 99% rename from android/motionUI/app/src/main/java/com/example/motionui/MainActivity.java rename to android/motionUI/app/src/main/java/app/motionui/android/MainActivity.java index 221ba144..c254ee79 100644 --- a/android/motionUI/app/src/main/java/com/example/motionui/MainActivity.java +++ b/android/motionUI/app/src/main/java/app/motionui/android/MainActivity.java @@ -1,4 +1,4 @@ -package com.example.motionui; +package app.motionui.android; import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; @@ -23,7 +23,6 @@ import androidx.core.content.ContextCompat; import androidx.annotation.NonNull; - /** * MainActivity * This is the main activity of the app (motionUI main page) diff --git a/android/motionUI/app/src/main/java/com/example/motionui/SplashScreen.java b/android/motionUI/app/src/main/java/app/motionui/android/SplashScreen.java similarity index 95% rename from android/motionUI/app/src/main/java/com/example/motionui/SplashScreen.java rename to android/motionUI/app/src/main/java/app/motionui/android/SplashScreen.java index 16fb8a2e..01012e18 100644 --- a/android/motionUI/app/src/main/java/com/example/motionui/SplashScreen.java +++ b/android/motionUI/app/src/main/java/app/motionui/android/SplashScreen.java @@ -1,7 +1,6 @@ -package com.example.motionui; +package app.motionui.android; import androidx.appcompat.app.AppCompatActivity; - import android.content.Intent; import android.os.Bundle; import android.os.Handler; diff --git a/android/motionUI/app/src/main/java/com/example/motionui/Startup.java b/android/motionUI/app/src/main/java/app/motionui/android/Startup.java similarity index 98% rename from android/motionUI/app/src/main/java/com/example/motionui/Startup.java rename to android/motionUI/app/src/main/java/app/motionui/android/Startup.java index 1fd56a79..078a3e65 100644 --- a/android/motionUI/app/src/main/java/com/example/motionui/Startup.java +++ b/android/motionUI/app/src/main/java/app/motionui/android/Startup.java @@ -1,4 +1,4 @@ -package com.example.motionui; +package app.motionui.android; import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; @@ -6,7 +6,6 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.util.Log; /** * Startup activity diff --git a/android/motionUI/app/src/main/java/com/example/motionui/motionUIEncryptedSharedPreferences.java b/android/motionUI/app/src/main/java/app/motionui/android/motionUIEncryptedSharedPreferences.java similarity index 98% rename from android/motionUI/app/src/main/java/com/example/motionui/motionUIEncryptedSharedPreferences.java rename to android/motionUI/app/src/main/java/app/motionui/android/motionUIEncryptedSharedPreferences.java index 707b8319..d9bac04b 100644 --- a/android/motionUI/app/src/main/java/com/example/motionui/motionUIEncryptedSharedPreferences.java +++ b/android/motionUI/app/src/main/java/app/motionui/android/motionUIEncryptedSharedPreferences.java @@ -1,4 +1,4 @@ -package com.example.motionui; +package app.motionui.android; import android.content.Context; import androidx.security.crypto.EncryptedSharedPreferences; diff --git a/android/motionUI/app/src/main/res/layout/activity_main.xml b/android/motionUI/app/src/main/res/layout/activity_main.xml index 9650be62..d517a596 100644 --- a/android/motionUI/app/src/main/res/layout/activity_main.xml +++ b/android/motionUI/app/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context="app.motionui.android.MainActivity"> + tools:context="app.motionui.android.Startup">