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/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index bdd0b6a..31dc501 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -127,7 +127,9 @@ android:layout_height="0dp" android:layout_weight="1" android:background="@android:color/transparent" - android:orientation="vertical" /> + android:orientation="vertical" > + + @@ -160,6 +162,18 @@ app:srcCompat="@android:drawable/ic_popup_sync" app:tint="@color/black" /> + \ No newline at end of file