Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9de98193d9 | ||
|
|
51c34966bc | ||
|
|
d9ab6d6095 | ||
|
|
98578291ea | ||
|
|
f7566d9df0 | ||
|
|
0079987075 | ||
|
|
004a0820e2 | ||
|
|
114faf1ac0 | ||
|
|
c603d516e8 | ||
|
|
eb4e3b4a38 | ||
|
|
0dac52e0fb | ||
|
|
afc0f02378 | ||
|
|
1a33e070b5 | ||
|
|
18636c661c | ||
|
|
5af6a41bab | ||
|
|
8d54d7cc55 | ||
|
|
f4cae51cda | ||
|
|
066ba473f6 | ||
|
|
b4d85f9011 | ||
|
|
f51b1b52ce | ||
|
|
96e2145d5e | ||
|
|
4b4f3b8666 | ||
|
|
5bc4c5debd | ||
|
|
b5b9a5eeb3 | ||
|
|
7f89b46297 | ||
|
|
04d0f28ef0 | ||
|
|
1422f87af8 | ||
|
|
22d4e71146 | ||
|
|
81209f695d | ||
|
|
6927b386cd | ||
|
|
b7a5040e43 | ||
|
|
6402452f6b | ||
|
|
0e14f74a3c | ||
|
|
9dda0adbed | ||
|
|
398186e07c | ||
|
|
4bb63c0fd2 | ||
|
|
b9546b4826 | ||
|
|
1186fd7757 | ||
|
|
737b2c8a4d | ||
|
|
17b3106bdd | ||
|
|
92bc036bc4 | ||
|
|
8c6660d34a | ||
|
|
c946f29fab | ||
|
|
93d9eddf4e | ||
|
|
9a0b132595 | ||
|
|
d1a6d13686 | ||
|
|
709eaf73e9 | ||
|
|
ed5e1173ee | ||
|
|
e645577f40 | ||
|
|
ee6754ffeb | ||
|
|
440eb651e9 | ||
|
|
62a024d1e6 |
No files matched your search
Generated
+3
-1
@@ -1,10 +1,12 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
|
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
|
<option name="testRunner" value="GRADLE" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
|
<option name="gradleJvm" value="Embedded JDK" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
<set>
|
<set>
|
||||||
<option value="$PROJECT_DIR$" />
|
<option value="$PROJECT_DIR$" />
|
||||||
|
|||||||
Generated
+6
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="KotlinJpsPluginSettings">
|
||||||
|
<option name="version" value="1.7.20" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+1
-2
@@ -1,7 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application'
|
id 'com.android.application'
|
||||||
|
id 'org.jetbrains.kotlin.android'
|
||||||
|
id 'com.google.gms.google-services'
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
@@ -14,6 +16,9 @@ android {
|
|||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
vectorDrawables {
|
||||||
|
useSupportLibrary true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
@@ -26,6 +31,20 @@ android {
|
|||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = '1.8'
|
||||||
|
}
|
||||||
|
buildFeatures {
|
||||||
|
compose true
|
||||||
|
}
|
||||||
|
composeOptions {
|
||||||
|
kotlinCompilerExtensionVersion '1.3.2'
|
||||||
|
}
|
||||||
|
packagingOptions {
|
||||||
|
resources {
|
||||||
|
excludes += '/META-INF/{AL2.0,LGPL2.1}'
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -33,9 +52,25 @@ dependencies {
|
|||||||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
implementation 'androidx.appcompat:appcompat:1.6.1'
|
||||||
implementation 'com.google.android.material:material:1.5.0'
|
implementation 'com.google.android.material:material:1.5.0'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||||
|
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
|
||||||
|
implementation 'androidx.activity:activity-compose:1.5.1'
|
||||||
|
implementation platform('androidx.compose:compose-bom:2022.10.00')
|
||||||
|
implementation 'androidx.compose.ui:ui'
|
||||||
|
implementation 'androidx.compose.ui:ui-graphics'
|
||||||
|
implementation 'androidx.compose.ui:ui-tooling-preview'
|
||||||
|
implementation 'androidx.compose.material3:material3'
|
||||||
|
|
||||||
|
// Import the BoM for the Firebase platform
|
||||||
|
implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
|
||||||
|
|
||||||
|
// 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")
|
||||||
|
|
||||||
testImplementation 'junit:junit:4.13.2'
|
testImplementation 'junit:junit:4.13.2'
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
||||||
|
implementation 'com.journeyapps:zxing-android-embedded:4.3.0'//QR用zxingライブラリ
|
||||||
|
|
||||||
|
implementation 'androidx.browser:browser:1.5.0'
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
{
|
||||||
|
"project_info": {
|
||||||
|
"project_number": "814788024795",
|
||||||
|
"project_id": "practicefirestore1-8808c",
|
||||||
|
"storage_bucket": "practicefirestore1-8808c.appspot.com"
|
||||||
|
},
|
||||||
|
"client": [
|
||||||
|
{
|
||||||
|
"client_info": {
|
||||||
|
"mobilesdk_app_id": "1:814788024795:android:79602ef613cc9860c76ffe",
|
||||||
|
"android_client_info": {
|
||||||
|
"package_name": "com.example.childguard"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"oauth_client": [],
|
||||||
|
"api_key": [
|
||||||
|
{
|
||||||
|
"current_key": "AIzaSyAVpoftIYGZwiPRpuI56hoV8ifA2rbZGb4"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"services": {
|
||||||
|
"appinvite_service": {
|
||||||
|
"other_platform_oauth_client": []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"client_info": {
|
||||||
|
"mobilesdk_app_id": "1:814788024795:android:7c572a838331bba1c76ffe",
|
||||||
|
"android_client_info": {
|
||||||
|
"package_name": "com.example.connecttointernet"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"oauth_client": [],
|
||||||
|
"api_key": [
|
||||||
|
{
|
||||||
|
"current_key": "AIzaSyAVpoftIYGZwiPRpuI56hoV8ifA2rbZGb4"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"services": {
|
||||||
|
"appinvite_service": {
|
||||||
|
"other_platform_oauth_client": []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"client_info": {
|
||||||
|
"mobilesdk_app_id": "1:814788024795:android:67c86939b6350f02c76ffe",
|
||||||
|
"android_client_info": {
|
||||||
|
"package_name": "com.example.practicefirestore1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"oauth_client": [],
|
||||||
|
"api_key": [
|
||||||
|
{
|
||||||
|
"current_key": "AIzaSyAVpoftIYGZwiPRpuI56hoV8ifA2rbZGb4"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"services": {
|
||||||
|
"appinvite_service": {
|
||||||
|
"other_platform_oauth_client": []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"configuration_version": "1"
|
||||||
|
}
|
||||||
@@ -2,6 +2,14 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools">
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.BLUETOOTH" />
|
||||||
|
<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.POST_NOTIFICATIONS" />
|
||||||
|
<uses-permission android:name="android.permission.VIBRATE" />
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||||
@@ -12,6 +20,11 @@
|
|||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/Theme.ChildGuard"
|
android:theme="@style/Theme.ChildGuard"
|
||||||
tools:targetApi="31">
|
tools:targetApi="31">
|
||||||
|
<activity
|
||||||
|
android:name=".First_Start"
|
||||||
|
android:exported="false"
|
||||||
|
android:label="@string/title_activity_first_start"
|
||||||
|
android:theme="@style/Theme.ChildGuard" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true">
|
android:exported="true">
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package com.example.childguard;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
public class First_Start extends AppCompatActivity {
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.first_start);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,12 +1,34 @@
|
|||||||
package com.example.childguard;
|
package com.example.childguard;
|
||||||
|
|
||||||
|
import static android.content.ContentValues.TAG;
|
||||||
|
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.graphics.Bitmap;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
import androidx.fragment.app.Fragment;
|
import android.util.Log;
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.FrameLayout;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.core.content.res.ResourcesCompat;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
|
|
||||||
|
import com.google.android.gms.tasks.OnFailureListener;
|
||||||
|
import com.google.android.gms.tasks.OnSuccessListener;
|
||||||
|
import com.google.firebase.firestore.DocumentReference;
|
||||||
|
import com.google.firebase.firestore.FirebaseFirestore;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A simple {@link Fragment} subclass.
|
* A simple {@link Fragment} subclass.
|
||||||
@@ -14,6 +36,7 @@ import android.view.ViewGroup;
|
|||||||
* create an instance of this fragment.
|
* create an instance of this fragment.
|
||||||
*/
|
*/
|
||||||
public class HomeFragment extends Fragment {
|
public class HomeFragment extends Fragment {
|
||||||
|
FirebaseFirestore db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
|
||||||
|
|
||||||
// TODO: Rename parameter arguments, choose names that match
|
// TODO: Rename parameter arguments, choose names that match
|
||||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||||
@@ -21,7 +44,7 @@ public class HomeFragment extends Fragment {
|
|||||||
private static final String ARG_PARAM2 = "param2";
|
private static final String ARG_PARAM2 = "param2";
|
||||||
|
|
||||||
// TODO: Rename and change types of parameters
|
// TODO: Rename and change types of parameters
|
||||||
private String mParam1;
|
private String str_key;
|
||||||
private String mParam2;
|
private String mParam2;
|
||||||
|
|
||||||
public HomeFragment() {
|
public HomeFragment() {
|
||||||
@@ -50,7 +73,7 @@ public class HomeFragment extends Fragment {
|
|||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
if (getArguments() != null) {
|
if (getArguments() != null) {
|
||||||
mParam1 = getArguments().getString(ARG_PARAM1);
|
// mParam1 = getArguments().getString(ARG_PARAM1);
|
||||||
mParam2 = getArguments().getString(ARG_PARAM2);
|
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -58,7 +81,122 @@ public class HomeFragment extends Fragment {
|
|||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
|
// Log.d("HomeFlagment_cnt", "aaaaa");
|
||||||
// Inflate the layout for this fragment
|
// Inflate the layout for this fragment
|
||||||
return inflater.inflate(R.layout.fragment_home, container, false);
|
View view = inflater.inflate(R.layout.fragment_home, container, false);
|
||||||
|
MainActivity activity = (MainActivity) getActivity();
|
||||||
|
//共有プリファレンス 全体の準備
|
||||||
|
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
||||||
|
//QRコード印刷の処理
|
||||||
|
Button bt1 = view.findViewById(R.id.QRprinting);
|
||||||
|
bt1.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
//初回起動かを保存する変数
|
||||||
|
boolean alreadySaved = preferences.getBoolean("alreadySaved", false);
|
||||||
|
//ボタン変数の宣言
|
||||||
|
Button parent = view.findViewById(R.id.QRprinting);
|
||||||
|
Button born = view.findViewById(R.id.QRprinting);
|
||||||
|
//falseのときにFirebaseへの登録
|
||||||
|
if (alreadySaved) {
|
||||||
|
Log.d("HomeFragment", "already printed");
|
||||||
|
//画面遷移&ID受け渡し
|
||||||
|
Toast.makeText(getActivity(),"再印刷",Toast.LENGTH_SHORT).show();
|
||||||
|
QrPrintFragment qrPrintFragment = new QrPrintFragment();
|
||||||
|
replaceFragment(qrPrintFragment);
|
||||||
|
return;
|
||||||
|
} else Log.d("HomeFragment", "not printed yet"); // debug
|
||||||
|
|
||||||
|
String valueParent = parent.getText().toString();//変数に文字列を代入
|
||||||
|
String valueBorn = born.getText().toString();//変数に文字列を代入
|
||||||
|
Map<String, String> user = new HashMap<>();//mapの宣言
|
||||||
|
|
||||||
|
Log.d("HomeFragment", "onClick is called");
|
||||||
|
|
||||||
|
//mapに入れる
|
||||||
|
user.put("parent", valueParent);
|
||||||
|
user.put("born", valueBorn);
|
||||||
|
//新しいドキュメントにIDを作って追加
|
||||||
|
db.collection("users")
|
||||||
|
.add(user)
|
||||||
|
.addOnSuccessListener(new OnSuccessListener<DocumentReference>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(DocumentReference documentReference) {
|
||||||
|
//成功したら
|
||||||
|
//documentReference.getId()でID取得
|
||||||
|
Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.getId());
|
||||||
|
SharedPreferences.Editor e = preferences.edit();
|
||||||
|
// キー"alreadySaved"の値をtrueにする
|
||||||
|
e.putBoolean("alreadySaved", true);
|
||||||
|
//確定処理
|
||||||
|
e.apply();
|
||||||
|
//画面遷移&ID受け渡し
|
||||||
|
str_key = "" + documentReference.getId();
|
||||||
|
Toast.makeText(getActivity(),"初回登録",Toast.LENGTH_SHORT).show();
|
||||||
|
QrPrintFragment qrPrintFragment = new QrPrintFragment();
|
||||||
|
Bundle bundle = new Bundle();
|
||||||
|
bundle.putString("STR_KEY",str_key);
|
||||||
|
//値を書き込む
|
||||||
|
qrPrintFragment.setArguments(bundle);
|
||||||
|
replaceFragment(qrPrintFragment);
|
||||||
|
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.addOnFailureListener(new OnFailureListener() {
|
||||||
|
@Override
|
||||||
|
public void onFailure(@NonNull Exception e) {
|
||||||
|
//失敗したら
|
||||||
|
Log.w(TAG, "Error adding document", e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
//bluetooth設定ボタンの処理
|
||||||
|
Button bt2 = view.findViewById(R.id.Bluetooth_setup);
|
||||||
|
bt2.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
replaceFragment(new bluetooth_setupFragment());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
Log.d("HomeFragment", "onResume: called");
|
||||||
|
TextView situationTextView = getView().findViewById(R.id.situation);
|
||||||
|
FrameLayout situation_bg = getView().findViewById(R.id.situation_bg);
|
||||||
|
updateInCarStatus(situationTextView, situation_bg);
|
||||||
|
}
|
||||||
|
public void updateInCarStatus(TextView situationTextView, FrameLayout situation_bg) {
|
||||||
|
SharedPreferences sharedPreferences = getActivity().getSharedPreferences("default", 0);
|
||||||
|
|
||||||
|
Log.d("HomeFragment", "updateInCarStatus: " + sharedPreferences.getBoolean("inCar", false));
|
||||||
|
if (sharedPreferences.getBoolean("inCar", false)) {
|
||||||
|
situationTextView.setText("\n降車状態");
|
||||||
|
situation_bg.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
|
||||||
|
} else {
|
||||||
|
situationTextView.setText("\n乗車状態");
|
||||||
|
situation_bg.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//画面遷移メソッド
|
||||||
|
private void replaceFragment(Fragment fragment) {
|
||||||
|
// フラグメントマネージャーの取得
|
||||||
|
FragmentManager manager = getParentFragmentManager(); // アクティビティではgetSupportFragmentManager()?
|
||||||
|
// フラグメントトランザクションの開始
|
||||||
|
FragmentTransaction transaction = manager.beginTransaction();
|
||||||
|
// レイアウトをfragmentに置き換え(追加)
|
||||||
|
transaction.replace(R.id.fragmentContainerView, fragment);
|
||||||
|
// 置き換えのトランザクションをバックスタックに保存する
|
||||||
|
transaction.addToBackStack(null);
|
||||||
|
// フラグメントトランザクションをコミット
|
||||||
|
transaction.commit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,18 +1,47 @@
|
|||||||
package com.example.childguard;
|
package com.example.childguard;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.ActionBar;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.core.app.ActivityCompat;
|
||||||
|
import androidx.core.app.NotificationCompat;
|
||||||
|
import androidx.core.app.NotificationManagerCompat;
|
||||||
|
|
||||||
|
import android.app.NotificationChannel;
|
||||||
|
import android.app.NotificationManager;
|
||||||
|
import android.bluetooth.BluetoothAdapter;
|
||||||
|
import android.bluetooth.BluetoothManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.os.Vibrator;
|
||||||
|
|
||||||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||||
|
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity {
|
public class MainActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
BluetoothManager bluetoothManager;
|
||||||
|
BluetoothAdapter bluetoothAdapter;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_main);
|
setContentView(R.layout.activity_main);
|
||||||
|
|
||||||
|
|
||||||
|
//通知のやつ↓
|
||||||
|
int importance = NotificationManager.IMPORTANCE_DEFAULT;
|
||||||
|
|
||||||
|
NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "サンプルアプリ", importance);
|
||||||
|
channel.setDescription("説明・説明 ここに通知の説明を書くことができる");
|
||||||
|
|
||||||
|
NotificationManager notificationManager = getSystemService(NotificationManager.class);
|
||||||
|
notificationManager.createNotificationChannel(channel);
|
||||||
|
//通知のやつ↑
|
||||||
|
|
||||||
|
|
||||||
BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
|
BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
|
||||||
|
|
||||||
bottomNavigationView.setOnNavigationItemSelectedListener(v -> {
|
bottomNavigationView.setOnNavigationItemSelectedListener(v -> {
|
||||||
@@ -34,4 +63,36 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//↓通知のやつ
|
||||||
|
public void notifyTest() {
|
||||||
|
((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(1000);
|
||||||
|
NotificationCompat.Builder builder = new NotificationCompat
|
||||||
|
.Builder(this, "CHANNEL_ID")
|
||||||
|
.setSmallIcon(android.R.drawable.ic_menu_info_details)
|
||||||
|
.setContentTitle("タイトル")
|
||||||
|
.setContentText("メッセージ・メッセージ")
|
||||||
|
.setPriority(NotificationCompat.PRIORITY_DEFAULT);
|
||||||
|
|
||||||
|
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
|
||||||
|
|
||||||
|
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
|
||||||
|
// TODO: Consider calling
|
||||||
|
// ActivityCompat#requestPermissions
|
||||||
|
// here to request the missing permissions, and then overriding
|
||||||
|
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
|
||||||
|
// int[] grantResults)
|
||||||
|
// to handle the case where the user grants the permission. See the documentation
|
||||||
|
// for ActivityCompat#requestPermissions for more details.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
notificationManager.notify(R.string.app_name, builder.build());
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
//Bluetooth_setupの戻るボタン
|
||||||
|
public void setupBackButton(boolean enableBackButton){
|
||||||
|
ActionBar actionBar = getSupportActionBar();
|
||||||
|
actionBar.setDisplayHomeAsUpEnabled(enableBackButton);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package com.example.childguard;
|
||||||
|
|
||||||
|
import android.graphics.Color;
|
||||||
|
import android.graphics.drawable.Drawable;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
public class QR extends AppCompatActivity {
|
||||||
|
String get_on="乗車状態";
|
||||||
|
String get_off ="降車状態";
|
||||||
|
TextView tv=findViewById(R.id.situation);
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState){
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.fragment_qr);
|
||||||
|
//多分いらないコード
|
||||||
|
// findViewById(R.id.camera).setOnClickListener(
|
||||||
|
// v -> {
|
||||||
|
// if(get_on.equals(tv.getText().toString())){
|
||||||
|
// tv.setText(get_off);
|
||||||
|
// findViewById(R.id.situation_bg).setBackgroundColor(Color.parseColor("#dcdcdc"));
|
||||||
|
// }
|
||||||
|
// else {
|
||||||
|
// tv.setText(get_on);
|
||||||
|
// findViewById(R.id.situation_bg).setBackgroundColor(Color.parseColor("#ff4500"));
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// );
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,12 +1,30 @@
|
|||||||
package com.example.childguard;
|
package com.example.childguard;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.activity.result.ActivityResultLauncher;
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts;
|
||||||
|
import androidx.browser.customtabs.CustomTabsIntent;
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.google.zxing.integration.android.IntentIntegrator;
|
||||||
|
import com.google.zxing.integration.android.IntentResult;
|
||||||
|
import com.journeyapps.barcodescanner.ScanContract;
|
||||||
|
import com.journeyapps.barcodescanner.ScanOptions;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A simple {@link Fragment} subclass.
|
* A simple {@link Fragment} subclass.
|
||||||
@@ -14,7 +32,8 @@ import android.view.ViewGroup;
|
|||||||
* create an instance of this fragment.
|
* create an instance of this fragment.
|
||||||
*/
|
*/
|
||||||
public class QRFragment extends Fragment {
|
public class QRFragment extends Fragment {
|
||||||
|
//QRコードから受け取ったURLの受け渡しの宣言
|
||||||
|
// OnDataPass dataPass;
|
||||||
// TODO: Rename parameter arguments, choose names that match
|
// TODO: Rename parameter arguments, choose names that match
|
||||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||||
private static final String ARG_PARAM1 = "param1";
|
private static final String ARG_PARAM1 = "param1";
|
||||||
@@ -53,12 +72,53 @@ public class QRFragment extends Fragment {
|
|||||||
mParam1 = getArguments().getString(ARG_PARAM1);
|
mParam1 = getArguments().getString(ARG_PARAM1);
|
||||||
mParam2 = getArguments().getString(ARG_PARAM2);
|
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private final ActivityResultLauncher<ScanOptions> fragmentLauncher = registerForActivityResult(new ScanContract(),
|
||||||
|
result -> {
|
||||||
|
//result.getContents()でURLを入手
|
||||||
|
//読み取ったQRコードがChiled Guard用サイトのドメインを含むかの判定
|
||||||
|
if(!((result.getContents()).contains("https://practicefirestore1-8808c.web.app/"))) {
|
||||||
|
Toast.makeText(getContext(), "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
|
||||||
|
} else {
|
||||||
|
//URLの表示
|
||||||
|
Toast.makeText(getContext(), result.getContents(), Toast.LENGTH_SHORT).show();
|
||||||
|
//ブラウザを起動し、URL先のサイトを開く
|
||||||
|
CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
|
||||||
|
CustomTabsIntent customTabsIntent = builder.build();
|
||||||
|
customTabsIntent.launchUrl(requireContext(), Uri.parse(result.getContents()));
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
// Inflate the layout for this fragment
|
// Inflate the layout for this fragment
|
||||||
return inflater.inflate(R.layout.fragment_qr, container, false);
|
View view = inflater.inflate(R.layout.fragment_qr, container, false);
|
||||||
|
|
||||||
|
|
||||||
|
Log.d("QRFragment", "onClick: called");
|
||||||
|
//QRリーダ起動
|
||||||
|
fragmentLauncher.launch(new ScanOptions());
|
||||||
|
HomeFragment homeFragment=new HomeFragment();
|
||||||
|
replaceFragment(homeFragment);
|
||||||
|
return view;
|
||||||
}
|
}
|
||||||
}
|
//画面遷移メソッド
|
||||||
|
private void replaceFragment(Fragment fragment) {
|
||||||
|
// フラグメントマネージャーの取得
|
||||||
|
FragmentManager manager = getParentFragmentManager(); // アクティビティではgetSupportFragmentManager()?
|
||||||
|
// フラグメントトランザクションの開始
|
||||||
|
FragmentTransaction transaction = manager.beginTransaction();
|
||||||
|
// レイアウトをfragmentに置き換え(追加)
|
||||||
|
transaction.replace(R.id.fragmentContainerView, fragment);
|
||||||
|
// 置き換えのトランザクションをバックスタックに保存する
|
||||||
|
transaction.addToBackStack(null);
|
||||||
|
// フラグメントトランザクションをコミット
|
||||||
|
transaction.commit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
package com.example.childguard;
|
||||||
|
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
import android.graphics.BitmapFactory;
|
||||||
|
import android.graphics.Canvas;
|
||||||
|
import android.graphics.Paint;
|
||||||
|
import android.graphics.drawable.BitmapDrawable;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
|
import androidx.print.PrintHelper;
|
||||||
|
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
|
import android.util.AndroidRuntimeException;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
|
||||||
|
import com.google.zxing.BarcodeFormat;
|
||||||
|
import com.google.zxing.WriterException;
|
||||||
|
import com.journeyapps.barcodescanner.BarcodeEncoder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link QrPrintFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class QrPrintFragment extends Fragment {
|
||||||
|
|
||||||
|
// TODO: Rename parameter arguments, choose names that match
|
||||||
|
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||||
|
private static final String ARG_PARAM1 = "param1";
|
||||||
|
private static final String ARG_PARAM2 = "param2";
|
||||||
|
|
||||||
|
// TODO: Rename and change types of parameters
|
||||||
|
private String mParam1;
|
||||||
|
private String mParam2;
|
||||||
|
|
||||||
|
public QrPrintFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 QrPrintFragment.
|
||||||
|
*/
|
||||||
|
// TODO: Rename and change types and number of parameters
|
||||||
|
public static QrPrintFragment newInstance(String param1, String param2) {
|
||||||
|
QrPrintFragment fragment = new QrPrintFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString(ARG_PARAM1, param1);
|
||||||
|
args.putString(ARG_PARAM2, param2);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate (Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
if (getArguments() != null) {
|
||||||
|
mParam1 = getArguments().getString(ARG_PARAM1);
|
||||||
|
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
//共有プリファレンス 全体の準備
|
||||||
|
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
||||||
|
//User毎のドメインを保存する
|
||||||
|
String IdPref=preferences.getString("ID",null);
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view=inflater.inflate(R.layout.fragment_qr_print, container, false);;
|
||||||
|
//固定のドメイン
|
||||||
|
String KoteiURL = "https://practicefirestore1-8808c.web.app/?id=";
|
||||||
|
//すべてのドメイン
|
||||||
|
String AllURL;
|
||||||
|
//IdPrefにの値が初期値の場合
|
||||||
|
if(IdPref==null) {
|
||||||
|
//User毎のドメイン
|
||||||
|
String userURL = getArguments().getString("STR_KEY");
|
||||||
|
//キー"ID"の値をuserURLの値にする
|
||||||
|
SharedPreferences.Editor e = preferences.edit();
|
||||||
|
e.putString("ID", userURL);
|
||||||
|
//確定処理
|
||||||
|
e.apply();
|
||||||
|
//二つのドメインを合成する
|
||||||
|
AllURL=KoteiURL+userURL;
|
||||||
|
}else{
|
||||||
|
//二つのドメインを合成する
|
||||||
|
AllURL=KoteiURL+IdPref;
|
||||||
|
}
|
||||||
|
|
||||||
|
int size = 2500;
|
||||||
|
ImageView imageViewQrCode;
|
||||||
|
Bitmap QRGazou;
|
||||||
|
try {
|
||||||
|
//QRコード生成
|
||||||
|
BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
|
||||||
|
Bitmap bitmapqr = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, size, size);
|
||||||
|
imageViewQrCode = (ImageView) view.findViewById(R.id.qr_view);
|
||||||
|
imageViewQrCode.setTranslationX(1000);
|
||||||
|
imageViewQrCode.setTranslationY(1000);
|
||||||
|
imageViewQrCode.setImageBitmap(bitmapqr);
|
||||||
|
} catch (WriterException e) {
|
||||||
|
throw new AndroidRuntimeException("Barcode Error.", e);
|
||||||
|
}
|
||||||
|
// 画像合成の準備
|
||||||
|
// ここのエラーは直すと何故か動かなくなる。このままで動くので放置
|
||||||
|
Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.a_group_qr_sos);
|
||||||
|
Bitmap bitmap1 = ((BitmapDrawable) imageViewQrCode.getDrawable()).getBitmap();
|
||||||
|
int width = bitmap.getWidth(); // 元ファイルの幅取得
|
||||||
|
int height = bitmap.getHeight(); // 元ファイルの高さ取得
|
||||||
|
QRGazou = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
|
||||||
|
//Canvasの準備
|
||||||
|
Canvas canvas = new Canvas(QRGazou);
|
||||||
|
//画像のサイズの調整
|
||||||
|
int disWidth = (width - bitmap1.getWidth()) / 2;
|
||||||
|
int disHeight = (int) ((height - bitmap1.getHeight()) / 1.3);
|
||||||
|
canvas.drawBitmap(bitmap, 0, 0, (Paint) null); // image, x座標, y座標, Paintインスタンス
|
||||||
|
canvas.drawBitmap(bitmap1, disWidth, disHeight, (Paint) null); // 画像合成
|
||||||
|
//Androidからプリンターへ印刷指示を出すサポートライブラリ
|
||||||
|
PrintHelper printHelper = new PrintHelper(getActivity());
|
||||||
|
printHelper.setColorMode(PrintHelper.COLOR_MODE_COLOR);
|
||||||
|
printHelper.setScaleMode(PrintHelper.SCALE_MODE_FIT);
|
||||||
|
printHelper.printBitmap("job_name", QRGazou);
|
||||||
|
HomeFragment homeFragment=new HomeFragment();
|
||||||
|
replaceFragment(homeFragment);
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
//画面遷移メソッド
|
||||||
|
private void replaceFragment(Fragment fragment) {
|
||||||
|
// フラグメントマネージャーの取得
|
||||||
|
FragmentManager manager = getParentFragmentManager(); // アクティビティではgetSupportFragmentManager()?
|
||||||
|
// フラグメントトランザクションの開始
|
||||||
|
FragmentTransaction transaction = manager.beginTransaction();
|
||||||
|
// レイアウトをfragmentに置き換え(追加)
|
||||||
|
transaction.replace(R.id.fragmentContainerView, fragment);
|
||||||
|
// 置き換えのトランザクションをバックスタックに保存する
|
||||||
|
transaction.addToBackStack(null);
|
||||||
|
// フラグメントトランザクションをコミット
|
||||||
|
transaction.commit();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package com.example.childguard;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemViewHolder> {
|
||||||
|
|
||||||
|
ArrayList<String[]> deviceList;
|
||||||
|
|
||||||
|
// Constructor
|
||||||
|
public RecyclerAdapter(ArrayList<String[]> deviceList) {
|
||||||
|
// Init
|
||||||
|
Log.d("RecyclerAdapter", "Constructor called");
|
||||||
|
this.deviceList = deviceList;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public RecyclerAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
LayoutInflater inflater = LayoutInflater.from(parent.getContext());
|
||||||
|
View itemView = inflater.inflate(R.layout.recycler_row, parent, false);
|
||||||
|
return new ItemViewHolder(itemView);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) {
|
||||||
|
holder.textView.setText(deviceList.get(position)[0]);
|
||||||
|
holder.textView.setOnClickListener( v -> {
|
||||||
|
Toast.makeText(v.getContext(), deviceList.get(position)[1], Toast.LENGTH_SHORT).show();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return deviceList.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
static class ItemViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
TextView textView;
|
||||||
|
|
||||||
|
public ItemViewHolder(@NonNull View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
textView = itemView.findViewById(R.id.textView1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,147 @@
|
|||||||
|
package com.example.childguard;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.bluetooth.BluetoothAdapter;
|
||||||
|
import android.bluetooth.BluetoothDevice;
|
||||||
|
import android.bluetooth.BluetoothManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.core.app.ActivityCompat;
|
||||||
|
import androidx.core.app.NotificationCompat;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.DividerItemDecoration;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link bluetooth_setupFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class bluetooth_setupFragment extends Fragment {
|
||||||
|
|
||||||
|
// TODO: Rename parameter arguments, choose names that match
|
||||||
|
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||||
|
private static final String ARG_PARAM1 = "param1";
|
||||||
|
private static final String ARG_PARAM2 = "param2";
|
||||||
|
|
||||||
|
// TODO: Rename and change types of parameters
|
||||||
|
private String mParam1;
|
||||||
|
private String mParam2;
|
||||||
|
|
||||||
|
public bluetooth_setupFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 bluetooth_setupFragment.
|
||||||
|
*/
|
||||||
|
// TODO: Rename and change types and number of parameters
|
||||||
|
public static bluetooth_setupFragment newInstance(String param1, String param2) {
|
||||||
|
bluetooth_setupFragment fragment = new bluetooth_setupFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString(ARG_PARAM1, param1);
|
||||||
|
args.putString(ARG_PARAM2, param2);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
if (getArguments() != null) {
|
||||||
|
mParam1 = getArguments().getString(ARG_PARAM1);
|
||||||
|
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
View view = inflater.inflate(R.layout.fragment_bluetooth_setup, container, false);
|
||||||
|
|
||||||
|
// init
|
||||||
|
BluetoothManager bluetoothManager = requireActivity().getSystemService(BluetoothManager.class);
|
||||||
|
BluetoothAdapter bluetoothAdapter = bluetoothManager.getAdapter();
|
||||||
|
|
||||||
|
if (bluetoothAdapter == null) {
|
||||||
|
// Device doesn't support Bluetooth
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (ActivityCompat.checkSelfPermission(requireActivity().getApplicationContext(), android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
|
||||||
|
// TODO: Consider calling
|
||||||
|
// ActivityCompat#requestPermissions
|
||||||
|
// here to request the missing permissions, and then overriding
|
||||||
|
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
|
||||||
|
// int[] grantResults)
|
||||||
|
// to handle the case where the user grants the permission. See the documentation
|
||||||
|
// for ActivityCompat#requestPermissions for more details.
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
Set<BluetoothDevice> pairedDevices = bluetoothAdapter.getBondedDevices();
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.recyclerView1);
|
||||||
|
//RecyclerViewのサイズを固定
|
||||||
|
recyclerView.setHasFixedSize(true);
|
||||||
|
|
||||||
|
//RecyclerViewに区切り線を入れる
|
||||||
|
// RecyclerView.ItemDecoration itemDecoration =
|
||||||
|
// new DividerItemDecoration(getContext() ,DividerItemDecoration.VERTICAL);
|
||||||
|
// recyclerView.addItemDecoration(itemDecoration);
|
||||||
|
|
||||||
|
//レイアウトマネージャを設
|
||||||
|
RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext());
|
||||||
|
recyclerView.setLayoutManager(layoutManager);
|
||||||
|
|
||||||
|
//①リスト構造(String型の可変長の配列)を宣言
|
||||||
|
ArrayList<String[]> arrayList = new ArrayList<>();
|
||||||
|
|
||||||
|
if (pairedDevices.size() > 0) {
|
||||||
|
|
||||||
|
// There are paired devices. Get the name and address of each paired device.
|
||||||
|
for (BluetoothDevice device : pairedDevices) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
String[] deviceInfo = new String[2];
|
||||||
|
deviceInfo[0] = device.getName();
|
||||||
|
deviceInfo[1] = device.getAddress(); // MAC address
|
||||||
|
|
||||||
|
Log.d("a", deviceInfo[0]);
|
||||||
|
arrayList.add(deviceInfo);
|
||||||
|
}
|
||||||
|
for (String[] s : arrayList) {
|
||||||
|
Log.d("b", s[0]);
|
||||||
|
}
|
||||||
|
Log.d(" ", String.valueOf(arrayList.size()));
|
||||||
|
RecyclerAdapter adapter = new RecyclerAdapter(arrayList);
|
||||||
|
|
||||||
|
//④RecyclerViewとAdapterの結び付け
|
||||||
|
recyclerView.setAdapter(adapter);
|
||||||
|
}
|
||||||
|
|
||||||
|
return view;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 59 KiB |
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:shape="rectangle">
|
||||||
|
<solid android:color="#ffa500"/>
|
||||||
|
<corners android:radius="25dp"/>
|
||||||
|
|
||||||
|
</shape>
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/activityMain"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
@@ -15,7 +16,7 @@
|
|||||||
android:name="com.example.childguard.HomeFragment"
|
android:name="com.example.childguard.HomeFragment"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toTopOf="@id/nav_view"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/frameLayout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
tools:context=".First_Start"
|
||||||
|
>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="一覧から車のBluetoothを選択してください"
|
||||||
|
|
||||||
|
/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout 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/Bluetooth_setup"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
tools:context=".bluetooth_setupFragment">
|
||||||
|
|
||||||
|
|
||||||
|
<!-- TODO: Update blank fragment layout -->
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/recyclerView1"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:scrollbars="vertical"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/click_device"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
|
||||||
|
/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/frameLayout"
|
android:id="@+id/frameLayout"
|
||||||
@@ -8,88 +8,127 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
tools:context=".HomeFragment">
|
tools:context=".HomeFragment">
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="@drawable/frame_style"
|
|
||||||
android:layout_marginTop="30dp"
|
|
||||||
android:layout_marginLeft="20dp"
|
|
||||||
android:layout_marginRight="20dp"
|
|
||||||
>
|
|
||||||
|
|
||||||
<TextView
|
<ScrollView
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="20dp"
|
android:orientation="vertical" >
|
||||||
android:text="現在の状態"
|
<FrameLayout
|
||||||
android:textSize="25dp"
|
android:id="@+id/situation_bg"
|
||||||
android:textColor="@color/black"
|
android:layout_width="match_parent"
|
||||||
android:textAlignment="center"/>
|
android:layout_height="wrap_content"
|
||||||
<TextView
|
android:layout_marginLeft="20dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_marginTop="30dp"
|
||||||
android:layout_height="200dp"
|
android:layout_marginRight="20dp"
|
||||||
android:layout_marginTop="10dp"
|
android:background="@drawable/frame_style">
|
||||||
android:text="\n降車状態"
|
|
||||||
android:textSize="55dp"
|
|
||||||
android:textColor="@color/black"
|
|
||||||
android:textAlignment="center"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</FrameLayout>
|
<TextView
|
||||||
<FrameLayout
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_marginTop="20dp"
|
||||||
android:background="@drawable/frame_style"
|
android:text="現在の状態"
|
||||||
android:layout_marginTop="30dp"
|
android:textAlignment="center"
|
||||||
android:layout_marginLeft="20dp"
|
android:textColor="@color/black"
|
||||||
android:layout_marginRight="20dp"
|
android:textSize="25dp" />
|
||||||
>
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:id="@+id/situation"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_height="200dp"
|
||||||
android:text="切断中"
|
android:layout_marginTop="10dp"
|
||||||
android:textSize="25dp"
|
android:text="\n降車状態"
|
||||||
android:textColor="@color/black"
|
android:textAlignment="center"
|
||||||
android:textAlignment="center"/>
|
android:textColor="@color/black"
|
||||||
<ImageView
|
android:textSize="55dp" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="100dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:src="@drawable/bluetooth_drive_fill0_wght400_grad0_opsz24"
|
|
||||||
android:textAlignment="center"
|
|
||||||
/>
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="100dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:src="@drawable/close_fill0_wght400_grad0_opsz24"
|
|
||||||
android:textAlignment="center"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="20dp"
|
android:layout_marginLeft="20dp"
|
||||||
android:layout_marginRight="20dp"
|
android:layout_marginTop="30dp"
|
||||||
android:background="@drawable/frame_style_button">
|
android:layout_marginRight="20dp"
|
||||||
|
android:background="@drawable/frame_style">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:text="切断中"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:textColor="@color/black"
|
||||||
|
android:textSize="30dp" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="100dp"
|
||||||
|
android:layout_marginTop="50dp"
|
||||||
|
android:src="@drawable/bluetooth_drive_fill0_wght400_grad0_opsz24"
|
||||||
|
android:textAlignment="center" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="100dp"
|
||||||
|
android:layout_marginTop="50dp"
|
||||||
|
android:src="@drawable/close_fill0_wght400_grad0_opsz24"
|
||||||
|
android:textAlignment="center" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/QRprinting"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="70dp"
|
||||||
|
android:backgroundTint="#778899"
|
||||||
|
android:text="QRコード印刷"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="40dp" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/Bluetooth_setup"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:backgroundTint="#778899"
|
||||||
|
android:text="Bluetooth設定"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="40dp" />
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="20dp"
|
||||||
|
android:layout_marginRight="20dp"
|
||||||
|
android:background="@drawable/frame_style_button">
|
||||||
|
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
|
||||||
|
android:layout_marginLeft="20dp"
|
||||||
|
android:layout_marginRight="20dp"
|
||||||
|
android:background="@drawable/frame_style_button">
|
||||||
|
|
||||||
|
|
||||||
|
<!--<ImageView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:src="@drawable/ss"/>-->
|
||||||
|
<!--android:layout_gravity="center"-->
|
||||||
|
</FrameLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<Button
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:layout_marginLeft="20dp"
|
|
||||||
android:layout_marginRight="20dp"
|
|
||||||
android:backgroundTint="#778899"
|
|
||||||
android:text="QRコード印刷"
|
|
||||||
android:textColor="@color/white"
|
|
||||||
android:textSize="40dp" />
|
|
||||||
<!--<ImageView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:src="@drawable/ss"/>-->
|
|
||||||
</FrameLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
@@ -5,10 +5,6 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".QRFragment">
|
tools:context=".QRFragment">
|
||||||
|
|
||||||
<!-- TODO: Update blank fragment layout -->
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:text="@string/hello_blank_fragment" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout 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:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
tools:context=".QrPrintFragment"
|
||||||
|
android:weightSum="1">
|
||||||
|
|
||||||
|
|
||||||
|
<!-- TODO: Update blank fragment layout -->
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/image"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="581dp"
|
||||||
|
android:layout_weight="1"/>
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageView"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:srcCompat="@drawable/a_group_qr_sos"
|
||||||
|
android:layout_weight="0"/>
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/qr_view"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:srcCompat="@drawable/ic_launcher_foreground"
|
||||||
|
android:layout_weight="0"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView1"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="30sp"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -2,4 +2,5 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<color name="black">#FF000000</color>
|
<color name="black">#FF000000</color>
|
||||||
<color name="white">#FFFFFFFF</color>
|
<color name="white">#FFFFFFFF</color>
|
||||||
|
<color name="orange">#FF4500</color>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -2,4 +2,5 @@
|
|||||||
<string name="app_name">Child Guard</string>
|
<string name="app_name">Child Guard</string>
|
||||||
<!-- TODO: Remove or change this placeholder text -->
|
<!-- TODO: Remove or change this placeholder text -->
|
||||||
<string name="hello_blank_fragment">Hello blank fragment</string>
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
|
<string name="title_activity_first_start">First_Start</string>
|
||||||
</resources>
|
</resources>
|
||||||
+6
-1
@@ -1,5 +1,10 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
buildscript {
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.google.gms:google-services:4.3.14'
|
||||||
|
}
|
||||||
|
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application' version '8.0.2' apply false
|
id 'com.android.application' version '8.0.2' apply false
|
||||||
id 'com.android.library' version '8.0.2' apply false
|
id 'com.android.library' version '8.0.2' apply false
|
||||||
|
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user