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/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8328a06..22be3e7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
+
+
diff --git a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
index c1b8f1d..d5682dc 100644
--- a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
@@ -1,10 +1,14 @@
package com.example.cosmosclient.views;
import android.content.Intent;
+import android.graphics.BitmapFactory;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
import com.example.cosmosclient.R;
@@ -14,9 +18,13 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_add_member);
-
- //ここからQRからメンバー追加の画面遷移処理画面を記述
+ //各種idを取得
Button qrButton = findViewById(R.id.addQR);
+ Button idButton = findViewById(R.id.addID);
+ Button mailButton = findViewById(R.id.addMail);
+ TextView groupText=findViewById(R.id.groupName);
+
+ //QRからメンバー追加の画面遷移処理画面を記述
qrButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -24,8 +32,7 @@
startActivity(intent);
}
});
- //ここからIDからメンバー追加の画面遷移処理画面を記述
- Button idButton = findViewById(R.id.addID);
+ //IDからメンバー追加の画面遷移処理画面を記述
idButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -33,8 +40,7 @@
startActivity(intent);
}
});
- //ここからMailからメンバー追加の画面遷移処理画面を記述
- Button mailButton = findViewById(R.id.addMail);
+ //Mailからメンバー追加の画面遷移処理画面を記述
mailButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/res/drawable/camera_image.png b/app/src/main/res/drawable/camera_image.png
new file mode 100644
index 0000000..e5cc4cc
--- /dev/null
+++ b/app/src/main/res/drawable/camera_image.png
Binary files differ
diff --git a/app/src/main/res/drawable/group_image.png b/app/src/main/res/drawable/group_image.png
new file mode 100644
index 0000000..2d02bdc
--- /dev/null
+++ b/app/src/main/res/drawable/group_image.png
Binary files differ
diff --git a/app/src/main/res/drawable/mail_image.png b/app/src/main/res/drawable/mail_image.png
new file mode 100644
index 0000000..522ef7d
--- /dev/null
+++ b/app/src/main/res/drawable/mail_image.png
Binary files differ
diff --git a/app/src/main/res/drawable/search_image.png b/app/src/main/res/drawable/search_image.png
new file mode 100644
index 0000000..3ae2a32
--- /dev/null
+++ b/app/src/main/res/drawable/search_image.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_add_member.xml b/app/src/main/res/layout/activity_add_member.xml
index fb91b77..1660f02 100644
--- a/app/src/main/res/layout/activity_add_member.xml
+++ b/app/src/main/res/layout/activity_add_member.xml
@@ -5,85 +5,64 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".views.AddMemberActivity">
-
+
+
+ android:layout_height="75dp"
+ android:background="#e6eae3"
+ android:gravity="center"
+ android:text="家族用 グループ"
+ android:textSize="24sp"
+ android:drawableLeft="@drawable/group_image"
+ app:layout_constraintTop_toBottomOf="@+id/viewName"
+ tools:layout_editor_absoluteX="0dp" />
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_display_qr.xml b/app/src/main/res/layout/activity_display_qr.xml
index 58032b5..7f1bf96 100644
--- a/app/src/main/res/layout/activity_display_qr.xml
+++ b/app/src/main/res/layout/activity_display_qr.xml
@@ -6,36 +6,28 @@
android:layout_height="match_parent"
tools:context=".views.DisplayQRActivity">
-
+ android:gravity="center"
+ android:text="メンバー追加"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:layout_editor_absoluteX="10dp" />
-
-
-
-
-
-
+
-
+
\ No newline at end of file
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..20ad0eb 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:02:09 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