diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 241824c..300967e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,13 +9,36 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
new file mode 100644
index 0000000..2fed0e0
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
@@ -0,0 +1,46 @@
+package com.example.cosmosclient.views;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.example.cosmosclient.R;
+
+public class SigninActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_signin);
+
+ //各種IDを取得
+ Button SigninButton = findViewById(R.id.SigninButton);
+ Button SignupButton = findViewById(R.id.SignupButton);
+ EditText EmailAddressText = findViewById(R.id.EMailAddressText);
+ EditText PasswordText = findViewById(R.id.PasswordText);
+ Button ForgotPasswordButton = findViewById(R.id.ForgotPasswordButton);
+
+ //Sign inボタンの処理
+ SigninButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(getApplication(), GroupList.class);
+ startActivity(intent);
+ finish();
+ }
+ });
+
+ //サインアップ画面への遷移処理
+ SignupButton.setOnClickListener(new View.OnClickListener(){
+ @Override
+ public void onClick(View v){
+ Intent intent = new Intent(getApplication(), SignupActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
new file mode 100644
index 0000000..c738fa8
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -0,0 +1,47 @@
+package com.example.cosmosclient.views;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.example.cosmosclient.R;
+
+public class SignupActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_signup);
+
+ //各種idを取得
+ Button LoginButton = findViewById(R.id.LoginButton);
+ Button MakeAccountButton = findViewById(R.id.MakeAccountButton);
+ EditText EmailAddressText = findViewById(R.id.EMailAddressText);
+ EditText PasswordText = findViewById(R.id.PasswordText);
+ EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText);
+
+ //Make Accountボタンの処理
+ MakeAccountButton.setOnClickListener(new View.OnClickListener(){
+ @Override
+ public void onClick(View v){
+ Intent intent = new Intent(getApplication(), GroupList.class);
+ startActivity(intent);
+ finish();
+ }
+ });
+
+ //サインイン画面への遷移処理
+ LoginButton.setOnClickListener(new View.OnClickListener(){
+ @Override
+ public void onClick(View v){
+ Intent intent = new Intent(getApplication(),SigninActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ });
+
+ }
+}
diff --git a/app/src/main/res/drawable/borderless_button.xml b/app/src/main/res/drawable/borderless_button.xml
new file mode 100644
index 0000000..7a4684f
--- /dev/null
+++ b/app/src/main/res/drawable/borderless_button.xml
@@ -0,0 +1,14 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml
new file mode 100644
index 0000000..7416c05
--- /dev/null
+++ b/app/src/main/res/layout/activity_signin.xml
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
new file mode 100644
index 0000000..3088668
--- /dev/null
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7a1b8f..c820d97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,15 @@
CosmosClient
+ or
+ E-MAIL ADDRESS
+ PASSWORD
+ CONFIRM PASSWORD
+ Sign Up
+ Already have a account?
+ Login
+ Make Account
+ Sign in
+ Don\'t have an account?
+ Forgot Password?
+ Sign up Now
diff --git a/build.gradle b/build.gradle
index e11a5b3..fafc1b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.2'
+ classpath 'com.android.tools.build:gradle:3.4.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 18955ab..3a6a49e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 26 15:58:11 JST 2019
+#Thu May 09 18:09:56 JST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip