diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..ed007e2
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+TimeCraftersConfigurationTool
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2c7e034..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,14 +7,13 @@
-
+
-
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..e34606c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3bc5697..ef48540 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,10 @@
-
-
+
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 3957b22..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-apply plugin: 'com.android.application'
-android.defaultConfig.vectorDrawables.useSupportLibrary = true
-
-android {
- compileSdkVersion 29
- buildToolsVersion "29.0.3"
-
- defaultConfig {
- applicationId "org.timecrafters.TimeCraftersConfigurationTool"
- minSdkVersion 16
- targetSdkVersion 29
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation 'com.google.code.gson:gson:2.8.6'
- implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
- implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'com.google.android.material:material:1.0.0'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
- implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
- implementation 'androidx.navigation:navigation-fragment:2.1.0'
- implementation 'androidx.navigation:navigation-ui:2.1.0'
- implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
- implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test.ext:junit:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..e6e1ab7
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,73 @@
+plugins {
+ id("com.android.application")
+ id("org.jetbrains.kotlin.android")
+}
+
+android {
+ namespace = "org.timecrafters.TimeCraftersConfigurationTool"
+ compileSdk = 34
+
+ defaultConfig {
+ applicationId = "org.timecrafters.timecraftersconfigurationtool"
+ minSdk = 24
+ targetSdk = 34
+ versionCode = 1
+ versionName = "1.0"
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ vectorDrawables {
+ useSupportLibrary = true
+ }
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+ buildFeatures {
+ compose = true
+ }
+ composeOptions {
+ kotlinCompilerExtensionVersion = "1.4.3"
+ }
+ packaging {
+ resources {
+ excludes += "/META-INF/{AL2.0,LGPL2.1}"
+ }
+ }
+}
+
+dependencies {
+ implementation("com.google.code.gson:gson:2.10.1")
+ implementation("androidx.navigation:navigation-ui:2.7.5")
+ val appcompat_version = "1.6.1"
+
+ implementation("androidx.appcompat:appcompat:$appcompat_version")
+ // For loading and tinting drawables on older versions of the platform
+ implementation("androidx.appcompat:appcompat-resources:$appcompat_version")
+
+ implementation("androidx.core:core-ktx:1.12.0")
+ implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+ implementation("androidx.activity:activity-compose:1.8.1")
+ implementation(platform("androidx.compose:compose-bom:2023.03.00"))
+ implementation("androidx.compose.ui:ui")
+ implementation("androidx.compose.ui:ui-graphics")
+ implementation("androidx.compose.ui:ui-tooling-preview")
+ implementation("androidx.compose.material3:material3")
+ testImplementation("junit:junit:4.13.2")
+ androidTestImplementation("androidx.test.ext:junit:1.1.5")
+ androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+ androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
+ androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+ debugImplementation("androidx.compose.ui:ui-tooling")
+ debugImplementation("androidx.compose.ui:ui-test-manifest")
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/timecrafters/TimeCraftersConfigurationTool/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/timecrafters/TimeCraftersConfigurationTool/ExampleInstrumentedTest.java
deleted file mode 100644
index 7c61af7..0000000
--- a/app/src/androidTest/java/org/timecrafters/TimeCraftersConfigurationTool/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.timecrafters.TimeCraftersConfigurationTool;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
- assertEquals("org.timecrafters.TimeCraftersConfigurationTool", appContext.getPackageName());
- }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/timecrafters/timecraftersconfigurationtool/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/timecrafters/timecraftersconfigurationtool/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..d846867
--- /dev/null
+++ b/app/src/androidTest/java/org/timecrafters/timecraftersconfigurationtool/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package org.timecrafters.timecraftersconfigurationtool
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("org.timecrafters.timecraftersconfigurationtool", appContext.packageName)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index faf27a9..5a770d5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,12 +12,15 @@
+ android:theme="@style/AppTheme"
+ tools:targetApi="31">
-
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
deleted file mode 100644
index 599cc1e..0000000
Binary files a/app/src/main/ic_launcher-playstore.png and /dev/null differ
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/LauncherActivity.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/LauncherActivity.java
index 9d59d71..fd95b9b 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/LauncherActivity.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/LauncherActivity.java
@@ -4,7 +4,6 @@ import android.Manifest;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
-import android.util.Log;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java
index 7327f5a..f73eec9 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java
@@ -19,6 +19,7 @@ import androidx.navigation.ui.NavigationUI;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.bottomnavigation.LabelVisibilityMode;
+import com.google.android.material.navigation.NavigationBarView;
import org.timecrafters.TimeCraftersConfigurationTool.backend.Backend;
import org.timecrafters.TimeCraftersConfigurationTool.backend.TAC;
@@ -54,7 +55,7 @@ public class MainActivity extends AppCompatActivity {
Backend.instance().mainActivity = this;
if (Backend.instance().getSettings().mobileShowNavigationLabels) {
- navView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_LABELED);
+ navView.setLabelVisibilityMode(NavigationBarView.LABEL_VISIBILITY_LABELED);
}
// Auto start TACNET server if allowed and device model contains AUTO_START_MODEL
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java
index 3477a59..0130db2 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java
@@ -249,33 +249,29 @@ public class VariableDialog extends TimeCraftersDialog {
menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.boolean_type: {
- setVariableType("boolean");
- return true;
- }
- case R.id.double_type: {
- setVariableType("double");
- return true;
- }
- case R.id.float_type: {
- setVariableType("float");
- return true;
- }
- case R.id.integer_type: {
- setVariableType("integer");
- return true;
- }
- case R.id.long_type: {
- setVariableType("long");
- return true;
- }
- case R.id.string_type: {
- setVariableType("string");
- return true;
- }
+ final int itemID = item.getItemId();
+
+ if (itemID == R.id.boolean_type) {
+ setVariableType("boolean");
+ return true;
+ } else if (itemID == R.id.double_type) {
+ setVariableType("double");
+ return true;
+ } else if (itemID == R.id.float_type) {
+ setVariableType("float");
+ return true;
+ } else if (itemID == R.id.integer_type) {
+ setVariableType("integer");
+ return true;
+ } else if (itemID == R.id.long_type) {
+ setVariableType("long");
+ return true;
+ } else if (itemID == R.id.string_type) {
+ setVariableType("string");
+ return true;
+ } else {
+ return false;
}
- return false;
}
});
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java
index aa4a495..1d86141 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java
@@ -209,28 +209,27 @@ public class ActionsFragment extends TimeCraftersFragment {
menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.clone: {
- CloneDialog dialog = new CloneDialog();
- Bundle bundle = new Bundle();
- bundle.putInt("group_index", getArguments().getInt("group_index"));
- bundle.putInt("action_index", action_index);
- dialog.setArguments(bundle);
- dialog.show(getFragmentManager(), "clone_dialog");
- return true;
- }
- case R.id.save_as_preset: {
- PresetDialog dialog = new PresetDialog();
- Bundle bundle = new Bundle();
- bundle.putInt("group_index", getArguments().getInt("group_index"));
- bundle.putInt("action_index", action_index);
- bundle.putBoolean("is_new_preset", true);
- dialog.setArguments(bundle);
- dialog.show(getFragmentManager(), "preset_dialog");
- return true;
- }
- default:
- return false;
+ final int itemID = item.getItemId();
+
+ if (itemID == R.id.clone) {
+ CloneDialog dialog = new CloneDialog();
+ Bundle bundle = new Bundle();
+ bundle.putInt("group_index", getArguments().getInt("group_index"));
+ bundle.putInt("action_index", action_index);
+ dialog.setArguments(bundle);
+ dialog.show(getFragmentManager(), "clone_dialog");
+ return true;
+ } else if (itemID == R.id.save_as_preset) {
+ PresetDialog dialog = new PresetDialog();
+ Bundle bundle = new Bundle();
+ bundle.putInt("group_index", getArguments().getInt("group_index"));
+ bundle.putInt("action_index", action_index);
+ bundle.putBoolean("is_new_preset", true);
+ dialog.setArguments(bundle);
+ dialog.show(getFragmentManager(), "preset_dialog");
+ return true;
+ } else {
+ return false;
}
}
});
@@ -246,21 +245,21 @@ public class ActionsFragment extends TimeCraftersFragment {
menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.add_from_preset: {
- AddFromPresetDialog dialog = new AddFromPresetDialog();
- Bundle bundle = new Bundle();
- bundle.putBoolean("show_actions", true);
- if (groupIsPreset) {
- bundle.putBoolean("group_is_preset", true);
- }
- bundle.putInt("group_index", getArguments().getInt("group_index"));
- dialog.setArguments(bundle);
- dialog.show(getFragmentManager(), "add_from_preset_dialog");
- return true;
+ final int itemID = item.getItemId();
+
+ if (itemID == R.id.add_from_preset) {
+ AddFromPresetDialog dialog = new AddFromPresetDialog();
+ Bundle bundle = new Bundle();
+ bundle.putBoolean("show_actions", true);
+ if (groupIsPreset) {
+ bundle.putBoolean("group_is_preset", true);
}
- default:
- return false;
+ bundle.putInt("group_index", getArguments().getInt("group_index"));
+ dialog.setArguments(bundle);
+ dialog.show(getFragmentManager(), "add_from_preset_dialog");
+ return true;
+ } else {
+ return false;
}
}
});
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java
index bbf3253..3656b33 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java
@@ -187,26 +187,27 @@ public class GroupsFragment extends TimeCraftersFragment {
menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.clone: {
- CloneDialog dialog = new CloneDialog();
- Bundle bundle = new Bundle();
- bundle.putInt("group_index", group_index);
- dialog.setArguments(bundle);
- dialog.show(getFragmentManager(), "clone_dialog");
- return true;
- }
- case R.id.save_as_preset: {
- PresetDialog dialog = new PresetDialog();
- Bundle bundle = new Bundle();
- bundle.putBoolean("is_new_preset", true);
- bundle.putInt("group_index", group_index);
- dialog.setArguments(bundle);
- dialog.show(getFragmentManager(), "preset_dialog");
- return true;
- }
- default:
- return false;
+ final int itemID = item.getItemId();
+
+ if (itemID == R.id.clone) {
+ CloneDialog dialog = new CloneDialog();
+ Bundle bundle = new Bundle();
+ bundle.putInt("group_index", group_index);
+ dialog.setArguments(bundle);
+ dialog.show(getFragmentManager(), "clone_dialog");
+
+ return true;
+ } else if (itemID == R.id.save_as_preset) {
+ PresetDialog dialog = new PresetDialog();
+ Bundle bundle = new Bundle();
+ bundle.putBoolean("is_new_preset", true);
+ bundle.putInt("group_index", group_index);
+ dialog.setArguments(bundle);
+ dialog.show(getFragmentManager(), "preset_dialog");
+
+ return true;
+ } else {
+ return false;
}
}
});
@@ -222,17 +223,17 @@ public class GroupsFragment extends TimeCraftersFragment {
menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.add_from_preset: {
- AddFromPresetDialog dialog = new AddFromPresetDialog();
- Bundle bundle = new Bundle();
- bundle.putBoolean("show_actions", false);
- dialog.setArguments(bundle);
- dialog.show(getFragmentManager(), "add_from_preset_dialog");
- return true;
- }
- default:
- return false;
+ final int itemID = item.getItemId();
+
+ if (itemID == R.id.add_from_preset) {
+ AddFromPresetDialog dialog = new AddFromPresetDialog();
+ Bundle bundle = new Bundle();
+ bundle.putBoolean("show_actions", false);
+ dialog.setArguments(bundle);
+ dialog.show(getFragmentManager(), "add_from_preset_dialog");
+ return true;
+ } else {
+ return false;
}
}
});
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..07d5da9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2b068d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+
+
+
+
+