Skip to content

yotta / pictogram

Go to a project
Commit 0cf55e28 by Sebastián Collado Montañez
Options

interface modified

parent e6ef19a1
Inline Side-by-side
Showing with 26 additions and 18 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/SessionActivity.java
...@@ -161,7 +161,6 @@ public class SessionActivity extends FragmentActivity implements ListInstruction ...@@ -161,7 +161,6 @@ public class SessionActivity extends FragmentActivity implements ListInstruction
setContentView(R.layout.activity_session); setContentView(R.layout.activity_session);
User student=PCBcontext.getPcbdb().getCurrentUser(); User student=PCBcontext.getPcbdb().getCurrentUser();
final TextView StudentFullNameView = (TextView) findViewById(R.id.sessionTopbarStudentFullName); final TextView StudentFullNameView = (TextView) findViewById(R.id.sessionTopbarStudentFullName);
final TextView StudentUserNameView = (TextView) findViewById(R.id.sessionTopbarStudentUserName);
final ImageView StudentPhotoView = (ImageView) findViewById(R.id.sessionTopbarStudentPhoto); final ImageView StudentPhotoView = (ImageView) findViewById(R.id.sessionTopbarStudentPhoto);
final ToggleButton onoffBtn=((ToggleButton)findViewById(R.id.sessionOnOffBtn)); final ToggleButton onoffBtn=((ToggleButton)findViewById(R.id.sessionOnOffBtn));
final ToggleButton pauseBtn=((ToggleButton)findViewById(R.id.sessionPauseBtn)); final ToggleButton pauseBtn=((ToggleButton)findViewById(R.id.sessionPauseBtn));
...@@ -173,7 +172,6 @@ public class SessionActivity extends FragmentActivity implements ListInstruction ...@@ -173,7 +172,6 @@ public class SessionActivity extends FragmentActivity implements ListInstruction
final Button modBtn =((Button)findViewById(R.id.btn_model)); final Button modBtn =((Button)findViewById(R.id.btn_model));
((ListView) findViewById(R.id.session_serverlog)).setAdapter(new ArrayAdapter<String>(getBaseContext(), R.layout.list_logsessions)); ((ListView) findViewById(R.id.session_serverlog)).setAdapter(new ArrayAdapter<String>(getBaseContext(), R.layout.list_logsessions));
StudentFullNameView.setText(student.get_name_stu() + " " + student.get_surname_stu()); StudentFullNameView.setText(student.get_name_stu() + " " + student.get_surname_stu());
StudentUserNameView.setText(student.get_office());
try { try {
StudentPhotoView.setImageBitmap(student.get_bitmap_stu(this.getBaseContext())); StudentPhotoView.setImageBitmap(student.get_bitmap_stu(this.getBaseContext()));
} catch (IOException e) { } catch (IOException e) {
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_session.xml
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
android:id="@+id/sessionTopbarLayout" android:id="@+id/sessionTopbarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="64dp"
android:background="@color/VerdeApp"> android:background="@color/VerdeApp"
android:layout_alignParentEnd="true">
<ImageView <ImageView
android:id="@+id/sessionTopbarStudentPhoto" android:id="@+id/sessionTopbarStudentPhoto"
...@@ -38,15 +39,8 @@ ...@@ -38,15 +39,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white" />
<TextView
android:id="@+id/sessionTopbarStudentUserName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/abc_secondary_text_material_light" />
</LinearLayout> </LinearLayout>
...@@ -93,11 +87,12 @@ ...@@ -93,11 +87,12 @@
android:id="@+id/sessionOnOffBtn" android:id="@+id/sessionOnOffBtn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="REC"
android:textOn="REC"
android:layout_alignBaseline="@+id/sessionPauseBtn" android:layout_alignBaseline="@+id/sessionPauseBtn"
android:layout_alignBottom="@+id/sessionPauseBtn" android:layout_alignBottom="@+id/sessionPauseBtn"
android:layout_alignParentEnd="true" /> android:layout_alignParentEnd="true"
android:layout_marginEnd="10px"
android:textOff="REC"
android:textOn="REC" />
</RelativeLayout> </RelativeLayout>
......
android/Pictogram/tabletlibrary/src/main/res/layout/fragment_instructions_session.xml
...@@ -27,13 +27,15 @@ ...@@ -27,13 +27,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="4"> android:layout_weight="4">
<TextView <TextView
android:text="@string/session_method"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="normal|bold" android:background="@color/VerdeApp"
android:textColor="@color/white"
android:textAlignment="center" android:textAlignment="center"
android:background="@color/VerdeApp" /> android:textStyle="normal|bold"
android:text="@string/session_method" />
<ListView <ListView
android:id="@+id/methodsListView" android:id="@+id/methodsListView"
...@@ -56,6 +58,7 @@ ...@@ -56,6 +58,7 @@
<TextView <TextView
android:text="@string/session_instruction" android:text="@string/session_instruction"
android:background="@color/VerdeApp" android:background="@color/VerdeApp"
android:textColor="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="normal|bold" android:textStyle="normal|bold"
......
android/Pictogram/tabletlibrary/tabletlibrary.iml
...@@ -121,5 +121,16 @@ ...@@ -121,5 +121,16 @@
<orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" />
<orderEntry type="module" module-name="commonlibrary" exported="" /> <orderEntry type="module" module-name="commonlibrary" exported="" />
<orderEntry type="library" exported="" name="okhttp-ws-2.3.0" level="project" />
<orderEntry type="library" exported="" name="socket.io-client-0.5.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
<orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
<orderEntry type="library" exported="" name="gson-2.3" level="project" />
<orderEntry type="library" exported="" name="engine.io-client-0.5.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="json-20090211" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment