From 8e73cc6e2caa084ee54deb9dcaf7059d41a47fbe Mon Sep 17 00:00:00 2001 From: wiecktobi Date: Thu, 4 Jun 2020 18:45:10 +0200 Subject: [PATCH] Fix problems and finish app --- android/.idea/misc.xml | 2 +- .../hft/geotracker/activities/MainActivity.kt | 32 ++++++++++--- .../de/hft/geotracker/activities/Register.kt | 4 +- .../de/hft/geotracker/activities/Settings.kt | 6 +++ .../app/src/main/res/layout/activity_home.xml | 45 ++++++------------- .../src/main/res/layout/activity_settings.xml | 2 +- android/app/src/main/res/values/strings.xml | 1 + 7 files changed, 52 insertions(+), 40 deletions(-) diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml index b6ea2b1..7bfef59 100644 --- a/android/.idea/misc.xml +++ b/android/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/android/app/src/main/java/de/hft/geotracker/activities/MainActivity.kt b/android/app/src/main/java/de/hft/geotracker/activities/MainActivity.kt index 2f9a7c8..ddb55c9 100644 --- a/android/app/src/main/java/de/hft/geotracker/activities/MainActivity.kt +++ b/android/app/src/main/java/de/hft/geotracker/activities/MainActivity.kt @@ -3,15 +3,16 @@ package de.hft.geotracker.activities import android.Manifest import android.Manifest.permission.ACCESS_COARSE_LOCATION import android.Manifest.permission.ACCESS_FINE_LOCATION +import android.app.AlertDialog import android.app.PendingIntent import android.content.Context +import android.content.DialogInterface import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle import android.os.Looper import android.view.View import android.widget.* -import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat.requestPermissions @@ -114,7 +115,27 @@ class MainActivity : AppCompatActivity() { actionButton = findViewById(R.id.button_start_stop) actionButton.setBackgroundColor(resources.getColor(R.color.colorPrimaryDark)) actionButton.setOnClickListener { - callStartStop() + if (running) { + val builder: AlertDialog.Builder = AlertDialog.Builder(this) + builder.setTitle(R.string.app_name) + builder.setMessage("Do you want to stop?") + builder.setIcon(R.drawable.ic_logo) + builder.setPositiveButton("Yes", object : DialogInterface.OnClickListener { + override fun onClick(dialog: DialogInterface, id: Int) { + callStartStop() + dialog.dismiss() + } + }) + builder.setNegativeButton("No", object : DialogInterface.OnClickListener { + override fun onClick(dialog: DialogInterface, id: Int) { + dialog.dismiss() + } + }) + val alert: AlertDialog = builder.create() + alert.show() + } else { + callStartStop() + } } //Toolbar listener @@ -126,6 +147,9 @@ class MainActivity : AppCompatActivity() { true } R.id.logout -> { + if (running) { + callStartStop() + } deleteFile("JWToken") startActivity(Intent(this, Login::class.java)) println("Logout pressed") @@ -159,7 +183,7 @@ class MainActivity : AppCompatActivity() { , it.duration)) } if (running) { -// recordList.add(RecordEntry(workingSince!!, "PENDING", -1)) + recordList.add(RecordEntry(workingSince!!, "PENDING", -1)) } adapter.data = recordList recView.layoutManager = layoutManager @@ -193,8 +217,6 @@ class MainActivity : AppCompatActivity() { call.enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { workingSince = response.body()?.startdate?.substring(11, 16) - latitude.text = workingSince - longitude.text = response.body()?.enddate updateRecyclerView() println("Tracking event successful!") } diff --git a/android/app/src/main/java/de/hft/geotracker/activities/Register.kt b/android/app/src/main/java/de/hft/geotracker/activities/Register.kt index 7645b88..6fbfd19 100644 --- a/android/app/src/main/java/de/hft/geotracker/activities/Register.kt +++ b/android/app/src/main/java/de/hft/geotracker/activities/Register.kt @@ -3,6 +3,7 @@ package de.hft.geotracker.activities import android.content.Intent import android.os.Bundle import android.widget.TextView +import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import de.hft.geotracker.R @@ -18,7 +19,8 @@ class Register : AppCompatActivity() { } private fun createAccount() { - startActivity(Intent(this, MainActivity::class.java)) + Toast.makeText(this@Register, "Not yet implemented!", Toast.LENGTH_LONG) + .show() } diff --git a/android/app/src/main/java/de/hft/geotracker/activities/Settings.kt b/android/app/src/main/java/de/hft/geotracker/activities/Settings.kt index 26e8c70..438e020 100644 --- a/android/app/src/main/java/de/hft/geotracker/activities/Settings.kt +++ b/android/app/src/main/java/de/hft/geotracker/activities/Settings.kt @@ -1,6 +1,8 @@ package de.hft.geotracker.activities import android.os.Bundle +import android.widget.TextView +import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import de.hft.geotracker.R import kotlinx.android.synthetic.main.activity_home.* @@ -13,6 +15,10 @@ class Settings : AppCompatActivity() { my_toolbar.setNavigationOnClickListener { onBackPressed() } + findViewById(R.id.button_submit).setOnClickListener { + Toast.makeText(this@Settings, "Not yet implemented!", Toast.LENGTH_LONG) + .show() + } } } \ No newline at end of file diff --git a/android/app/src/main/res/layout/activity_home.xml b/android/app/src/main/res/layout/activity_home.xml index d7b963c..933c2d7 100644 --- a/android/app/src/main/res/layout/activity_home.xml +++ b/android/app/src/main/res/layout/activity_home.xml @@ -140,7 +140,6 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin16" android:layout_marginEnd="@dimen/margin16" - android:layout_marginBottom="16dp" android:colorControlNormal="@color/logo_blue" android:hint="Revenue" android:textColorHint="@color/logo_white" @@ -148,11 +147,9 @@ app:boxBackgroundMode="outline" app:boxCornerRadiusTopEnd="0dp" app:boxCornerRadiusTopStart="0dp" - app:layout_constraintBottom_toTopOf="@+id/latitude" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/display_description_layout" - app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_chainStyle="packed"> - - - - + app:layout_constraintTop_toBottomOf="@+id/text_today" /> + + \ No newline at end of file diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml index 2b03ce5..caae660 100644 --- a/android/app/src/main/res/layout/activity_settings.xml +++ b/android/app/src/main/res/layout/activity_settings.xml @@ -30,7 +30,7 @@ android:layout_height="match_parent">