items) {
mValues = items;
}
@@ -46,7 +45,7 @@
public class ViewHolder extends RecyclerView.ViewHolder {
public final TextView mIdView;
public final TextView mContentView;
- public PlaceholderItem mItem;
+ public FriendRequestItem mItem;
public ViewHolder(FragmentFriendReceivedBinding binding) {
super(binding.getRoot());
diff --git a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
index 16cf924..4ba2800 100644
--- a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
@@ -1,6 +1,9 @@
package com.example.tampopo_client.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;
@@ -22,5 +25,21 @@
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
+ Button button_register = (Button) findViewById(R.id.Registerbutton);
+ button_register.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(RegisterActivity.this,LoginActivity.class);
+ startActivity(intent);
+ }
+ });
+ button_register = (Button) findViewById(R.id.Loginbutton2);
+ button_register.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(RegisterActivity.this,LoginActivity.class);
+ startActivity(intent);
+ }
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java
new file mode 100644
index 0000000..fb43f8f
--- /dev/null
+++ b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java
@@ -0,0 +1,72 @@
+package com.example.tampopo_client.views.placeholder;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Helper class for providing sample content for user interfaces created by
+ * Android template wizards.
+ *
+ * TODO: Replace all uses of this class before publishing your app.
+ */
+public class FriendRequestContent {
+
+ /**
+ * An array of sample (placeholder) items.
+ */
+ public static final List ITEMS = new ArrayList();
+
+ /**
+ * A map of sample (placeholder) items, by ID.
+ */
+ public static final Map ITEM_MAP = new HashMap();
+
+ private static final int COUNT = 25;
+
+ static {
+ // Add some sample items.
+ for (int i = 1; i <= COUNT; i++) {
+ addItem(createPlaceholderItem(i));
+ }
+ }
+
+ private static void addItem(FriendRequestItem item) {
+ ITEMS.add(item);
+ ITEM_MAP.put(item.id, item);
+ }
+
+ private static FriendRequestItem createPlaceholderItem(int position) {
+ return new FriendRequestItem(String.valueOf(position), "Item " + position, makeDetails(position));
+ }
+
+ private static String makeDetails(int position) {
+ StringBuilder builder = new StringBuilder();
+ builder.append("Details about Item: ").append(position);
+ for (int i = 0; i < position; i++) {
+ builder.append("\nMore details information here.");
+ }
+ return builder.toString();
+ }
+
+ /**
+ * A placeholder item representing a piece of content.
+ */
+ public static class FriendRequestItem {
+ public final String id;
+ public final String content;
+ public final String details;
+
+ public FriendRequestItem(String id, String content, String details) {
+ this.id = id;
+ this.content = content;
+ this.details = details;
+ }
+
+ @Override
+ public String toString() {
+ return content;
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java b/app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java
deleted file mode 100644
index 00871a5..0000000
--- a/app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.example.tampopo_client.views.placeholder;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Helper class for providing sample content for user interfaces created by
- * Android template wizards.
- *
- * TODO: Replace all uses of this class before publishing your app.
- */
-public class PlaceholderContent {
-
- /**
- * An array of sample (placeholder) items.
- */
- public static final List ITEMS = new ArrayList();
-
- /**
- * A map of sample (placeholder) items, by ID.
- */
- public static final Map ITEM_MAP = new HashMap();
-
- private static final int COUNT = 25;
-
- static {
- // Add some sample items.
- for (int i = 1; i <= COUNT; i++) {
- addItem(createPlaceholderItem(i));
- }
- }
-
- private static void addItem(PlaceholderItem item) {
- ITEMS.add(item);
- ITEM_MAP.put(item.id, item);
- }
-
- private static PlaceholderItem createPlaceholderItem(int position) {
- return new PlaceholderItem(String.valueOf(position), "Item " + position, makeDetails(position));
- }
-
- private static String makeDetails(int position) {
- StringBuilder builder = new StringBuilder();
- builder.append("Details about Item: ").append(position);
- for (int i = 0; i < position; i++) {
- builder.append("\nMore details information here.");
- }
- return builder.toString();
- }
-
- /**
- * A placeholder item representing a piece of content.
- */
- public static class PlaceholderItem {
- public final String id;
- public final String content;
- public final String details;
-
- public PlaceholderItem(String id, String content, String details) {
- this.id = id;
- this.content = content;
- this.details = details;
- }
-
- @Override
- public String toString() {
- return content;
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/friend.png b/app/src/main/res/drawable/friend.png
new file mode 100644
index 0000000..0d7c63c
--- /dev/null
+++ b/app/src/main/res/drawable/friend.png
Binary files differ
diff --git a/app/src/main/res/drawable/icon_cat.jpg b/app/src/main/res/drawable/icon_cat.jpg
new file mode 100644
index 0000000..c9a5ce9
--- /dev/null
+++ b/app/src/main/res/drawable/icon_cat.jpg
Binary files differ
diff --git a/app/src/main/res/drawable/notification.png b/app/src/main/res/drawable/notification.png
new file mode 100644
index 0000000..83e49f4
--- /dev/null
+++ b/app/src/main/res/drawable/notification.png
Binary files differ
diff --git a/app/src/main/res/drawable/setting.png b/app/src/main/res/drawable/setting.png
new file mode 100644
index 0000000..2b39b62
--- /dev/null
+++ b/app/src/main/res/drawable/setting.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_friend.xml b/app/src/main/res/layout/activity_friend.xml
index 79295c8..6f2939d 100644
--- a/app/src/main/res/layout/activity_friend.xml
+++ b/app/src/main/res/layout/activity_friend.xml
@@ -1,10 +1,86 @@
+ android:paddingTop="?attr/actionBarSize">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml
index e11fd8c..7ccbd4b 100644
--- a/app/src/main/res/layout/activity_launch.xml
+++ b/app/src/main/res/layout/activity_launch.xml
@@ -13,7 +13,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="tampopo"
- android:textSize="25dp"
+ android:textSize="45dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
@@ -22,22 +22,24 @@
app:layout_constraintVertical_bias="0.276" />
+ app:layout_constraintVertical_bias="0.692" />