diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f0934c7..9aa4f79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,6 +23,23 @@ + + + + + + + + + + diff --git a/app/src/main/java/com/example/citrusclient/models/Todo.java b/app/src/main/java/com/example/citrusclient/models/Todo.java index eb1d9a9..69b4eff 100644 --- a/app/src/main/java/com/example/citrusclient/models/Todo.java +++ b/app/src/main/java/com/example/citrusclient/models/Todo.java @@ -2,8 +2,6 @@ public class Todo { - String accountId; - Integer bookId; String title; boolean check; int year; @@ -11,9 +9,17 @@ int day; Integer todoId; + //コンストラクタ + public Todo(String t, boolean c, int y, int m, int d, Integer tid) { + title = t; + check = c; + year = y; + month = m; + day = d; + todoId = tid; + } + //セッター - public void setAccountId(String aid) {accountId = aid;} - public void setBookId(Integer bid) {bookId = bid;} public void setTitle(String t) {title = t;} public void setCheck(boolean c) {check = c;} public void setYear(int y) {year = y;} @@ -22,8 +28,6 @@ public void setTodoId(Integer t) {todoId = t;} //ゲッター - public String getAccountId() {return accountId;} - public Integer getBookId(){return bookId;} public String getTitle() {return title;} public boolean getCheck() {return check;} @@ -37,4 +41,6 @@ public Integer getTodoId() { return todoId; } + + } diff --git a/app/src/main/java/com/example/citrusclient/rest/TodosRest.java b/app/src/main/java/com/example/citrusclient/rest/TodosRest.java index 88c6ad8..52f8fab 100644 --- a/app/src/main/java/com/example/citrusclient/rest/TodosRest.java +++ b/app/src/main/java/com/example/citrusclient/rest/TodosRest.java @@ -20,14 +20,14 @@ public interface TodosRest { @GET("/accounts/{account_id}/books/{book_id}/todos") - Call> getAllTodos( + Call>>>> getAllTodos( @Path("account_id") String accountId, @Path("book_id") Integer bookId, @Query("token") String token ); @GET("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}") - Call> getTodosByMonth( + Call>> getTodosByMonth( @Path("account_id") String accountId, @Path("book_id") Integer bookId, @Path("year") Integer year, @@ -36,7 +36,7 @@ ); @GET("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}") - Call> getTodosByDay( + Call> getTodosByDay( @Path("account_id") String accountId, @Path("book_id") Integer bookId, @Path("year") Integer year, diff --git a/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java b/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java new file mode 100644 index 0000000..9d11a24 --- /dev/null +++ b/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java @@ -0,0 +1,85 @@ +package com.example.citrusclient.views; + +import android.content.Intent; +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; + +import com.example.citrusclient.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link CreateBookFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class CreateBookFragment 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 CreateBookFragment() { + // 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 CreateBookFragment. + */ + // TODO: Rename and change types and number of parameters + public static CreateBookFragment newInstance(String param1, String param2) { + CreateBookFragment fragment = new CreateBookFragment(); + 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) { + // Inflate the layout for this fragment + + return inflater.inflate(R.layout.fragment_create_book, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + //View.findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener()) + Button saveButton = (Button)view.findViewById(R.id.save_button); +// saveButton.setOnClickListener(new View.OnClickListener(){ +// public void onClick(View v){ +// Intent intent = Intent(CreateBookFragment.this,MainActivity.class); +// startActivity(intent); +// } +// }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/citrusclient/views/LoginActivity.java b/app/src/main/java/com/example/citrusclient/views/LoginActivity.java new file mode 100644 index 0000000..0ce103a --- /dev/null +++ b/app/src/main/java/com/example/citrusclient/views/LoginActivity.java @@ -0,0 +1,36 @@ +package com.example.citrusclient.views; + +import android.content.Intent; +import android.os.Bundle; // +import android.view.View; +import android.widget.Button; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; // +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; +import com.example.citrusclient.R; + +public class LoginActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_login); + 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; + }); + + Button nextButton = (Button)findViewById(R.id.button); + nextButton.setOnClickListener(new View.OnClickListener(){ + public void onClick(View v){ + Intent intent = new Intent(LoginActivity.this,MainActivity.class); + startActivity(intent); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/citrusclient/views/MainActivity.java b/app/src/main/java/com/example/citrusclient/views/MainActivity.java index a7b9e81..a8247cb 100644 --- a/app/src/main/java/com/example/citrusclient/views/MainActivity.java +++ b/app/src/main/java/com/example/citrusclient/views/MainActivity.java @@ -48,7 +48,7 @@ if(itemId == R.id.book){// 本棚 showFragment(new MyBookshelfFragment()); } else if(itemId == R.id.search){//検索 - + showFragment(new CreateBookFragment()); } else if(itemId == R.id.home){//ホーム }else if(itemId == R.id.calendar){ //カレンダ diff --git a/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java b/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java new file mode 100644 index 0000000..9ec5406 --- /dev/null +++ b/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java @@ -0,0 +1,47 @@ +package com.example.citrusclient.views; + +import android.os.Bundle; +import android.view.View; +import android.widget.EditText; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +import com.example.citrusclient.R; + +public class SignUpActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_sign_up); + + 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; + + + }); + + findViewById(R.id.button_signup).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + //IDとPWの登録 + EditText editid = (EditText) findViewById(R.id.text_id); + String id = editid.getText().toString().trim(); + EditText editpw = (EditText) findViewById(R.id.put_pw); + String pw = editpw.getText().toString().trim(); + + if(!id.isEmpty() && !pw.isEmpty() && !id.trim().isEmpty() && !pw.trim().isEmpty() ){ + //通信 + } + } + }); + } + +} \ No newline at end of file diff --git a/app/src/main/res/layout/a_book.xml b/app/src/main/res/layout/a_book.xml index b0f7823..5bd8707 100644 --- a/app/src/main/res/layout/a_book.xml +++ b/app/src/main/res/layout/a_book.xml @@ -14,5 +14,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" + app:cornerRadius="25dp" app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml new file mode 100644 index 0000000..7f1f784 --- /dev/null +++ b/app/src/main/res/layout/activity_login.xml @@ -0,0 +1,64 @@ + + + + + + + + + + +