Fork: 0
nitta-lab-2022 / IrisClient
Browse code
MemberRoomActivityの改修
retrofitはまだです
DrawingActivity ...test01
1 parent 1a87437 commit a822a8109bf184abd0dbd722aee8e1f54012d389
s-michishita authored on 15 Jul 2022
Patch
Unified Split
Showing 7 changed files
View
8
■■■■■
 .idea/misc.xml
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Users/Nitta/AndroidStudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.20969202898550723" />
<entry key="..\:/Users/Nitta/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.266304347826087" />
<entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.18854166666666666" />
<entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_owner_room.xml" value="0.25" />
<entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout-land/activity_main.xml" value="0.1574074074074074" />
<entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_create_room.xml" value="0.17571611799914494" />
<entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_enter_room.xml" value="0.17571611799914494" />
<entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.1859375" />
<entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_member_room.xml" value="0.25" />
<entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_owner_room.xml" value="0.17571611799914494" />
<entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/fragment_first.xml" value="0.15433946130825138" />
<entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/recycler_view_item.xml" value="0.17571611799914494" />
<entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout-land/activity_main.xml" value="0.31040564373897706" />
<entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout-sw600dp/activity_main.xml" value="0.2189207650273224" />
<entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_create_room.xml" value="0.29030797101449274" />
<entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.29030797101449274" />
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
View
9
■■■■■
 app/src/main/AndroidManifest.xml
<activity
android:name=".MainActivity"
android:screenOrientation="landscape"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
 
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".EnterRoomActivity"
android:exported="true"
<activity
android:name=".MemberRoomActivity"
android:screenOrientation="landscape"
android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
 
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".OwnerRoomActivity"
android:screenOrientation="landscape"
View
9
■■■■■
 app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
 
import com.google.android.material.snackbar.Snackbar;
 
import org.ntlab.irisclient.entities.MemberJson;
import org.ntlab.irisclient.entities.RoomJson;
import org.ntlab.irisclient.resources.RoomsRest;
 
import java.util.List;
 
if (name.isEmpty() || rid.isEmpty()) {
nicknameForm.setError("ニックネームを入力されていません");
roomIdForm.setError("部屋番号を入力されていません");
} else {
Call<List<MemberJson>> call = roomsRest.postMembers(rid,name);
call.enqueue(new Callback<List<MemberJson>>() {
Call<RoomJson> call = roomsRest.postMembers(rid,name);
call.enqueue(new Callback<RoomJson>() {
@Override
public void onResponse(Call<List<MemberJson>> call, Response<List<MemberJson>> response) {
public void onResponse(Call<RoomJson> call, Response<RoomJson> response) {
if(response.isSuccessful()){
Intent intent = new Intent(EnterRoomActivity.this,MemberRoomActivity.class);
startActivity(intent);
}
}
 
@Override
public void onFailure(Call<List<MemberJson>> call, Throwable t) {
public void onFailure(Call<RoomJson> call, Throwable t) {
 
}
});
}
View
100
■■■■■
 app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
import android.os.Bundle;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.TextView;
 
import java.lang.reflect.Member;
import java.util.ArrayList;
 
public class MemberRoomActivity extends AppCompatActivity {
 
//フィールド
ArrayList<String> members = new ArrayList<>();
String r = "部屋IDがここに表示されるはずです";
 
@Override
protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_member_room);
 
//--------------------------------------------------------------------------
//各ボタン処理
ArrayList<String> members = new ArrayList<>();
Button redMasterButton = (Button) findViewById(R.id.beRedMaster);
Button redSpyButton = (Button) findViewById(R.id.beRedSpy);
Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster);
Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy);
buttonProcesses();
 
 
redMasterButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r = "赤マスターボタン検知しました";
TextView RoomIdText = findViewById(R.id.roomID);
RoomIdText.setText(r);
}
});
 
blueMasterButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r = "青マスターボタン検知しました";
TextView RoomIdText = findViewById(R.id.roomID);
RoomIdText.setText(r);
}
});
 
//--------------------------------------------------------------------------
//メンバー表示
 
members.add("1さん");
members.add("2");
 
ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, members);
 
ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, members);
ListView listView = (ListView)findViewById(R.id.MembersList);
listView.setAdapter(adapter);
 
//---------------------------------------------------------------
 
/*private void addMemberToMemberList(String m){
members.add(m);
}*/
 
public void buttonProcesses(){
Button redMasterButton = (Button) findViewById(R.id.beRedMaster);
Button redSpyButton = (Button) findViewById(R.id.beRedSpy);
Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster);
Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy);
ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton);
ImageButton homeButton = (ImageButton) findViewById(R.id.homeButton);
 
redMasterButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r = "赤マスターボタン検知しました";
TextView RoomIdText = findViewById(R.id.roomID);
RoomIdText.setText(r);
}
});
 
redSpyButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r = "赤諜報員ボタン検知しました";
TextView RoomIdText = findViewById(R.id.roomID);
RoomIdText.setText(r);
}
});
 
blueMasterButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r = "青マスターボタン検知しました";
TextView RoomIdText = findViewById(R.id.roomID);
RoomIdText.setText(r);
}
});
 
blueSpyButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r = "青諜報員ボタン検知しました";
TextView RoomIdText = findViewById(R.id.roomID);
RoomIdText.setText(r);
}
});
 
homeButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r = "ホームボタン検知しました";
TextView RoomIdText = findViewById(R.id.roomID);
RoomIdText.setText(r);
}
});
 
copyButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r = "コピーボタン検知しました";
TextView RoomIdText = findViewById(R.id.roomID);
RoomIdText.setText(r);
}
});
}
}
View
3
■■■■■
 app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java
 
//-----------------------------------------------------------------
// updates
//メンバーの更新、設定情報の更新
public void updateMembers(String rid) {
public void update(String rid) {
final RoomsRest roomsRest = retrofit.create(RoomsRest.class);
 
Call<RoomJson> call = roomsRest.getRoomMember(rid);
 
}
});
}
 
//設定情報の通信、返り値はRoomJsonなら上記のupdateのみで十分なので、不要か？
public void updateSettings(String rid) {
final RoomsRest roomsRest = retrofit.create(RoomsRest.class);
 
Call<RoomJson> call = roomsRest.getSettings(rid);
View
app/src/main/res/drawable/home_icon.png 0 → 100644
View
28
■■■■■
 app/src/main/res/layout/activity_member_room.xml
app:layout_constraintStart_toStartOf="parent" />
 
<ListView
android:id="@+id/MembersList"
android:layout_width="295dp"
android:layout_height="370dp"
android:layout_marginEnd="24dp"
android:layout_width="297dp"
android:layout_height="359dp"
android:layout_marginEnd="40dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/beBlueMaster"
app:layout_constraintHorizontal_bias="0.961"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintHorizontal_bias="0.712"
app:layout_constraintStart_toEndOf="@+id/homeButton"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.609" />
app:layout_constraintVertical_bias="0.653" />
 
<TextView
android:id="@+id/roomID"
android:layout_width="165dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:background="#FFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/copy_icon" />
 
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/roomID"
app:layout_constraintVertical_bias="0.0" />
 
<ImageButton
android:id="@+id/homeButton"
android:layout_width="43dp"
android:layout_height="39dp"
android:layout_marginStart="4dp"
android:background="#FFFFFF"
android:padding="0dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.043"
app:srcCompat="@drawable/home_icon" />
 
</androidx.constraintlayout.widget.ConstraintLayout>