diff --git a/app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java
index edd547a..3fc6e18 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java
@@ -37,7 +37,8 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_voice);
+ setContentView(R.layout.fragment_maps);
+ //setContentView(R.layout.activity_voice);
file = new File(getFilesDir(),"Sample.3gp");
mp = new MediaPlayer();
@@ -46,6 +47,7 @@
Button Record = (Button)findViewById(R.id.button);
Record.setOnClickListener(new View.OnClickListener(){
public void onClick(View x){
+ System.out.println("!!!");
TextView textView1 = (TextView)findViewById(R.id.Notice);
textView1.setText("Record Start!");
startRecord();
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
index f707b41..b5669c9 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
@@ -4,11 +4,15 @@
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
+import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+
+import android.widget.Button;
+
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.OnMapReadyCallback;
@@ -17,9 +21,12 @@
import com.google.android.gms.maps.model.MarkerOptions;
import org.ntlab.amaryllis.client.R;
+import org.ntlab.amaryllis.client.VoiceActivity;
public class MapsFragment extends Fragment {
+ Button rokuButton;
+
private OnMapReadyCallback callback = new OnMapReadyCallback() {
/**
@@ -45,15 +52,51 @@
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_maps, container, false);
+
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
+
+ rokuButton = (Button)view.findViewById(R.id.button);
+ rokuButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ Intent intent = new Intent(getActivity(), VoiceActivity.class);
+ startActivity(intent);
+ }
+ });
SupportMapFragment mapFragment =
(SupportMapFragment) getChildFragmentManager().findFragmentById(R.id.map);
if (mapFragment != null) {
mapFragment.getMapAsync(callback);
}
}
+
+
+ public class FragmentTest extends Fragment implements View.OnClickListener {
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+ // 第3引数のbooleanは"container"にreturnするViewを追加するかどうか
+ //trueにすると最終的なlayoutに再度、同じView groupが表示されてしまうのでfalseでOKらしい
+ View v = inflater.inflate(R.layout.fragment_maps, container, false);
+
+ // ボタンを取得して、ClickListenerをセット
+ Button btn = (Button)v.findViewById(R.id.button);
+ btn.setOnClickListener(this);
+ return v;
+ }
+
+ @Override
+ public void onClick(View v) {
+ // TODO 自動生成されたメソッド・スタブ
+ System.out.println("!!!");
+ }
+
+ }
+
+
+
+
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e1be0c7..7d686f3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,6 +37,18 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.431"
app:navGraph="@navigation/mobile_navigation" />
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_maps.xml b/app/src/main/res/layout/fragment_maps.xml
index 55e9487..faf35e0 100644
--- a/app/src/main/res/layout/fragment_maps.xml
+++ b/app/src/main/res/layout/fragment_maps.xml
@@ -1,26 +1,35 @@
+
+
+ android:layout_height="match_parent"
+ tools:context=".fragment.MapsFragment" />
-
+ android:text="録音"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/Notice" />
+ android:layout_height="60dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent">
+
+
\ No newline at end of file