diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml deleted file mode 100644 index 3cc32ce..0000000 --- a/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/.scannerwork/.sonar_lock b/app/src/main/java/.scannerwork/.sonar_lock deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/main/java/.scannerwork/Test.pdf b/app/src/main/java/.scannerwork/Test.pdf deleted file mode 100644 index f39cb46..0000000 Binary files a/app/src/main/java/.scannerwork/Test.pdf and /dev/null differ diff --git a/app/src/main/java/.scannerwork/report-task.txt b/app/src/main/java/.scannerwork/report-task.txt deleted file mode 100644 index 46e54be..0000000 --- a/app/src/main/java/.scannerwork/report-task.txt +++ /dev/null @@ -1,6 +0,0 @@ -projectKey=Test -serverUrl=http://localhost:9000 -serverVersion=9.9.0.65466 -dashboardUrl=http://localhost:9000/dashboard?id=Test -ceTaskId=AYu0FgJhk-ulwfDUJI5I -ceTaskUrl=http://localhost:9000/api/ce/task?id=AYu0FgJhk-ulwfDUJI5I diff --git a/app/src/main/java/com.zip b/app/src/main/java/com.zip deleted file mode 100644 index 628eb02..0000000 Binary files a/app/src/main/java/com.zip and /dev/null differ diff --git a/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java b/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java deleted file mode 100644 index 4d81920..0000000 --- a/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.myapplication.ui.Buttonfragments; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.fragment.app.Fragment; - -import com.example.myapplication.R; - -public class HazardGarbageFragment extends Fragment {//有害垃圾介绍 - - public HazardGarbageFragment() { - // Required empty public constructor - } - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.hazard_garbage, container, false); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java b/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java deleted file mode 100644 index 45e694e..0000000 --- a/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.myapplication.ui.Buttonfragments; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.fragment.app.Fragment; - -import com.example.myapplication.R; - -public class KitchenGarbageFragment extends Fragment {//厨余垃圾介绍 - - public KitchenGarbageFragment() { - // Required empty public constructor - } - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.kitchen_garbage, container, false); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java b/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java deleted file mode 100644 index a5b10f4..0000000 --- a/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.myapplication.ui.Buttonfragments; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.fragment.app.Fragment; - -import com.example.myapplication.R; - -public class OtherGarbageFragment extends Fragment {//其他垃圾介绍 - - public OtherGarbageFragment() { - // Required empty public constructor - } - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.other_garbage, container, false); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java b/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java deleted file mode 100644 index e7e4393..0000000 --- a/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.myapplication.ui.Buttonfragments; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.fragment.app.Fragment; - -import com.example.myapplication.R; - -public class RecycleGarbageFragment extends Fragment {//可回收垃圾介绍 - - public RecycleGarbageFragment() { - // Required empty public constructor - } - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.recycle_garbage, container, false); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/ui/dashboard/MapActivity.java b/app/src/main/java/com/example/myapplication/ui/dashboard/MapActivity.java deleted file mode 100644 index c68b193..0000000 --- a/app/src/main/java/com/example/myapplication/ui/dashboard/MapActivity.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.example.myapplication.ui.dashboard; - -import android.graphics.Color; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; - -import com.example.myapplication.R; -import com.example.myapplication.databinding.FragmentDashboardBinding; -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.tencent.lbssearch.TencentSearch; -import com.tencent.lbssearch.httpresponse.HttpResponseListener; -import com.tencent.lbssearch.object.param.WalkingParam; -import com.tencent.lbssearch.object.result.WalkingResultObject; -import com.tencent.tencentmap.mapsdk.maps.CameraUpdateFactory; -import com.tencent.tencentmap.mapsdk.maps.TencentMapInitializer; -import com.tencent.tencentmap.mapsdk.maps.TextureMapView; -import com.tencent.tencentmap.mapsdk.maps.model.LatLng; - -public class MapActivity extends Fragment { - - private TextureMapView mapView; - private FloatingActionButton currentPositioning; - private FloatingActionButton nearbyTrashBinChoose; - private FloatingActionButton navigation; - private FragmentDashboardBinding binding; - private MapPositioning controller; - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - MapActivityViewModel dashboardViewModel = new ViewModelProvider(this).get(MapActivityViewModel.class); - - TencentMapInitializer.setAgreePrivacy(true); - - binding = FragmentDashboardBinding.inflate(inflater, container, false); - - View root = binding.getRoot(); - - mapView = root.findViewById(R.id.mapview); - - currentPositioning = root.findViewById(R.id.Get_Current_Location); - - nearbyTrashBinChoose = root.findViewById(R.id.check_nearby_trash_cans); - - navigation = root.findViewById(R.id.navigiation); - - controller = new MapPositioning(mapView, binding,getActivity()); - - currentPositioning.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - controller.onClickCurrentPositioning(); - } - }); - - nearbyTrashBinChoose.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - controller.onClickNearbyTrashBinChoose(); - } - }); - - navigation.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - controller.onClickNavigation(); - } - }); - - controller.startLocationUpdates(); - - return root; - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - controller.stopLocationUpdates(); - mapView.onDestroy(); - binding = null; - } - -} diff --git a/app/src/main/java/com/example/myapplication/ui/dashboard/MapActivityViewModel.java b/app/src/main/java/com/example/myapplication/ui/dashboard/MapActivityViewModel.java deleted file mode 100644 index 8d4a31e..0000000 --- a/app/src/main/java/com/example/myapplication/ui/dashboard/MapActivityViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.myapplication.ui.dashboard; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class MapActivityViewModel extends ViewModel { - - private final MutableLiveData mText; - - public MapActivityViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is dashboard fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/ui/dashboard/MapPositioning.java b/app/src/main/java/com/example/myapplication/ui/dashboard/MapPositioning.java deleted file mode 100644 index d08612a..0000000 --- a/app/src/main/java/com/example/myapplication/ui/dashboard/MapPositioning.java +++ /dev/null @@ -1,233 +0,0 @@ -package com.example.myapplication.ui.dashboard; - -import android.graphics.Color; -import android.view.View; -import android.widget.Toast; - -import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.ViewModelProvider; - -import com.example.myapplication.databinding.FragmentDashboardBinding; -import com.tencent.lbssearch.TencentSearch; -import com.tencent.lbssearch.httpresponse.HttpResponseListener; -import com.tencent.lbssearch.object.param.WalkingParam; -import com.tencent.lbssearch.object.result.WalkingResultObject; -import com.tencent.map.geolocation.TencentLocationManager; -import com.tencent.map.geolocation.TencentLocationRequest; -import com.tencent.tencentmap.mapsdk.maps.CameraUpdate; -import com.tencent.tencentmap.mapsdk.maps.CameraUpdateFactory; -import com.tencent.tencentmap.mapsdk.maps.TencentMap; -import com.tencent.tencentmap.mapsdk.maps.TextureMapView; -import com.tencent.tencentmap.mapsdk.maps.model.LatLng; -import com.tencent.tencentmap.mapsdk.maps.model.LatLngBounds; -import com.tencent.tencentmap.mapsdk.maps.model.Marker; -import com.tencent.tencentmap.mapsdk.maps.model.MarkerOptions; -import com.tencent.tencentmap.mapsdk.maps.model.PolylineOptions; - -import java.util.ArrayList; -import java.util.List; - -public class MapPositioning { - - private TextureMapView mapView; - private TencentMap tencentMap; - private FragmentDashboardBinding binding; - - private List TrashBin; - - private FragmentActivity fragmentActivity; - - static double currentLatitude; - - static double currentLongitude; - - TencentSearch tencentSearch; - - WalkingParam walkingParam; - - LatLng chooseTrashBin; - - public float calculateDistance(LatLng start, LatLng end) {//计算所有标记垃圾桶与当前位置的距离 - double earthRadius = 6371; - - double lat1 = Math.toRadians(start.getLatitude()); - - double lon1 = Math.toRadians(start.getLongitude()); - - double lat2 = Math.toRadians(end.getLatitude()); - - double lon2 = Math.toRadians(end.getLongitude()); - - double deltaLat = lat2 - lat1; - - double deltaLon = lon2 - lon1; - - double a = Math.sin(deltaLat / 2) * Math.sin(deltaLat / 2) - + Math.cos(lat1) * Math.cos(lat2) - * Math.sin(deltaLon / 2) * Math.sin(deltaLon / 2); - double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); - - return (float) (earthRadius * c); - } - private HttpResponseListener httpResponseListener; - - public MapPositioning(TextureMapView mapView, FragmentDashboardBinding binding,FragmentActivity activity) {//初始化， - this.mapView = mapView; - this.binding = binding; - tencentMap = mapView.getMap(); - tencentMap.setMyLocationEnabled(true); - tencentMap.enableMultipleInfowindow(true); - fragmentActivity=activity; - TrashBin=new ArrayList<>(); - - TrashBin.add(new LatLng(39.111981,117.350131));//添加垃圾桶位置信息 - - TrashBin.add(new LatLng(39.112578,117.349414)); - - TrashBin.add(new LatLng(39.112062,117.349687)); - - TrashBin.add(new LatLng(39.1162,117.350954)); - - TrashBin.add(new LatLng(39.115949,117.351535)); - - TrashBin.add(new LatLng(39.115614,117.351487)); - - TrashBin.add(new LatLng(39.115767,117.351119)); - - tencentSearch=new TencentSearch(mapView.getContext()); - - httpResponseListener = new HttpResponseListener() { - @Override - public void onSuccess(int i, WalkingResultObject walkingResultObject) { - if(walkingParam==null) - { - return ; - } - for(WalkingResultObject.Route route:walkingResultObject.result.routes) - { - List polyline = route.polyline; - - tencentMap.addPolyline(new PolylineOptions().addAll(polyline).width(5f).color(Color.RED)); - } - } - - @Override - public void onFailure(int i, String s, Throwable throwable) { - - } - }; - tencentMap.setOnMarkerClickListener(new TencentMap.OnMarkerClickListener() {//根据当前上一次的点击事件，判断是否为双击事件，如果是双击事件就进行导航 - private long lastClickTime; - @Override - public boolean onMarkerClick(Marker marker) { - long clicktime=System.currentTimeMillis(); - - if(clicktime-lastClickTime<1000) - { - LatLng now = marker.getPosition(); - - walkingParam=new WalkingParam(new LatLng(currentLatitude,currentLongitude),now); - - tencentSearch.getRoutePlan(walkingParam, httpResponseListener); - } - lastClickTime=clicktime; - - return true; - } - }); - } - - public void onClickCurrentPositioning() {//发送请求，获取当前位置信息 - String message = "当前位置：纬度：" + currentLatitude + "，经度：" + currentLongitude; - - Toast.makeText(mapView.getContext(), message, Toast.LENGTH_SHORT).show(); - - tencentMap.moveCamera(CameraUpdateFactory.newLatLng(new LatLng(currentLatitude,currentLongitude))); - } - - public void onClickNearbyTrashBinChoose() {//显示附近的垃圾桶位置信息 - long st=System.currentTimeMillis(); - LatLngBounds.Builder builder = new LatLngBounds.Builder(); - - for(LatLng trashBin:TrashBin) - { - tencentMap.addMarker(new MarkerOptions(trashBin)); - } - - builder.include(new LatLng(currentLatitude,currentLongitude)); - - for(LatLng trashBin:TrashBin) - { - builder.include(trashBin); - } - LatLngBounds bounds = builder.build(); - - int padding=100; - - CameraUpdate cameraUpdate=CameraUpdateFactory.newLatLngBounds(bounds,padding); - - tencentMap.moveCamera(cameraUpdate); - long ed=System.currentTimeMillis(); - System.out.println(ed); - } - - public void onClickNavigation() {//进行导航功能 - double shortestDistance=Double.MAX_VALUE; - - LatLng now = new LatLng(currentLatitude, currentLongitude); - - for(LatLng trashBin:TrashBin)//获取所有垃圾桶位置信息并计算距离 - { - double distance=calculateDistance(now,trashBin); - - if(distance 180.0F) - x -= 360.0F; - else if (x < -180.0F) - x += 360.0F; - - if (Math.abs(mAngle - x) < 3.0f) { - break; - } - mAngle = Float.isNaN(x) ? 0 : x; - if (marker != null) { - marker.setRotation(mAngle); - } - lastTime = System.currentTimeMillis(); - } - } - } - - @Override - public void onAccuracyChanged(Sensor sensor, int accuracy) { - - } -} diff --git a/app/src/main/java/com/example/myapplication/ui/index.java b/app/src/main/java/com/example/myapplication/ui/index.java deleted file mode 100644 index 7ad12ef..0000000 --- a/app/src/main/java/com/example/myapplication/ui/index.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.example.myapplication.ui; - -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; - -import androidx.appcompat.app.AppCompatActivity; - -import com.example.myapplication.BottomNavigiationActivity; -import com.example.myapplication.R; -import com.example.myapplication.ui.home.GarbageRecognitionActivity; - -public class index extends AppCompatActivity { - - private static final long SPLASH_DELAY = 800; // 延迟时间，单位为毫秒，启动界面 - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - this.getSupportActionBar().hide(); - // 设置启动页布局文件 - setContentView(R.layout.launch_screen); - - // 延迟跳转到主界面 - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - Intent intent = new Intent(index.this, BottomNavigiationActivity.class); - startActivity(intent); - finish(); // 销毁当前活动，防止用户返回到启动页 - } - }, SPLASH_DELAY); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/ui/notifications/FeedbackUploader.java b/app/src/main/java/com/example/myapplication/ui/notifications/FeedbackUploader.java deleted file mode 100644 index 4db6055..0000000 --- a/app/src/main/java/com/example/myapplication/ui/notifications/FeedbackUploader.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.example.myapplication.ui.notifications; - -import android.util.Log; -import android.widget.Toast; - -import java.io.*; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - -public class FeedbackUploader {//反馈信息与后端进行交互 - public static void submitFeedback(UserFeedbackActivity userFeedbackActivity, String imagePath,String additionalString) { - ExecutorService executorService = Executors.newFixedThreadPool(1); - Toast toast = new Toast(userFeedbackActivity.getActivity()); - Future uploadTask = executorService.submit(() -> { - try { - Log.d("s2","t1"); - String uploadImageUrl = "http://192.168.203.243:5000/upload_image"; // 替换为图片上传的URL - String uploadStringUrl = "http://192.168.203.243:5000/upload_text"; // 替换为字符串上传的URL - Log.d("s2","t2"); - File imageFile = new File(imagePath); - if (!imageFile.exists()) { - Log.d("s2","t3"); - System.out.println("Image file not found."); - return null; - } - Log.d("s2","t1"); - // 发送图片 - URL imageUrl = new URL(uploadImageUrl); - HttpURLConnection imageConnection = (HttpURLConnection) imageUrl.openConnection(); - imageConnection.setRequestMethod("POST"); - imageConnection.setDoOutput(true); - - // 构建请求体 - String boundary = "*****"; - String lineEnd = "\r\n"; - String twoHyphens = "--"; - - imageConnection.setRequestProperty("Content-Type", "multipart/form-data;boundary=" + boundary); - - DataOutputStream imageDos = new DataOutputStream(imageConnection.getOutputStream()); - imageDos.writeBytes(twoHyphens + boundary + lineEnd); - imageDos.writeBytes("Content-Disposition: form-data; name=\"file\";filename=\"" + imageFile.getName() + "\"" + lineEnd); - imageDos.writeBytes("Content-Type: image/jpeg" + lineEnd); - imageDos.writeBytes(lineEnd); - - FileInputStream imageInputStream = new FileInputStream(imageFile); - byte[] buffer = new byte[4096]; - int bytesRead; - while ((bytesRead = imageInputStream.read(buffer)) != -1) { - imageDos.write(buffer, 0, bytesRead); - } - imageDos.writeBytes(lineEnd); - imageDos.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd); - Log.d("s2","t1"); - // 发送图片请求并获取响应 - int imageResponseCode = imageConnection.getResponseCode(); - if (imageResponseCode == HttpURLConnection.HTTP_OK) { - // 图片上传成功 -// System.out.println("Image uploaded successfully."); - InputStream inputStream = imageConnection.getInputStream(); - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); - String line; - line=reader.readLine(); - - inputStream.close(); - Log.d("s2","t2"); - // 发送字符串 - URL urlString = new URL(uploadStringUrl); - HttpURLConnection stringConnection = (HttpURLConnection) urlString.openConnection(); - stringConnection.setRequestMethod("POST"); - stringConnection.setDoOutput(true); - stringConnection.setRequestProperty("Content-Type", "text/plain"); - - OutputStream stringOs = stringConnection.getOutputStream(); - stringOs.write(additionalString.getBytes("UTF-8")); - stringOs.flush(); - stringOs.close(); - // 获取字符串上传响应 - int stringResponseCode = stringConnection.getResponseCode(); - if (stringResponseCode == HttpURLConnection.HTTP_OK) { - Log.d("s2","t3"); - // 字符串上传成功 - InputStream inputStream2 = stringConnection.getInputStream(); - BufferedReader reader2 = new BufferedReader(new InputStreamReader(inputStream2)); - while ((line = reader2.readLine()) != null) { - System.out.println(line); - } - inputStream2.close(); - toast.setText("图片上传成功!"); - } else { - toast.setText("图片上传失败"); - // 字符串上传失败 - System.out.println("String upload failed with response code: " + stringResponseCode); - } - } else { - // 图片上传失败 - toast.setText("图片上传失败"); - System.out.println("Image upload failed with response code: " + imageResponseCode); - } - imageInputStream.close(); - imageDos.flush(); - imageDos.close(); - } catch (Exception e) { - e.printStackTrace(); - }finally { - toast.show(); - } - - return null; - }); - - // 等待上传任务完成 - try { - uploadTask.get(); - } catch (Exception e) { - e.printStackTrace(); - } - - // 关闭线程池 - executorService.shutdown(); - } -} diff --git a/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedback.java b/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedback.java deleted file mode 100644 index cf72e69..0000000 --- a/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedback.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.example.myapplication.ui.notifications; - -import android.database.Cursor; -import android.net.Uri; -import android.provider.MediaStore; - -public class UserFeedback { - public UserFeedbackActivity userFeedbackActivity; - - public UserFeedback(UserFeedbackActivity userFeedbackActivity) { - this.userFeedbackActivity = userFeedbackActivity; - } - - public void resetAll()//аť - { - userFeedbackActivity.editText.setText(""); - userFeedbackActivity.userExperience.setChecked(false); - userFeedbackActivity.positiveRecommendation.setChecked(false); - userFeedbackActivity.otherIssues.setChecked(false); - userFeedbackActivity.classificationExpansion.setChecked(false); - userFeedbackActivity.functionalRecommendations.setChecked(false); - userFeedbackActivity.identifyDeviations.setChecked(false); - } - - public String getRealPathFromURI(Uri contentUri) {//ȡӦͼƬURI - String[] proj = { MediaStore.Images.Media.DATA }; - Cursor cursor = userFeedbackActivity.getContext().getContentResolver().query(contentUri, proj, null, null, null); - int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA); - cursor.moveToFirst(); - String path = cursor.getString(column_index); - cursor.close(); - return path; - } - - - public void submitFeedback(Uri uri)//ύ - { - String feedback=recordFeedback(); - FeedbackUploader.submitFeedback(userFeedbackActivity,getRealPathFromURI(uri),feedback); - } - - public String recordFeedback()//ʽַ˽ͨţʽΪ100011|ıϢǰλζӦû顢ʶƫܽ顢䡢⡢Ƽ|ǷָȻıݼûύ - { - StringBuilder sb = new StringBuilder(); - if(userFeedbackActivity.positiveRecommendation.isChecked()) - { - sb.append('1'); - } - else - { - sb.append('0'); - } - if(userFeedbackActivity.otherIssues.isChecked()) - { - sb.append('1'); - } - else - { - sb.append('0'); - } - if(userFeedbackActivity.classificationExpansion.isChecked()) - { - sb.append('1'); - } - else - { - sb.append('0'); - } - if(userFeedbackActivity.functionalRecommendations.isChecked()) - { - sb.append('1'); - } - else - { - sb.append('0'); - } - if(userFeedbackActivity.identifyDeviations.isChecked()) - { - sb.append('1'); - } - else - { - sb.append('0'); - } - if(userFeedbackActivity.userExperience.isChecked()) - { - sb.append('1'); - } - else - { - sb.append('0'); - } - String contentEditText=userFeedbackActivity.editText.getText().toString(); - sb.append('|'); - return sb.toString()+contentEditText; - } - - - -} diff --git a/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedbackActivity.java b/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedbackActivity.java deleted file mode 100644 index 847760c..0000000 --- a/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedbackActivity.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.example.myapplication.ui.notifications; - -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.provider.MediaStore; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.ImageButton; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; - -import com.example.myapplication.R; -import com.example.myapplication.databinding.FragmentNotificationsBinding; -import com.example.myapplication.ui.home.ImageUploader; -import com.google.android.material.checkbox.MaterialCheckBox; - -public class UserFeedbackActivity extends Fragment { - - private FragmentNotificationsBinding binding; - - private ImageButton buttonSelectImage; - - public EditText editText; - private Button submit,reset; - - private UserFeedback userFeedback; - - private Uri uri; - - public MaterialCheckBox userExperience,identifyDeviations,functionalRecommendations,classificationExpansion,otherIssues,positiveRecommendation; - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - UserFeedbackViewModel notificationsViewModel = - new ViewModelProvider(this).get(UserFeedbackViewModel.class); - userFeedback = new UserFeedback(this); - binding = FragmentNotificationsBinding.inflate(inflater, container, false); - View root = binding.getRoot(); - editText = root.findViewById(R.id.input_feedback); - buttonSelectImage = root.findViewById(R.id.btn_select_image); - userExperience=root.findViewById(R.id.user_experience); - identifyDeviations=root.findViewById(R.id.identify_deviations); - functionalRecommendations = root.findViewById(R.id.functional_recommendations); - classificationExpansion = root.findViewById(R.id.classification_expansion); - otherIssues = root.findViewById(R.id.other_issues); - positiveRecommendation = root.findViewById(R.id.positive_recommendation); - submit = root.findViewById(R.id.submit); - reset = root.findViewById(R.id.reset); - editText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { - editText.setCursorVisible(false); - } - - @Override - public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { - - } - - @Override - public void afterTextChanged(Editable editable) { - if(editable != null&& editable.toString().length()>0) - { - editText.setCursorVisible(true); - editText.setGravity(Gravity.START); - } - else - { - editText.setGravity(Gravity.CENTER); - } - } - }); - buttonSelectImage.setOnClickListener(new View.OnClickListener() {//跳转到相册界面 - @Override - public void onClick(View view) { - Intent intent = new Intent(Intent.ACTION_PICK,null); - intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,"image/*"); - startActivityForResult(intent,2); - } - }); - submit.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - userFeedback.submitFeedback(uri); - } - }); - reset.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - userFeedback.resetAll(); - } - }); - return root; - } - - @Override - public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {//获取用户选择的相册的图片 - if(resultCode==-1) - { - if(data!=null) - { - uri = data.getData(); - buttonSelectImage.setImageURI(uri); - } - } - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedbackViewModel.java b/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedbackViewModel.java deleted file mode 100644 index 6aa646a..0000000 --- a/app/src/main/java/com/example/myapplication/ui/notifications/UserFeedbackViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.myapplication.ui.notifications; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class UserFeedbackViewModel extends ViewModel { - - private final MutableLiveData mText; - - public UserFeedbackViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is notifications fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuiz.java b/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuiz.java deleted file mode 100644 index 00ceade..0000000 --- a/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuiz.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.example.myapplication.ui.quiz; - -import android.graphics.Color; -import android.media.session.MediaSession; -import android.widget.MultiAutoCompleteTextView; -import android.widget.Toast; - -import androidx.fragment.app.FragmentActivity; - -import com.example.myapplication.R; -import com.example.myapplication.ui.tools.Problem; - -import java.io.FileInputStream; -import java.io.IOException; - -public class GarbageQuiz { - - private Problem problemTool,analysisTool;//问题分析和分析分析的类对象 - - private GarbageQuizActivity fragment;//对应的界面 - - GarbageQuiz(GarbageQuizActivity fragmentActivity) throws IOException { - this.fragment=fragmentActivity; - problemTool = new Problem(fragment.getResources().openRawResource(R.raw.question)); - analysisTool = new Problem(fragment.getResources().openRawResource(R.raw.answer)); - } - void clearOptionColor()//清空之前活动的选项 - { - fragment.aButton.setTextColor(Color.BLACK); - fragment.bButton.setTextColor(Color.BLACK); - fragment.cButton.setTextColor(Color.BLACK); - fragment.dButton.setTextColor(Color.BLACK); - } - - public void chooseAOption()//选中A选项，下面依次是选B、C、D，选中后清空之前的选项文本颜色，对应的选项文本颜色变为绿色 - { - String answer = analysisTool.getAnswer(problemTool.getNow()); - fragment.analysisTextView.setText(answer); - clearOptionColor(); - fragment.aButton.setTextColor(Color.rgb(177,247,206)); - } - - public void chooseBOption() - { - String answer = analysisTool.getAnswer(problemTool.getNow()); - fragment.analysisTextView.setText(answer); - clearOptionColor(); - fragment.bButton.setTextColor(Color.rgb(177,247,206)); - } - public void chooseCOption() - { - String answer = analysisTool.getAnswer(problemTool.getNow()); - fragment.analysisTextView.setText(answer); - clearOptionColor(); - fragment.cButton.setTextColor(Color.rgb(177,247,206)); - } - public void chooseDOption() - { - String answer = analysisTool.getAnswer(problemTool.getNow()); - fragment.analysisTextView.setText(answer); - clearOptionColor(); - fragment.dButton.setTextColor(Color.rgb(177,247,206)); - } - public void getLastQuestion()//获取前一个问题，如果是第一个问题，提示用户 - { - clearOptionColor(); - fragment.analysisTextView.setText(""); - String[] strings = problemTool.getPreQuestion(); - if (strings == null) { - Toast.makeText(this.fragment.getActivity(), "这已经是第一个问题啦", Toast.LENGTH_SHORT).show(); - return; - } - - fragment.question.setText(strings[0]); - fragment.aButton.setText(strings[1]); - fragment.bButton.setText(strings[2]); - fragment.cButton.setText(strings[3]); - fragment.dButton.setText(strings[4]); - } - public void getNextQuestion()//获取后一个问题，假如是最后一个问题，提示用户 - { - clearOptionColor(); - fragment.analysisTextView.setText(""); - String[] strings = problemTool.getNextQuestion(); - if (strings == null) { - Toast.makeText(this.fragment.getActivity(), "这已经是最后一个问题啦", Toast.LENGTH_SHORT).show(); - return; - } - - fragment.question.setText(strings[0]); - fragment.aButton.setText(strings[1]); - fragment.bButton.setText(strings[2]); - fragment.cButton.setText(strings[3]); - fragment.dButton.setText(strings[4]); - } - - -} diff --git a/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuizActivity.java b/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuizActivity.java deleted file mode 100644 index f79499d..0000000 --- a/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuizActivity.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.example.myapplication.ui.quiz; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ImageButton; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.example.myapplication.R; -import com.example.myapplication.databinding.GarbageQuizBinding; -import com.example.myapplication.ui.home.GarbageRecognition; -import com.example.myapplication.ui.home.GarbageRecognitionActivityViewModel; -import com.example.myapplication.ui.notifications.UserFeedbackViewModel; - -import java.io.IOException; - -public class GarbageQuizActivity extends Fragment { - private GarbageQuizBinding binding; - public Button aButton,bButton,cButton,dButton; - private ImageButton preQuestionButton,nextQuestionButton; - - private GarbageQuiz garbageQuiz; - - public TextView question,analysisTextView; - - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - com.example.myapplication.ui.newthing.GarbageQuizViewModel notificationsViewModel = - new ViewModelProvider(this).get(com.example.myapplication.ui.newthing.GarbageQuizViewModel.class); - binding = GarbageQuizBinding.inflate(inflater,container,false); - View root = binding.getRoot(); - aButton = root.findViewById(R.id.a_option); - bButton = root.findViewById(R.id.b_option); - cButton = root.findViewById(R.id.c_option); - dButton = root.findViewById(R.id.d_option); - question = root.findViewById(R.id.question); - analysisTextView = root.findViewById(R.id.analysisTextView); - preQuestionButton = root.findViewById(R.id.pre_question); - nextQuestionButton = root.findViewById(R.id.next_question); - try { - garbageQuiz =new GarbageQuiz(this); - } catch (IOException e) { - throw new RuntimeException(e); - } - aButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - garbageQuiz.chooseAOption(); - } - }); - bButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - garbageQuiz.chooseBOption(); - } - }); - cButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - garbageQuiz.chooseCOption(); - } - }); - dButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - garbageQuiz.chooseDOption(); - } - }); - preQuestionButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - garbageQuiz.getLastQuestion(); - } - }); - nextQuestionButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - garbageQuiz.getNextQuestion(); - } - }); - nextQuestionButton.performClick(); - return root; - } -} diff --git a/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuizViewModel.java b/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuizViewModel.java deleted file mode 100644 index 672a00e..0000000 --- a/app/src/main/java/com/example/myapplication/ui/quiz/GarbageQuizViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.myapplication.ui.newthing; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class GarbageQuizViewModel extends ViewModel { - - private MutableLiveData mText; - - public GarbageQuizViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is new fragment");//根据自己喜欢放界面的测试文字 - } - - public LiveData getText() { - return mText; - } -} diff --git a/app/src/main/java/com/example/myapplication/ui/tools/Problem.java b/app/src/main/java/com/example/myapplication/ui/tools/Problem.java deleted file mode 100644 index f4d652d..0000000 --- a/app/src/main/java/com/example/myapplication/ui/tools/Problem.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.example.myapplication.ui.tools; - -import android.util.Log; - -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellValue; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; - -import java.io.BufferedReader; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class Problem { - private XSSFWorkbook workbook; - - private int start; - - private int end; - - private int sz; - - private int now=-1; - - private boolean flag=true; - - private ArrayListquestion;//存储对应的问题 - - private ArrayList rowNum;//存储目前问题对应的xlsx行数 - Sheet sheet; - - public int getNow() - { - return rowNum.get(now); - } - - public Problem(InputStream file) throws IOException {//打开res库中的xlsx，读取对应的图库和解析 - rowNum = new ArrayList<>(); - try - { - workbook = new XSSFWorkbook(file); - sheet = workbook.getSheetAt(0); - sz = sheet.getPhysicalNumberOfRows(); - Random random = new Random(); - int randomNumber = random.nextInt(sz); - question = new ArrayList<>(); - start=end=randomNumber; - int i; - int tmp=sz; - for(i=start;tmp!=0;tmp--,i++) - { - rowNum.add(i%sz); - Row row = sheet.getRow((i)%sz); - Cell cell = row.getCell(1); - if(cell != null) - { - String cellValue = cell.getStringCellValue(); - cellValue=cellValue.replace("（）"," "); - String[] split = cellValue.split(" "); - question.add(split); - } - } - }catch (Exception e) - { - e.printStackTrace(); - System.out.println("读取文件失败"); - } - } - public void close() throws IOException { - workbook.close(); - } - public String[] getPreQuestion()//获取前一个问题 - { - if(now-1>=0)return question.get(--now); - else return null; - } - public String[] getNextQuestion()//获取后一个问题 - { - if(now+1 - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/app_icon.png b/app/src/main/res/drawable/app_icon.png deleted file mode 100644 index a0bd926..0000000 Binary files a/app/src/main/res/drawable/app_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml deleted file mode 100644 index 417413e..0000000 --- a/app/src/main/res/drawable/border.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml deleted file mode 100644 index a6c2cc4..0000000 --- a/app/src/main/res/drawable/button.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/camera.png b/app/src/main/res/drawable/camera.png deleted file mode 100644 index 9e40feb..0000000 Binary files a/app/src/main/res/drawable/camera.png and /dev/null differ diff --git a/app/src/main/res/drawable/capture_photo.jpg b/app/src/main/res/drawable/capture_photo.jpg deleted file mode 100644 index 10a3b94..0000000 Binary files a/app/src/main/res/drawable/capture_photo.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/checkbox_rounded_corner.xml b/app/src/main/res/drawable/checkbox_rounded_corner.xml deleted file mode 100644 index e7579c0..0000000 --- a/app/src/main/res/drawable/checkbox_rounded_corner.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/circle_button.xml b/app/src/main/res/drawable/circle_button.xml deleted file mode 100644 index f188386..0000000 --- a/app/src/main/res/drawable/circle_button.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/garbage_bin.png b/app/src/main/res/drawable/garbage_bin.png deleted file mode 100644 index a7025ca..0000000 Binary files a/app/src/main/res/drawable/garbage_bin.png and /dev/null differ diff --git a/app/src/main/res/drawable/garbage_quiz.png b/app/src/main/res/drawable/garbage_quiz.png deleted file mode 100644 index 1a4a97a..0000000 Binary files a/app/src/main/res/drawable/garbage_quiz.png and /dev/null differ diff --git a/app/src/main/res/drawable/garbage_recogniton.png b/app/src/main/res/drawable/garbage_recogniton.png deleted file mode 100644 index 8993acb..0000000 Binary files a/app/src/main/res/drawable/garbage_recogniton.png and /dev/null differ diff --git a/app/src/main/res/drawable/go.png b/app/src/main/res/drawable/go.png deleted file mode 100644 index d6fef0e..0000000 Binary files a/app/src/main/res/drawable/go.png and /dev/null differ diff --git a/app/src/main/res/drawable/gocation.png b/app/src/main/res/drawable/gocation.png deleted file mode 100644 index c241a71..0000000 Binary files a/app/src/main/res/drawable/gocation.png and /dev/null differ diff --git a/app/src/main/res/drawable/groundimage.webp b/app/src/main/res/drawable/groundimage.webp deleted file mode 100644 index 333b74c..0000000 Binary files a/app/src/main/res/drawable/groundimage.webp and /dev/null differ diff --git a/app/src/main/res/drawable/hazard.png b/app/src/main/res/drawable/hazard.png deleted file mode 100644 index 3379dd1..0000000 Binary files a/app/src/main/res/drawable/hazard.png and /dev/null differ diff --git a/app/src/main/res/drawable/hazard_result.png b/app/src/main/res/drawable/hazard_result.png deleted file mode 100644 index 109f896..0000000 Binary files a/app/src/main/res/drawable/hazard_result.png and /dev/null differ diff --git a/app/src/main/res/drawable/hazardous_waste.png b/app/src/main/res/drawable/hazardous_waste.png deleted file mode 100644 index 3ffd9d9..0000000 Binary files a/app/src/main/res/drawable/hazardous_waste.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic.png b/app/src/main/res/drawable/ic.png deleted file mode 100644 index a0bd926..0000000 Binary files a/app/src/main/res/drawable/ic.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml deleted file mode 100644 index 46fc8de..0000000 --- a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml deleted file mode 100644 index f8bb0b5..0000000 --- a/app/src/main/res/drawable/ic_home_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml deleted file mode 100644 index 78b75c3..0000000 --- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/image_upload.png b/app/src/main/res/drawable/image_upload.png deleted file mode 100644 index 51fa454..0000000 Binary files a/app/src/main/res/drawable/image_upload.png and /dev/null differ diff --git a/app/src/main/res/drawable/kitchen.png b/app/src/main/res/drawable/kitchen.png deleted file mode 100644 index 28ab6fa..0000000 Binary files a/app/src/main/res/drawable/kitchen.png and /dev/null differ diff --git a/app/src/main/res/drawable/kitchen_garbage.jpg b/app/src/main/res/drawable/kitchen_garbage.jpg deleted file mode 100644 index 2589c4b..0000000 Binary files a/app/src/main/res/drawable/kitchen_garbage.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/kitchen_result.png b/app/src/main/res/drawable/kitchen_result.png deleted file mode 100644 index 8e37162..0000000 Binary files a/app/src/main/res/drawable/kitchen_result.png and /dev/null differ diff --git a/app/src/main/res/drawable/launch_logo.png b/app/src/main/res/drawable/launch_logo.png deleted file mode 100644 index eca105b..0000000 Binary files a/app/src/main/res/drawable/launch_logo.png and /dev/null differ diff --git a/app/src/main/res/drawable/lrx.xml b/app/src/main/res/drawable/lrx.xml deleted file mode 100644 index 47029a5..0000000 --- a/app/src/main/res/drawable/lrx.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/map.png b/app/src/main/res/drawable/map.png deleted file mode 100644 index 5ea7e32..0000000 Binary files a/app/src/main/res/drawable/map.png and /dev/null differ diff --git a/app/src/main/res/drawable/my_location.png b/app/src/main/res/drawable/my_location.png deleted file mode 100644 index f6fc8be..0000000 Binary files a/app/src/main/res/drawable/my_location.png and /dev/null differ diff --git a/app/src/main/res/drawable/near_trash_bin.png b/app/src/main/res/drawable/near_trash_bin.png deleted file mode 100644 index e769407..0000000 Binary files a/app/src/main/res/drawable/near_trash_bin.png and /dev/null differ diff --git a/app/src/main/res/drawable/next_question.png b/app/src/main/res/drawable/next_question.png deleted file mode 100644 index bf7af18..0000000 Binary files a/app/src/main/res/drawable/next_question.png and /dev/null differ diff --git a/app/src/main/res/drawable/other.png b/app/src/main/res/drawable/other.png deleted file mode 100644 index a0a0d8d..0000000 Binary files a/app/src/main/res/drawable/other.png and /dev/null differ diff --git a/app/src/main/res/drawable/other_garbage.png b/app/src/main/res/drawable/other_garbage.png deleted file mode 100644 index 916cf0f..0000000 Binary files a/app/src/main/res/drawable/other_garbage.png and /dev/null differ diff --git a/app/src/main/res/drawable/other_result.png b/app/src/main/res/drawable/other_result.png deleted file mode 100644 index 17f2cab..0000000 Binary files a/app/src/main/res/drawable/other_result.png and /dev/null differ diff --git a/app/src/main/res/drawable/photo.png b/app/src/main/res/drawable/photo.png deleted file mode 100644 index 51fa454..0000000 Binary files a/app/src/main/res/drawable/photo.png and /dev/null differ diff --git a/app/src/main/res/drawable/previous_question.png b/app/src/main/res/drawable/previous_question.png deleted file mode 100644 index 41d967f..0000000 Binary files a/app/src/main/res/drawable/previous_question.png and /dev/null differ diff --git a/app/src/main/res/drawable/quiz_background.jpg b/app/src/main/res/drawable/quiz_background.jpg deleted file mode 100644 index 2dc9bc0..0000000 Binary files a/app/src/main/res/drawable/quiz_background.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/recycle.png b/app/src/main/res/drawable/recycle.png deleted file mode 100644 index daeea57..0000000 Binary files a/app/src/main/res/drawable/recycle.png and /dev/null differ diff --git a/app/src/main/res/drawable/recycle_garbage.jpg b/app/src/main/res/drawable/recycle_garbage.jpg deleted file mode 100644 index 0f0e823..0000000 Binary files a/app/src/main/res/drawable/recycle_garbage.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/recycle_result.png b/app/src/main/res/drawable/recycle_result.png deleted file mode 100644 index 8e6c280..0000000 Binary files a/app/src/main/res/drawable/recycle_result.png and /dev/null differ diff --git a/app/src/main/res/drawable/resultofhazardous.jpg b/app/src/main/res/drawable/resultofhazardous.jpg deleted file mode 100644 index 38f1cbc..0000000 Binary files a/app/src/main/res/drawable/resultofhazardous.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/resultofkitchen.png b/app/src/main/res/drawable/resultofkitchen.png deleted file mode 100644 index 4ec00e3..0000000 Binary files a/app/src/main/res/drawable/resultofkitchen.png and /dev/null differ diff --git a/app/src/main/res/drawable/resultofother.jpg b/app/src/main/res/drawable/resultofother.jpg deleted file mode 100644 index 75d7666..0000000 Binary files a/app/src/main/res/drawable/resultofother.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/resultofrecycle.jpg b/app/src/main/res/drawable/resultofrecycle.jpg deleted file mode 100644 index 0acc2cb..0000000 Binary files a/app/src/main/res/drawable/resultofrecycle.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/sqrt.png b/app/src/main/res/drawable/sqrt.png deleted file mode 100644 index 52a6a6b..0000000 Binary files a/app/src/main/res/drawable/sqrt.png and /dev/null differ diff --git a/app/src/main/res/drawable/text_underline.xml b/app/src/main/res/drawable/text_underline.xml deleted file mode 100644 index 677a190..0000000 --- a/app/src/main/res/drawable/text_underline.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/text_underline1.xml b/app/src/main/res/drawable/text_underline1.xml deleted file mode 100644 index b3e724a..0000000 --- a/app/src/main/res/drawable/text_underline1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/text_underline2.xml b/app/src/main/res/drawable/text_underline2.xml deleted file mode 100644 index 5fad0f5..0000000 --- a/app/src/main/res/drawable/text_underline2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/text_underline3.xml b/app/src/main/res/drawable/text_underline3.xml deleted file mode 100644 index acf13e8..0000000 --- a/app/src/main/res/drawable/text_underline3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/text_underline4.xml b/app/src/main/res/drawable/text_underline4.xml deleted file mode 100644 index d18506b..0000000 --- a/app/src/main/res/drawable/text_underline4.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/textarea.xml b/app/src/main/res/drawable/textarea.xml deleted file mode 100644 index a1fa932..0000000 --- a/app/src/main/res/drawable/textarea.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/trash_bin_button.xml b/app/src/main/res/drawable/trash_bin_button.xml deleted file mode 100644 index 30da113..0000000 --- a/app/src/main/res/drawable/trash_bin_button.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/upload.png b/app/src/main/res/drawable/upload.png deleted file mode 100644 index d1401db..0000000 Binary files a/app/src/main/res/drawable/upload.png and /dev/null differ diff --git a/app/src/main/res/drawable/user_confirm.png b/app/src/main/res/drawable/user_confirm.png deleted file mode 100644 index 7d29d32..0000000 Binary files a/app/src/main/res/drawable/user_confirm.png and /dev/null differ diff --git a/app/src/main/res/drawable/user_feed_back.png b/app/src/main/res/drawable/user_feed_back.png deleted file mode 100644 index 35419cc..0000000 Binary files a/app/src/main/res/drawable/user_feed_back.png and /dev/null differ diff --git a/app/src/main/res/drawable/your_image.xml b/app/src/main/res/drawable/your_image.xml deleted file mode 100644 index fb3185b..0000000 --- a/app/src/main/res/drawable/your_image.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/font/hkzykt.ttf b/app/src/main/res/font/hkzykt.ttf deleted file mode 100644 index b7d487d..0000000 Binary files a/app/src/main/res/font/hkzykt.ttf and /dev/null differ diff --git a/app/src/main/res/font/tqkt.ttf b/app/src/main/res/font/tqkt.ttf deleted file mode 100644 index 036c586..0000000 Binary files a/app/src/main/res/font/tqkt.ttf and /dev/null differ diff --git a/app/src/main/res/font/wrxk.TTF b/app/src/main/res/font/wrxk.TTF deleted file mode 100644 index ff0faca..0000000 Binary files a/app/src/main/res/font/wrxk.TTF and /dev/null differ diff --git a/app/src/main/res/layout/bottom_navigiation.xml b/app/src/main/res/layout/bottom_navigiation.xml deleted file mode 100644 index 8daa267..0000000 --- a/app/src/main/res/layout/bottom_navigiation.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/capture.xml b/app/src/main/res/layout/capture.xml deleted file mode 100644 index 299ed0f..0000000 --- a/app/src/main/res/layout/capture.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/confirm_photo.xml b/app/src/main/res/layout/confirm_photo.xml deleted file mode 100644 index cedeb92..0000000 --- a/app/src/main/res/layout/confirm_photo.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/face_layout.xml b/app/src/main/res/layout/face_layout.xml deleted file mode 100644 index 3d9ecaf..0000000 --- a/app/src/main/res/layout/face_layout.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml deleted file mode 100644 index 414184b..0000000 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml deleted file mode 100644 index 9e2f7f6..0000000 --- a/app/src/main/res/layout/fragment_home.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml deleted file mode 100644 index c72fe57..0000000 --- a/app/src/main/res/layout/fragment_notifications.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -