diff --git a/.idea/misc.xml b/.idea/misc.xml index 860da66..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index bae8461..cd305c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,6 +40,8 @@ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation 'androidx.navigation:navigation-fragment:2.3.5' implementation 'androidx.navigation:navigation-ui:2.3.5' + implementation 'androidx.annotation:annotation:1.2.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3ea96f8..d948d2b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,26 +1,28 @@ + + + + + + + + - - - - - - diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/HelloWorldRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/HelloWorldRest.java new file mode 100644 index 0000000..5db414a --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/HelloWorldRest.java @@ -0,0 +1,9 @@ +package org.ntlab.acanthus_client.resources.accounts; + +import retrofit2.Call; +import retrofit2.http.GET; + +public interface HelloWorldRest { + @GET("hello_world") + public Call getHelloWorld(); +} 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 new file mode 100644 index 0000000..b3241af --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java @@ -0,0 +1,75 @@ +package org.ntlab.acanthus_client.views.Login; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; + +import org.ntlab.acanthus_client.R; +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; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; + +//----------------------------------------------------------------- +// ログイン画面 +public class LoginScreenActivity extends AppCompatActivity { + private EditText editNameTextView; + private EditText editPasswordTextView; + private Button loginButton; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + + final LoginRest loginRest = retrofit.create(LoginRest.class); + + setContentView(R.layout.activity_login_screen); + initView(); + + loginButton.setOnClickListener(v -> { + + Call call = loginRest.hasLoginToken("1", "abc0"); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) { + loginButton.setText("success"); + Intent intent = new Intent(getApplication(), MainActivity.class); + startActivity(intent); + finish(); + } else loginButton.setText("faild"); + } + + @Override + public void onFailure(Call call, Throwable t) { + loginButton.setText("failure"); + } + }); + }); + + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // 各種Viewの初期化 + private void initView() { + editNameTextView = findViewById(R.id.input_user_name); + editPasswordTextView = findViewById(R.id.input_password); + loginButton = (Button) findViewById(R.id.login_button); + } + //----------------------------------------------------------------- + +} \ 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 new file mode 100644 index 0000000..001ad7e --- /dev/null +++ b/app/src/main/res/layout/activity_login_screen.xml @@ -0,0 +1,75 @@ + + + + + +