diff --git a/Assignment1/JourneyTrack/.gitignore b/Assignment1/JourneyTrack/.gitignore index aa724b7..bc5875c 100644 --- a/Assignment1/JourneyTrack/.gitignore +++ b/Assignment1/JourneyTrack/.gitignore @@ -13,3 +13,4 @@ .externalNativeBuild .cxx local.properties +/mykey.jks diff --git a/Assignment1/JourneyTrack/.idea/deploymentTargetDropDown.xml b/Assignment1/JourneyTrack/.idea/deploymentTargetDropDown.xml index b2a8a75..1ee7eb8 100644 --- a/Assignment1/JourneyTrack/.idea/deploymentTargetDropDown.xml +++ b/Assignment1/JourneyTrack/.idea/deploymentTargetDropDown.xml @@ -4,9 +4,9 @@ - + - + @@ -14,9 +14,8 @@ - - - + + diff --git a/Assignment1/JourneyTrack/app/release/app-release.apk b/Assignment1/JourneyTrack/app/release/app-release.apk new file mode 100644 index 0000000..134f1f4 Binary files /dev/null and b/Assignment1/JourneyTrack/app/release/app-release.apk differ diff --git a/Assignment1/JourneyTrack/app/release/output-metadata.json b/Assignment1/JourneyTrack/app/release/output-metadata.json new file mode 100644 index 0000000..cd22a1a --- /dev/null +++ b/Assignment1/JourneyTrack/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.example.journeytrack", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/Assignment1/JourneyTrack/app/src/main/java/com/example/journeytrack/MainActivity.kt b/Assignment1/JourneyTrack/app/src/main/java/com/example/journeytrack/MainActivity.kt index d29e76e..be2b2db 100644 --- a/Assignment1/JourneyTrack/app/src/main/java/com/example/journeytrack/MainActivity.kt +++ b/Assignment1/JourneyTrack/app/src/main/java/com/example/journeytrack/MainActivity.kt @@ -145,8 +145,6 @@ class MainActivity : AppCompatActivity() { btnNextStop.setOnClickListener { val stops = if (useLazyStops) lazyStops else normalStops - Log.d("currentStop", "$currentStop") - Log.d("stops.size", "${stops.size}") if (currentStop < stops.size - 1) { currentStop++ updateProgressBar(stops.size) diff --git a/Assignment1/JourneyTrack/app/src/main/res/layout/activity_main.xml b/Assignment1/JourneyTrack/app/src/main/res/layout/activity_main.xml index 5724390..4b9ac31 100644 --- a/Assignment1/JourneyTrack/app/src/main/res/layout/activity_main.xml +++ b/Assignment1/JourneyTrack/app/src/main/res/layout/activity_main.xml @@ -40,6 +40,8 @@ android:layout_marginEnd="141dp" android:layout_marginBottom="6dp" android:text="Next Stop" + android:textSize="16sp" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" @@ -93,32 +95,39 @@