From b9b2898392679fb2eff0e3db46ad2a1f26701e96 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Sun, 3 Sep 2023 16:03:54 +0200 Subject: [PATCH] more android app stuff --- src/apps/Android/.idea/.gitignore | 3 - src/apps/Android/.idea/.name | 2 +- src/apps/Android/.idea/kotlinc.xml | 2 +- src/apps/Android/app/build.gradle.kts | 10 +- .../ExampleInstrumentedTest.kt | 4 +- .../Android/app/src/main/AndroidManifest.xml | 11 +-- .../com/janishutz/libreevent/MainActivity.kt | 13 +++ .../libreeventEntryControl/MainActivity.kt | 58 ----------- .../src/main/res/anim/scanner_animation.xml | 4 - .../app/src/main/res/layout/activity_main.xml | 95 ++++++++++++++----- .../src/main/res/layout/activity_scanner.xml | 4 +- .../app/src/main/res/values-land/dimens.xml | 3 - .../app/src/main/res/values-night/themes.xml | 2 +- .../app/src/main/res/values-v23/themes.xml | 9 -- .../src/main/res/values-w1240dp/dimens.xml | 3 - .../app/src/main/res/values-w600dp/dimens.xml | 3 - .../app/src/main/res/values/dimens.xml | 3 - .../app/src/main/res/values/strings.xml | 45 +-------- .../app/src/main/res/values/themes.xml | 4 +- .../ExampleUnitTest.kt | 2 +- src/apps/Android/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- src/apps/Android/settings.gradle.kts | 2 +- 23 files changed, 103 insertions(+), 183 deletions(-) delete mode 100644 src/apps/Android/.idea/.gitignore rename src/apps/Android/app/src/androidTest/java/com/janishutz/{libreeventEntryControl => libreevent}/ExampleInstrumentedTest.kt (81%) create mode 100644 src/apps/Android/app/src/main/java/com/janishutz/libreevent/MainActivity.kt delete mode 100644 src/apps/Android/app/src/main/java/com/janishutz/libreeventEntryControl/MainActivity.kt delete mode 100644 src/apps/Android/app/src/main/res/anim/scanner_animation.xml delete mode 100644 src/apps/Android/app/src/main/res/values-land/dimens.xml delete mode 100644 src/apps/Android/app/src/main/res/values-v23/themes.xml delete mode 100644 src/apps/Android/app/src/main/res/values-w1240dp/dimens.xml delete mode 100644 src/apps/Android/app/src/main/res/values-w600dp/dimens.xml delete mode 100644 src/apps/Android/app/src/main/res/values/dimens.xml rename src/apps/Android/app/src/test/java/com/janishutz/{libreeventEntryControl => libreevent}/ExampleUnitTest.kt (87%) diff --git a/src/apps/Android/.idea/.gitignore b/src/apps/Android/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/src/apps/Android/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/src/apps/Android/.idea/.name b/src/apps/Android/.idea/.name index b3405b3..65f2955 100644 --- a/src/apps/Android/.idea/.name +++ b/src/apps/Android/.idea/.name @@ -1 +1 @@ -My Application \ No newline at end of file +libreevent entry control \ No newline at end of file diff --git a/src/apps/Android/.idea/kotlinc.xml b/src/apps/Android/.idea/kotlinc.xml index 2b8a50f..fdf8d99 100644 --- a/src/apps/Android/.idea/kotlinc.xml +++ b/src/apps/Android/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/src/apps/Android/app/build.gradle.kts b/src/apps/Android/app/build.gradle.kts index 2dcebc5..90d7015 100644 --- a/src/apps/Android/app/build.gradle.kts +++ b/src/apps/Android/app/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } android { - namespace = "com.janishutz.libreeventEntryControl" + namespace = "com.janishutz.libreevent" compileSdk = 33 defaultConfig { - applicationId = "com.janishutz.libreeventEntryControl" + applicationId = "com.janishutz.libreevent" minSdk = 24 targetSdk = 33 versionCode = 1 @@ -30,9 +30,6 @@ android { kotlinOptions { jvmTarget = "1.8" } - buildFeatures { - viewBinding = true - } } dependencies { @@ -41,9 +38,6 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.8.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.navigation:navigation-fragment-ktx:2.5.3") - implementation("androidx.navigation:navigation-ui-ktx:2.5.3") - implementation("com.google.android.gms:play-services-vision:20.1.3") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/src/apps/Android/app/src/androidTest/java/com/janishutz/libreeventEntryControl/ExampleInstrumentedTest.kt b/src/apps/Android/app/src/androidTest/java/com/janishutz/libreevent/ExampleInstrumentedTest.kt similarity index 81% rename from src/apps/Android/app/src/androidTest/java/com/janishutz/libreeventEntryControl/ExampleInstrumentedTest.kt rename to src/apps/Android/app/src/androidTest/java/com/janishutz/libreevent/ExampleInstrumentedTest.kt index fa23ac2..b126011 100644 --- a/src/apps/Android/app/src/androidTest/java/com/janishutz/libreeventEntryControl/ExampleInstrumentedTest.kt +++ b/src/apps/Android/app/src/androidTest/java/com/janishutz/libreevent/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.janishutz.libreeventEntryControl +package com.janishutz.libreevent import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.janishutz.libreeventEntryControl", appContext.packageName) + assertEquals("com.janishutz.libreevent", appContext.packageName) } } \ No newline at end of file diff --git a/src/apps/Android/app/src/main/AndroidManifest.xml b/src/apps/Android/app/src/main/AndroidManifest.xml index fbd6040..b1f7f92 100644 --- a/src/apps/Android/app/src/main/AndroidManifest.xml +++ b/src/apps/Android/app/src/main/AndroidManifest.xml @@ -2,11 +2,6 @@ - - - + android:exported="true"> diff --git a/src/apps/Android/app/src/main/java/com/janishutz/libreevent/MainActivity.kt b/src/apps/Android/app/src/main/java/com/janishutz/libreevent/MainActivity.kt new file mode 100644 index 0000000..d351806 --- /dev/null +++ b/src/apps/Android/app/src/main/java/com/janishutz/libreevent/MainActivity.kt @@ -0,0 +1,13 @@ +package com.janishutz.libreevent + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.widget.Button + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + } +} \ No newline at end of file diff --git a/src/apps/Android/app/src/main/java/com/janishutz/libreeventEntryControl/MainActivity.kt b/src/apps/Android/app/src/main/java/com/janishutz/libreeventEntryControl/MainActivity.kt deleted file mode 100644 index dfa54cb..0000000 --- a/src/apps/Android/app/src/main/java/com/janishutz/libreeventEntryControl/MainActivity.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.janishutz.libreeventEntryControl - -import android.os.Bundle -import com.google.android.material.snackbar.Snackbar -import androidx.appcompat.app.AppCompatActivity -import androidx.navigation.findNavController -import androidx.navigation.ui.AppBarConfiguration -import androidx.navigation.ui.navigateUp -import androidx.navigation.ui.setupActionBarWithNavController -import android.view.Menu -import android.view.MenuItem -import com.janishutz.libreeventEntryControl.databinding.ActivityMainBinding - -class MainActivity : AppCompatActivity() { - - private lateinit var appBarConfiguration: AppBarConfiguration - private lateinit var binding: ActivityMainBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - binding = ActivityMainBinding.inflate(layoutInflater) - setContentView(binding.root) - - setSupportActionBar(binding.toolbar) - - val navController = findNavController(R.id.nav_host_fragment_content_main) - appBarConfiguration = AppBarConfiguration(navController.graph) - setupActionBarWithNavController(navController, appBarConfiguration) - - binding.fab.setOnClickListener { view -> - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show() - } - } - - override fun onCreateOptionsMenu(menu: Menu): Boolean { - // Inflate the menu; this adds items to the action bar if it is present. - menuInflater.inflate(R.menu.menu_main, menu) - return true - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - return when (item.itemId) { - R.id.action_settings -> true - else -> super.onOptionsItemSelected(item) - } - } - - override fun onSupportNavigateUp(): Boolean { - val navController = findNavController(R.id.nav_host_fragment_content_main) - return navController.navigateUp(appBarConfiguration) - || super.onSupportNavigateUp() - } -} \ No newline at end of file diff --git a/src/apps/Android/app/src/main/res/anim/scanner_animation.xml b/src/apps/Android/app/src/main/res/anim/scanner_animation.xml deleted file mode 100644 index d05f36c..0000000 --- a/src/apps/Android/app/src/main/res/anim/scanner_animation.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/apps/Android/app/src/main/res/layout/activity_main.xml b/src/apps/Android/app/src/main/res/layout/activity_main.xml index 16313e0..db9b091 100644 --- a/src/apps/Android/app/src/main/res/layout/activity_main.xml +++ b/src/apps/Android/app/src/main/res/layout/activity_main.xml @@ -1,33 +1,82 @@ - - - - - - - - - - + android:scaleX="2" + android:scaleY="2" + android:text="Welcome to libreevent!" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.157" /> - \ No newline at end of file + + + + + + +