diff --git a/.idea/.name b/.idea/.name index ed007e2..4c01b38 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -TimeCraftersConfigurationTool \ No newline at end of file +TimeCrafters Configuration Tool \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 681f41a..b4ecf18 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,11 @@ + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..0fc3113 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml new file mode 100644 index 0000000..8ec256a --- /dev/null +++ b/.idea/render.experimental.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e6e1ab7..fb68a63 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,7 +8,7 @@ android { compileSdk = 34 defaultConfig { - applicationId = "org.timecrafters.timecraftersconfigurationtool" + applicationId = "org.timecrafters.TimeCraftersConfigurationTool" minSdk = 24 targetSdk = 34 versionCode = 1 @@ -49,6 +49,7 @@ android { dependencies { implementation("com.google.code.gson:gson:2.10.1") implementation("androidx.navigation:navigation-ui:2.7.5") + implementation("androidx.navigation:navigation-fragment:2.7.5") val appcompat_version = "1.6.1" implementation("androidx.appcompat:appcompat:$appcompat_version") diff --git a/app/src/androidTest/java/org/timecrafters/timecraftersconfigurationtool/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/timecrafters/timecraftersconfigurationtool/ExampleInstrumentedTest.kt deleted file mode 100644 index d846867..0000000 --- a/app/src/androidTest/java/org/timecrafters/timecraftersconfigurationtool/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -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/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java index f73eec9..6c04de2 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java @@ -14,6 +14,7 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.navigation.NavController; import androidx.navigation.Navigation; +import androidx.navigation.fragment.NavHostFragment; import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.NavigationUI; @@ -43,7 +44,11 @@ public class MainActivity extends AppCompatActivity { R.id.navigation_tacnet, R.id.navigation_editor, R.id.navigation_settings, R.id.navigation_search) .build(); - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); + NavHostFragment navHostFragment = + (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment); + NavController navController = navHostFragment.getNavController(); + navController.setGraph(R.navigation.mobile_navigation); + NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupWithNavController(navView, navController); @@ -72,7 +77,7 @@ public class MainActivity extends AppCompatActivity { registerReceiver(new TACNETOnBootReceiver(), new IntentFilter(Intent.ACTION_BOOT_COMPLETED)); if (getIntent().getBooleanExtra("navigate_to_tacnet", false)) { - Navigation.findNavController(this, R.id.nav_host_fragment).navigate(R.id.navigation_tacnet); + navController.navigate(R.id.navigation_tacnet); } startTACNETStatusIndictator(); @@ -104,7 +109,10 @@ public class MainActivity extends AppCompatActivity { @Override public boolean onSupportNavigateUp() { - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); + NavHostFragment navHostFragment = + (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment); + NavController navController = navHostFragment.getNavController(); + return NavigationUI.navigateUp(navController, appBarConfiguration) || super.onSupportNavigateUp(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 24b7bd4..63366a8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,11 +1,13 @@ - + app:menu="@menu/bottom_nav_menu" + tools:visibility="visible" /> \ No newline at end of file diff --git a/app/src/test/java/org/timecrafters/timecraftersconfigurationtool/ExampleUnitTest.kt b/app/src/test/java/org/timecrafters/timecraftersconfigurationtool/ExampleUnitTest.kt deleted file mode 100644 index e6b0bce..0000000 --- a/app/src/test/java/org/timecrafters/timecraftersconfigurationtool/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.timecrafters.timecraftersconfigurationtool - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file