ChildGuard/child_guard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kyou/layout #4

Merged
r-ca merged 5 commits from kyou/layout into main 2024-01-11 07:19:44 +00:00
Conversation 0 Commits 5 Files Changed 17 +110 -91
3 changed files with 110 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9dda0adbed - Show all commits

4
app/src/main/java/com/example/childguard/MainActivity.java
View File

@ -17,6 +17,9 @@ import android.os.Vibrator;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import java.util.Random;
import java.util.UUID;
public class MainActivity extends AppCompatActivity {
BluetoothManager bluetoothManager;
@ -27,6 +30,7 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
//通知のやつ↓
int importance = NotificationManager.IMPORTANCE_DEFAULT;

2
app/src/main/res/layout/activity_main.xml
View File

@ -16,7 +16,7 @@
android:name="com.example.childguard.HomeFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/nav_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

19
app/src/main/res/layout/fragment_home.xml
View File

@ -1,5 +1,5 @@
<?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:tools="http://schemas.android.com/tools"
android:id="@+id/frameLayout"
@ -8,6 +8,19 @@
android:orientation="vertical"
tools:context=".HomeFragment">
<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_height="wrap_content"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/situation_bg"
android:layout_width="match_parent"
@ -115,5 +128,7 @@
android:src="@drawable/ss"/>-->
<!--android:layout_gravity="center"-->
</FrameLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>