diff --git a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java index cf6713f..093b82e 100644 --- a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java @@ -102,7 +102,6 @@ changeDefaultButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - icon = null; iconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/test01.jpg"; setIcon(iconButton); iconFlag = true; @@ -232,6 +231,10 @@ InputStream is = con.getInputStream(); Bitmap bitmap = BitmapFactory.decodeStream(is); + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream); + byte[] byteArray = stream.toByteArray(); + icon = Base64.getEncoder().encodeToString(byteArray); handler.post(() -> iv.setImageBitmap(bitmap)); is.close(); con.disconnect(); diff --git a/app/src/main/java/com/example/nemophila/Nemophila.java b/app/src/main/java/com/example/nemophila/Nemophila.java index 79c017d..efbf6eb 100644 --- a/app/src/main/java/com/example/nemophila/Nemophila.java +++ b/app/src/main/java/com/example/nemophila/Nemophila.java @@ -2,6 +2,7 @@ import android.app.Application; import android.content.SharedPreferences; +import android.graphics.Bitmap; import com.example.nemophila.entities.Account; import com.example.nemophila.entities.AccountNameJson; @@ -18,6 +19,7 @@ private String name; private String uid; private String token; + private Bitmap icon; private Collection friends; //ショップのデータ @@ -58,6 +60,9 @@ } return token; } + public Bitmap getIcon() { + return icon; + } public Collection getFriends() { return friends; } @@ -136,6 +141,9 @@ this.token = token; editor.commit(); } + public void setIcon(Bitmap icon) { + this.icon = icon; + } public void setFriends(Collection friends) { this.friends = friends; } diff --git a/app/src/main/java/com/example/nemophila/PostActivity.java b/app/src/main/java/com/example/nemophila/PostActivity.java index fbf2ff5..36b429e 100644 --- a/app/src/main/java/com/example/nemophila/PostActivity.java +++ b/app/src/main/java/com/example/nemophila/PostActivity.java @@ -195,7 +195,7 @@ postImages[1] = findViewById(R.id.imageView2); postImages[2] = findViewById(R.id.imageView3); - Button selectPictureButton = (Button)findViewById(R.id.selectpicturebutton); + ImageButton selectPictureButton = (ImageButton) findViewById(R.id.selectpicturebutton); selectPictureButton.setOnClickListener(new View.OnClickListener(){ public void onClick(View v) { if (uriLists.size() < 3) { diff --git a/app/src/main/res/drawable/ic_baseline_camera_alt_24.xml b/app/src/main/res/drawable/ic_baseline_camera_alt_24.xml new file mode 100644 index 0000000..9141101 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_camera_alt_24.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/layout/activity_post.xml b/app/src/main/res/layout/activity_post.xml index f829316..9f4a708 100644 --- a/app/src/main/res/layout/activity_post.xml +++ b/app/src/main/res/layout/activity_post.xml @@ -113,56 +113,58 @@ android:textSize="20sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.9" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.895" /> + app:layout_constraintHorizontal_bias="0.625" + app:layout_constraintStart_toEndOf="@+id/selectpicturebutton" + app:layout_constraintTop_toBottomOf="@+id/imageView3" + app:layout_constraintVertical_bias="0.266" /> -