Skip to content

cha #8

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.

Sign up for GitHub

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

Open
nastja123456789 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cha #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions app/src/main/java/com/example/project/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class MainActivity : AppCompatActivity() {
lateinit var contactFragment: ContactFragment
lateinit var descriptionFragment: DescriptionFragment
// lateinit var editFragment: EditFragment
private val CODE = 1
private val code = 1

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down Expand Up @@ -124,7 +124,7 @@ class MainActivity : AppCompatActivity() {
EasyPermissions.requestPermissions(
this,
perms,
CODE,
code,
perms
)
}
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/java/com/example/project/NewEventFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ import java.util.*

class NewEventFragment : Fragment() {
lateinit var newEventService: NewEventService
private val GALLERY = 111
private val CAMERA = 112
private val PERMISSION_ALL = 2
private val gallery = 111
private val camera = 112
private val permission_all = 2
private lateinit var pref: SharedPreferences
var downLoadUrl = ""

private var PERMISSIONS = arrayOf(
private var permissions = arrayOf(
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA
Expand Down Expand Up @@ -114,7 +114,7 @@ class NewEventFragment : Fragment() {
data: Intent?
) {

if (requestCode == GALLERY) {
if (requestCode == gallery) {
if (data != null) {

try {
Expand Down Expand Up @@ -233,8 +233,8 @@ class NewEventFragment : Fragment() {
}

private fun setupPermission() {
if (!hasPermissions(requireContext(), PERMISSIONS)) {
ActivityCompat.requestPermissions(this.requireActivity(), PERMISSIONS, PERMISSION_ALL)
if (!hasPermissions(requireContext(), permissions)) {
ActivityCompat.requestPermissions(this.requireActivity(), permissions, permission_all)
} else {
//showPictureDialog()
choosePhotoFromGallery()
Expand All @@ -246,12 +246,12 @@ class NewEventFragment : Fragment() {
Intent.ACTION_PICK,
MediaStore.Images.Media.EXTERNAL_CONTENT_URI
)
startActivityForResult(galleryIntent, GALLERY)
startActivityForResult(galleryIntent, gallery)
}

private fun takePhotoFromCamera() {
val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
startActivityForResult(intent, CAMERA)
startActivityForResult(intent, camera)
}

private fun saveImage(myBitmap: Bitmap): String {
Expand Down