From cf797bda9cb3ebf0799395c0e9cae3fb54087250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= <nem@nem.x0.to>
Date: Wed, 17 Jan 2024 18:02:12 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"=E3=82=A2=E3=82=AF=E3=83=86=E3=82=A3?=
 =?UTF-8?q?=E3=83=93=E3=83=86=E3=82=A3=E4=BD=9C=E6=88=90"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 72c09a2eef97824d38041f0b598a23d118f23bfa.
---
 app/build.gradle                              |  1 -
 app/src/main/AndroidManifest.xml              |  8 ++-----
 .../example/childguard/QrControlActivity.java | 24 -------------------
 .../main/res/layout/activity_qr_control.xml   | 10 --------
 4 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 app/src/main/java/com/example/childguard/QrControlActivity.java
 delete mode 100644 app/src/main/res/layout/activity_qr_control.xml

diff --git a/app/build.gradle b/app/build.gradle
index eda82f8..0e3b833 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,7 +67,6 @@ dependencies {
     // Declare the dependency for the Cloud Firestore library
     // When using the BoM, you don't specify versions in Firebase library dependencies
     implementation("com.google.firebase:firebase-firestore")
-    implementation 'androidx.activity:activity:1.8.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4eab6a4..cbdd641 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,11 +6,10 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.VIBRATE" />
-
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -21,9 +20,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ChildGuard"
         tools:targetApi="31">
-        <activity
-            android:name=".QrControlActivity"
-            android:exported="false" />
         <activity
             android:name=".First_Start"
             android:exported="false"
diff --git a/app/src/main/java/com/example/childguard/QrControlActivity.java b/app/src/main/java/com/example/childguard/QrControlActivity.java
deleted file mode 100644
index 227a80c..0000000
--- a/app/src/main/java/com/example/childguard/QrControlActivity.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.childguard;
-
-import android.os.Bundle;
-
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-public class QrControlActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_qr_control);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_qr_control.xml b/app/src/main/res/layout/activity_qr_control.xml
deleted file mode 100644
index 3aa44dd..0000000
--- a/app/src/main/res/layout/activity_qr_control.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".QrControlActivity">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file