Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xullas so'z fragment navigation maps o'zgartirildi #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ android {

dependencies {
// def version = "1.5.0"

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "androidx.core:core-ktx:$version"
implementation 'androidx.appcompat:appcompat:1.3.0'
Expand All @@ -57,4 +56,7 @@ dependencies {
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

// Cirecle button
implementation 'com.github.markushi:circlebutton:1.1'
}
2 changes: 1 addition & 1 deletion app/src/debug/res/values/google_maps_api.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
Once you have your key (it starts with "AIza"), replace the "google_maps_key"
string in this file.
-->
<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyDOZu9sF39GeQEULFM00ml8LfUGsc_CTD0</string>
<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyD0BKMBU380HNHHzT9PQd42Acm2g38SCBI</string>
</resources>
9 changes: 6 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.autoservice">

<!--
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
Google Maps Android API v2, but you must specify either coarse or fine
location permissions for the "MyLocation" functionality.
-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
Expand All @@ -18,7 +17,11 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.AutoService">

<activity android:name=".SosActivity"></activity>
<activity
android:name=".AppMap.SosActivity"
android:label="@string/title_activity_sos"
android:theme="@style/Theme.AutoService.NoActionBar" />
<!--
The API key for Google Maps-based APIs is defined as a string resource.
(See the file "res/values/google_maps_api.xml").
Expand Down
98 changes: 98 additions & 0 deletions app/src/main/java/com/example/autoservice/AppMap/MapsFragment.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
package com.example.autoservice.AppMap

import android.Manifest
import android.content.pm.PackageManager
import android.location.Location
import androidx.fragment.app.Fragment

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.app.ActivityCompat
import com.example.autoservice.R
import com.example.autoservice.databinding.FragmentMapsBinding
import com.google.android.gms.location.FusedLocationProviderClient
import com.google.android.gms.location.LocationServices

import com.google.android.gms.maps.CameraUpdateFactory
import com.google.android.gms.maps.GoogleMap
import com.google.android.gms.maps.OnMapReadyCallback
import com.google.android.gms.maps.SupportMapFragment
import com.google.android.gms.maps.model.LatLng
import com.google.android.gms.maps.model.Marker
import com.google.android.gms.maps.model.MarkerOptions

class MapsFragment : Fragment(R.layout.fragment_maps),GoogleMap.OnMarkerClickListener{
private var _binding :FragmentMapsBinding?=null
private lateinit var lastlocation:Location
private val Location_request_code = 1
private lateinit var map:GoogleMap
private lateinit var fusedLocationProviderClient: FusedLocationProviderClient
private val binding get() = _binding!!
private val callback = OnMapReadyCallback { googleMap ->
map = googleMap
Comment on lines +27 to +34
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

val larni eng tepaga qo'yadi.
var keyin yozasz.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keyin Code format qiling xar doim

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

val larni eng tepaga qo'yadi.
var keyin yozasz.

Tepaga chiqaring

map.uiSettings.isZoomControlsEnabled = true
map.setOnMarkerClickListener(this)

setupmap()

val sydney = LatLng(-34.0, 151.0)
map.addMarker(MarkerOptions().position(sydney).title("Marker in Sydney"))
map.moveCamera(CameraUpdateFactory.newLatLng(sydney))
}




override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
_binding = FragmentMapsBinding.bind(view)
fusedLocationProviderClient =LocationServices.getFusedLocationProviderClient(binding.root.context)
val mapFragment = childFragmentManager.findFragmentById(R.id.map) as SupportMapFragment?

mapFragment?.getMapAsync(callback)
}



private fun setupmap() {
if (ActivityCompat.checkSelfPermission(
binding.root.context,
Manifest.permission.ACCESS_FINE_LOCATION
) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
binding.root.context,
Manifest.permission.ACCESS_COARSE_LOCATION
) != PackageManager.PERMISSION_GRANTED
) {
ActivityCompat.requestPermissions(requireActivity(), arrayOf(android.Manifest.permission.ACCESS_FINE_LOCATION),Location_request_code)
return
}
map.isMyLocationEnabled = true
fusedLocationProviderClient.lastLocation.addOnSuccessListener(requireActivity()){
loc ->
if (loc !=null){
lastlocation = loc
val currentlanglat = LatLng(loc.latitude,loc.longitude)
placemarekermap(currentlanglat)
map.animateCamera(CameraUpdateFactory.newLatLngZoom(currentlanglat,12f))
}
}
}

private fun placemarekermap(currentlanglat:LatLng){
var markeroption = MarkerOptions().position(currentlanglat)
markeroption.title("$currentlanglat") // izoh
map.addMarker(markeroption)
}

override fun onMarkerClick(p0: Marker?)=false



override fun onDestroy() {
super.onDestroy()
_binding = null
}

}
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.example.autoservice
package com.example.autoservice.Fragments

import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.navigation.fragment.findNavController
import com.example.autoservice.R
import com.example.autoservice.databinding.FragmentAdminRegistrationBinding

// TODO: Rename parameter arguments, choose names that match
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package com.example.autoservice.Fragments

import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.example.autoservice.R
import com.example.autoservice.databinding.FragmentForgotBinding

// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private const val ARG_PARAM1 = "param1"
private const val ARG_PARAM2 = "param2"

/**
* A simple [Fragment] subclass.
* Use the [ForgotFragment.newInstance] factory method to
* create an instance of this fragment.
*/
class ForgotFragment : Fragment(R.layout.fragment_forgot) {
// TODO: Rename and change types of parameters
private var param1: String? = null
private var param2: String? = null
private var _binding:FragmentForgotBinding?=null
private val binding get() = _binding

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
arguments?.let {
param1 = it.getString(ARG_PARAM1)
param2 = it.getString(ARG_PARAM2)
}
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
_binding = FragmentForgotBinding.bind(view)
}

override fun onDestroy() {
super.onDestroy()
_binding = null
}


companion object {
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment ForgotFragment.
*/
// TODO: Rename and change types and number of parameters
@JvmStatic
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JVMStatic shartmas bu yerda

fun newInstance(param1: String, param2: String) =
ForgotFragment().apply {
arguments = Bundle().apply {
putString(ARG_PARAM1, param1)
putString(ARG_PARAM2, param2)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.autoservice
package com.example.autoservice.Fragments

import android.os.Bundle
import androidx.fragment.app.Fragment
Expand All @@ -7,6 +7,7 @@ import android.view.View
import android.view.ViewGroup
import androidx.navigation.findNavController
import androidx.navigation.fragment.findNavController
import com.example.autoservice.R
import com.example.autoservice.databinding.FragmentHomeBinding
import com.google.android.gms.location.FusedLocationProviderClient
import com.google.android.gms.location.LocationServices
Expand All @@ -25,7 +26,6 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
_binding = FragmentHomeBinding.bind(view)



binding.admin.setOnClickListener{
findNavController().navigate(R.id.adminRegistrationFragment)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.example.autoservice
package com.example.autoservice.Fragments

import android.content.Intent
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.navigation.fragment.findNavController
import com.example.autoservice.R
import com.example.autoservice.SosActivity
import com.example.autoservice.databinding.FragmentLoginBinding

// TODO: Rename parameter arguments, choose names that match
Expand Down Expand Up @@ -39,11 +40,18 @@ class LoginFragment : Fragment(R.layout.fragment_login) {
findNavController().popBackStack()
findNavController().navigate(R.id.homeFragment)
}
binding.logintoforgot.setOnClickListener {
findNavController().popBackStack()
findNavController().navigate(R.id.homeFragment)
}
binding.next.setOnClickListener {
val passsword = binding.loginpassword.text.toString()
val phonenumber = binding.loginphonenumber.text.toString()
if (passsword.length >= 8 && phonenumber[0] == '+'){
findNavController().navigate(R.id.mapsFragment)
//findNavController().popBackStack()
var intent = Intent(activity,SosActivity::class.java)
startActivity(intent)
activity?.finish()
}

}
Expand Down
87 changes: 0 additions & 87 deletions app/src/main/java/com/example/autoservice/MapsFragment.kt

This file was deleted.

Loading