diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 881e9a1..a2ef4bc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,28 +3,29 @@ package="org.ntlab.acanthus_client"> - + + android:theme="@style/Theme.Acanthus" + android:usesCleartextTraffic="true"> + + - + android:label="@string/title_activity_main"> \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java index 20a4c69..349032c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java @@ -1,22 +1,13 @@ package org.ntlab.acanthus_client.views.Login; -import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import androidx.lifecycle.ViewModelProvider; -import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.text.Editable; -import android.text.Layout; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; import org.ntlab.acanthus_client.R; -import org.ntlab.acanthus_client.databinding.ActivityLoginScreenBinding; import org.ntlab.acanthus_client.entities.AccountTokenJson; import org.ntlab.acanthus_client.resources.accounts.LoginRest; import org.ntlab.acanthus_client.views.MainActivity; @@ -51,9 +42,9 @@ // ログインボタン押下時の処理 private void onClicked(LoginRest loginRest) { - EditText editEmailTextView = findViewById(R.id.input_email); - EditText editPasswordTextView = findViewById(R.id.input_password); - Button loginButton = (Button) findViewById(R.id.login_button); + EditText editEmailTextView = findViewById(R.id.editTextTextLoginEmail); + EditText editPasswordTextView = findViewById(R.id.editTextTextPassword); + Button loginButton = (Button) findViewById(R.id.buttonLoginLogin); loginButton.setOnClickListener(v -> { String emailStr = editEmailTextView.getText().toString(); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/SignUp/SignUpActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/SignUp/SignUpActivity.java new file mode 100644 index 0000000..8efb647 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/SignUp/SignUpActivity.java @@ -0,0 +1,18 @@ +package org.ntlab.acanthus_client.views.SignUp; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +import org.ntlab.acanthus_client.R; + +public class SignUpActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_sign_up); + + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login_screen.xml b/app/src/main/res/layout/activity_login_screen.xml index 6207014..a64ec23 100644 --- a/app/src/main/res/layout/activity_login_screen.xml +++ b/app/src/main/res/layout/activity_login_screen.xml @@ -7,7 +7,7 @@ tools:context=".views.Login.LoginScreenActivity">