diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d948d2b..881e9a1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,6 +10,7 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="Acanthus" + android:usesCleartextTraffic="true" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" 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 b3241af..e6369c9 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 @@ -4,14 +4,14 @@ import android.content.Intent; import android.os.Bundle; +import android.text.Editable; import android.widget.Button; import android.widget.EditText; -import android.widget.TextView; import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.entities.AccountTokenJson; import org.ntlab.acanthus_client.resources.accounts.LoginRest; import org.ntlab.acanthus_client.views.MainActivity; -import org.ntlab.acanthus_client.views.Main_menu_ui.home.HomeFragment; import retrofit2.Call; import retrofit2.Callback; @@ -22,7 +22,7 @@ //----------------------------------------------------------------- // ログイン画面 public class LoginScreenActivity extends AppCompatActivity { - private EditText editNameTextView; + private EditText editEmailTextView; private EditText editPasswordTextView; private Button loginButton; @@ -31,7 +31,8 @@ super.onCreate(savedInstanceState); Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") - .addConverterFactory(JacksonConverterFactory.create()) + + .addConverterFactory(JacksonConverterFactory.create()) .build(); final LoginRest loginRest = retrofit.create(LoginRest.class); @@ -41,10 +42,14 @@ loginButton.setOnClickListener(v -> { - Call call = loginRest.hasLoginToken("1", "abc0"); - call.enqueue(new Callback() { + String emailStr = editEmailTextView.getText().toString(); + String password = editPasswordTextView.getText().toString(); + + // ログイン + Call call = loginRest.issueLoginToken(emailStr, password); + call.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()) { loginButton.setText("success"); Intent intent = new Intent(getApplication(), MainActivity.class); @@ -54,7 +59,7 @@ } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { loginButton.setText("failure"); } }); @@ -66,7 +71,7 @@ //----------------------------------------------------------------- // 各種Viewの初期化 private void initView() { - editNameTextView = findViewById(R.id.input_user_name); + editEmailTextView = findViewById(R.id.input_email); editPasswordTextView = findViewById(R.id.input_password); loginButton = (Button) findViewById(R.id.login_button); } diff --git a/app/src/main/res/layout/activity_login_screen.xml b/app/src/main/res/layout/activity_login_screen.xml index 001ad7e..6207014 100644 --- a/app/src/main/res/layout/activity_login_screen.xml +++ b/app/src/main/res/layout/activity_login_screen.xml @@ -7,17 +7,14 @@ tools:context=".views.Login.LoginScreenActivity"> + app:layout_constraintTop_toTopOf="parent" />