diff --git a/.idea/misc.xml b/.idea/misc.xml index 81be3c3..ed4facc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,22 +10,20 @@ - - - - + - + + diff --git a/app/src/main/java/com/example/nemophila/RequestingActivity.java b/app/src/main/java/com/example/nemophila/RequestingActivity.java index 6214a8e..bb2bdda 100644 --- a/app/src/main/java/com/example/nemophila/RequestingActivity.java +++ b/app/src/main/java/com/example/nemophila/RequestingActivity.java @@ -2,7 +2,10 @@ import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.Button; public class RequestingActivity extends AppCompatActivity { @@ -10,5 +13,13 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_requesting); + + //右上のボタンで投稿画面(PostActivity)へ遷移 + Button toPostButton = (Button)findViewById(R.id.requestingSearchButton); + toPostButton.setOnClickListener(new View.OnClickListener(){ + public void onClick(View v){ + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java index 3b9d9bb..b99788f 100644 --- a/app/src/main/java/com/example/nemophila/ShopActivity.java +++ b/app/src/main/java/com/example/nemophila/ShopActivity.java @@ -253,7 +253,8 @@ } public String getDate() { - return date;} + return date; + } public void setDate(String date) { this.date = date; } diff --git a/app/src/main/res/layout/activity_requesting.xml b/app/src/main/res/layout/activity_requesting.xml index b0eb893..7306533 100644 --- a/app/src/main/res/layout/activity_requesting.xml +++ b/app/src/main/res/layout/activity_requesting.xml @@ -6,4 +6,97 @@ android:layout_height="match_parent" tools:context=".RequestingActivity"> + +