Merge pull request #52 from nitta-lab-2019/MemberList
MemberList確認しました。
マージします。
commit fb201a3d2334bd78af19f5716cbe8e89f51c07e7
2 parents 1c7ce2a + a7d9f6c
Hongo Aki authored on 4 Oct 2019
Showing 5 changed files
View
6
app/src/main/AndroidManifest.xml
android:theme="@style/AppTheme">
<activity
android:name=".views.DisplayGroupIDActivity"
android:label="グループIDを表示する" />
<activity android:name=".views.MemberListActivity"></activity>
<activity
android:name=".views.MemberListActivity"
android:label="グループメンバー"/>
<activity
android:name=".views.CreateGroupActivity"
android:label="グループ作成" />
<activity
View
11
app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Handler;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Base64;
/*ここからグループ名表示*/
TextView groupName = findViewById(R.id.groupName);
 
//メンバー追加ボタン処理
FloatingActionButton fab = findViewById(R.id.addrequest_button);
final FloatingActionButton fab = findViewById(R.id.addrequest_button);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//ボタン連打防止
fab.setEnabled(false);
new Handler().postDelayed(new Runnable() {
public void run() {
fab.setEnabled(true);
}
}, 1000L);
 
startActivity(new Intent(MemberListActivity.this,
AddMemberActivity.class));
finish();
}
View
36
app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
//成功時
@Override
public void onResponse(Call<SigninResponse> call, Response<SigninResponse> response) {
if (response.isSuccessful()) {
SigninResponse result = response.body();
if(response.body() == null){
//パスワードが違う際、アプリが落ちてしまうため
Toast.makeText(SigninActivity.this,
"パスワードが違います",Toast.LENGTH_LONG).show();
}else{
SigninResponse result = response.body();
 
//app/Cosmosに情報保存
Cosmos app = (Cosmos)getApplication();
app.setToken(result.token);
app.setuId(UserIdText.getText().toString());
//app/Cosmosに情報保存
Cosmos app = (Cosmos) getApplication();
app.setToken(result.token);
app.setuId(UserIdText.getText().toString());
 
//画面遷移
Intent intent = new Intent(getApplication(), GroupListActivity.class);
startActivity(intent);
Toast.makeText(SigninActivity.this,
"ログインしました", Toast.LENGTH_SHORT).show();
finish();
//画面遷移
Intent intent = new Intent(getApplication(), GroupListActivity.class);
startActivity(intent);
Toast.makeText(SigninActivity.this,
"ログインしました", Toast.LENGTH_SHORT).show();
finish();
}
 
}else{
//onFailureでキャッチできないエラーの処理
Toast.makeText(SigninActivity.this,
 
//失敗時
@Override
public void onFailure(Call<SigninResponse> call, Throwable t) {
//t.printStackTrace();
t.printStackTrace();
Toast.makeText(SigninActivity.this,
"ユーザIDもしくはパスワードが間違っています",Toast.LENGTH_SHORT).show();
}
 
View
23
app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
private boolean cpwEnable;
private Button MakeAccountButton;
private ImageView iconChoice;
private String iconImageBase64;
private int quality = 70;
 
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
 
//画像をBase64に変換
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Bitmap afterResizeBitmap = Bitmap.createScaledBitmap(image,50,50,true);
afterResizeBitmap.compress(Bitmap.CompressFormat.JPEG,70, baos);
afterResizeBitmap.compress(Bitmap.CompressFormat.JPEG,quality, baos);
 
byte[] b = baos.toByteArray();
String imageEncoded = Base64.encodeToString(b, Base64.DEFAULT);
 
if(imageEncoded.length() <= 2000){
iconChoice.setImageBitmap(image);
iconImageBase64 = imageEncoded;
}else{
Toast.makeText(SignupActivity.this,
"この画像は使用できません。\n別の画像を選択してください。",Toast.LENGTH_LONG).show();
}
while (imageEncoded.length() >2000){
//文字数の2000文字以下になるまで圧縮率を上げて再度変換
baos = new ByteArrayOutputStream();
quality -=5;
afterResizeBitmap.compress(Bitmap.CompressFormat.JPEG,quality, baos);
b = baos.toByteArray();
imageEncoded = Base64.encodeToString(b, Base64.DEFAULT);
}
iconChoice.setImageBitmap(image);
iconImageBase64 = imageEncoded;
}catch(IOException e){
e.printStackTrace();
}
} else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) {
View
28
app/src/main/res/layout/activity_signup.xml
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="50dp"
android:layout_marginTop="32dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="50dp"
android:background="@android:color/darker_gray"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="37dp"
android:layout_height="28dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="18dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:background="#FFFFFF"
android:gravity="center"
android:layout_width="294dp"
android:layout_height="66dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:text="@string/make_account"
android:textAllCaps="false"
android:text="@string/make_account"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.445"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ConfirmPasswordText" />
app:layout_constraintTop_toBottomOf="@+id/choiceImage" />
 
<EditText
android:id="@+id/ConfirmPasswordText"
android:layout_width="294dp"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginStart="152dp"
android:layout_marginLeft="152dp"
android:layout_marginTop="40dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/ConfirmPasswordText"
app:srcCompat="@drawable/ic_menu_gallery" />
 
<TextView
android:id="@+id/textView11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:text="ユーザー\nアイコン\n (任意)"
app:layout_constraintEnd_toStartOf="@+id/choiceImage"
app:layout_constraintHorizontal_bias="0.584"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/choiceImage" />
 
</android.support.constraint.ConstraintLayout>