diff --git a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java index e692ebf..4e598b5 100644 --- a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java @@ -61,6 +61,7 @@ public void onClick(View v) { EditText useridInput = (EditText) findViewById(R.id.userIDText); String userid = useridInput.getText().toString(); + ((Tampopo) LoginActivity.this.getApplication()).setUserId(userid); EditText passwordInput = (EditText) findViewById(R.id.PasswordText); String password = passwordInput.getText().toString(); userViewModel.login(userid, password); diff --git a/app/src/main/res/drawable/friend01_icon.jpg b/app/src/main/res/drawable/friend01_icon.jpg new file mode 100644 index 0000000..904b1ed --- /dev/null +++ b/app/src/main/res/drawable/friend01_icon.jpg Binary files differ diff --git a/app/src/main/res/drawable/icon_cat.jpg b/app/src/main/res/drawable/icon_cat.jpg deleted file mode 100644 index c9a5ce9..0000000 --- a/app/src/main/res/drawable/icon_cat.jpg +++ /dev/null Binary files differ diff --git a/app/src/main/res/drawable/my_icon.jpg b/app/src/main/res/drawable/my_icon.jpg new file mode 100644 index 0000000..c9a5ce9 --- /dev/null +++ b/app/src/main/res/drawable/my_icon.jpg Binary files differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 368f625..31dc501 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -58,7 +58,7 @@ android.scaleType="centerCrop" android:layout_width="150dp" android:layout_height="150dp" - android:src="@drawable/icon_cat" + android:src="@drawable/my_icon" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.498" @@ -82,7 +82,36 @@ app:layout_constraintVertical_bias="0.38" app:srcCompat="@drawable/comment" /> + + + + + android:background="@android:color/transparent" + android:orientation="vertical" > + + @@ -117,4 +148,32 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.366" /> + + + + + \ No newline at end of file