Skip to content
Merged
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
2 changes: 0 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ dependencies {
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
implementation 'com.google.firebase:firebase-database:20.0.2'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'com.github.bumptech.glide:glide:4.10.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
testImplementation 'junit:junit:4.+'
//noinspection GradleCompatible,GradleCompatible
androidTestImplementation 'com.android.support.test:runner:1.0.2'
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />

<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand All @@ -23,12 +20,6 @@
android:name="com.naver.maps.map.CLIENT_ID"
android:value="fq6m1c8f92" />

<activity
android:name=".Capture"
android:screenOrientation="fullSensor"
android:stateNotNeeded="true"
android:windowSoftInputMode="stateAlwaysHidden"
tools:ignore="Instantiatable"></activity>
<activity
android:name=".IntroActivity"
android:exported="true">
Expand Down
37 changes: 35 additions & 2 deletions app/src/main/java/com/example/caneat/MainActivity.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package com.example.caneat;
import static android.Manifest.permission_group.CAMERA;

import android.Manifest;
import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.Point;
import android.graphics.Rect;
Expand All @@ -17,6 +22,8 @@
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;


import com.google.android.gms.tasks.OnFailureListener;
Expand Down Expand Up @@ -73,7 +80,7 @@ protected void onCreate(Bundle savedInstanceState) {

database = FirebaseDatabase.getInstance();

picture_button = findViewById(R.id.picture_button);


Button change_allergic=findViewById(R.id.change_allergic);
change_allergic.setOnClickListener(new View.OnClickListener() {
Expand Down Expand Up @@ -169,15 +176,41 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
});


picture_button = findViewById(R.id.picture_button);
picture_button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
int checkPermissions = ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.CAMERA);
if(checkPermissions==PackageManager.PERMISSION_DENIED){
ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.CAMERA},0);
}else{
showCamera();
}
}
});

}

public void showCameraBtn(View view){
public void showCamera(){
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
if(intent.resolveActivity(getPackageManager()) != null){
startActivityForResult(intent, REQUEST_IMAGE_CAPTURE);
}
}


@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if(requestCode==0){
if(grantResults[0]==0){
Toast.makeText(this,"카메라 승인", Toast.LENGTH_SHORT).show();
}else{
Toast.makeText(this,"카메라 거부",Toast.LENGTH_SHORT).show();
}
}
}

@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/main_page.xml
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@
android:layout_gravity="bottom"
android:background="@drawable/save_button"
android:drawableTop="@android:drawable/ic_menu_camera"
android:onClick="showCameraBtn"
android:text="성분표 사진찍기"
android:textColor="@color/black"
app:layout_constraintBottom_toBottomOf="parent" />
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

}
dependencies {
classpath "com.android.tools.build:gradle:7.0.2"
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.google.gms:google-services:4.3.10'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down