From 4717c771015889a01803fc711130e59723edeff9 Mon Sep 17 00:00:00 2001 From: Bastien JACQUELIN Date: Fri, 14 Apr 2023 22:14:17 +0200 Subject: [PATCH] revert fc2fdd319543abe1a9c0dd9836a69d24b42fd7e9 revert adding location autorisations --- CineCool/.idea/deploymentTargetDropDown.xml | 17 ------ CineCool/app/src/main/AndroidManifest.xml | 11 ++-- .../iut/cinecool/fragments/LoginFragment.kt | 60 +++---------------- 3 files changed, 15 insertions(+), 73 deletions(-) delete mode 100644 CineCool/.idea/deploymentTargetDropDown.xml diff --git a/CineCool/.idea/deploymentTargetDropDown.xml b/CineCool/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index dd2df21..0000000 --- a/CineCool/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CineCool/app/src/main/AndroidManifest.xml b/CineCool/app/src/main/AndroidManifest.xml index a480402..54ed57c 100644 --- a/CineCool/app/src/main/AndroidManifest.xml +++ b/CineCool/app/src/main/AndroidManifest.xml @@ -1,11 +1,13 @@ + xmlns:tools="http://schemas.android.com/tools"> - + - + + + + + \ No newline at end of file diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/fragments/LoginFragment.kt b/CineCool/app/src/main/java/fr/iut/cinecool/fragments/LoginFragment.kt index 754e3c9..f842ba8 100644 --- a/CineCool/app/src/main/java/fr/iut/cinecool/fragments/LoginFragment.kt +++ b/CineCool/app/src/main/java/fr/iut/cinecool/fragments/LoginFragment.kt @@ -1,8 +1,7 @@ package fr.iut.cinecool.fragments -import android.Manifest -import android.app.Activity -import android.content.pm.PackageManager +import android.content.Context.LOCATION_SERVICE +import android.location.LocationManager import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater @@ -10,17 +9,16 @@ import android.view.View import android.view.ViewGroup import android.widget.EditText import android.widget.ImageView -import android.widget.Toast -import androidx.core.app.ActivityCompat -import androidx.core.content.ContextCompat +import androidx.core.content.ContextCompat.getSystemService import androidx.navigation.fragment.findNavController import fr.iut.cinecool.R import fr.iut.cinecool.databinding.FragmentLoginBinding +import fr.iut.cinecool.databinding.FragmentMoviesBinding class LoginFragment : Fragment() { + private var locationManager : LocationManager? = null private var _binding: FragmentLoginBinding? = null private val binding get() = _binding!! - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -30,56 +28,14 @@ class LoginFragment : Fragment() { } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + //locationManager = this.context?.let { getSystemService(it,LOCATION_SERVICE) } as LocationManager? + super.onViewCreated(view, savedInstanceState) val loginButton = view.findViewById(R.id.loginButton) loginButton.setOnClickListener(){ - if (ContextCompat.checkSelfPermission(this.requireContext(), - Manifest.permission.ACCESS_FINE_LOCATION) !== - PackageManager.PERMISSION_GRANTED) { - if (ActivityCompat.shouldShowRequestPermissionRationale( - this.requireContext() as Activity, - Manifest.permission.ACCESS_FINE_LOCATION)) { - ActivityCompat.requestPermissions( - this.requireContext() as Activity, - arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), 1) - } else { - ActivityCompat.requestPermissions( - this.requireContext() as Activity, - arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), 1) - } - } - } - } - - override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, - grantResults: IntArray) { - when (requestCode) { - 1 -> { - if (grantResults.isNotEmpty() && grantResults[0] == - PackageManager.PERMISSION_GRANTED - ) { - if ((this.requireContext().let { - ContextCompat.checkSelfPermission( - it, - Manifest.permission.ACCESS_FINE_LOCATION - ) - } == PackageManager.PERMISSION_GRANTED)) { - Toast.makeText( - this.requireContext(), - "Permission Granted", - Toast.LENGTH_SHORT - ).show() - } - } else { - Toast.makeText(this.requireContext(), "Permission Denied", Toast.LENGTH_SHORT) - .show() - } - login() - return - } + login() } } - fun login(){ val name = view?.findViewById(R.id.name)?.text if (name != null) {