Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0cf55e28
authored
Jul 27, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
interface modified
parent
e6ef19a1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
18 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/SessionActivity.java
android/Pictogram/tabletlibrary/src/main/res/layout/activity_session.xml
android/Pictogram/tabletlibrary/src/main/res/layout/fragment_instructions_session.xml
android/Pictogram/tabletlibrary/tabletlibrary.iml
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/SessionActivity.java
View file @
0cf55e28
...
...
@@ -161,7 +161,6 @@ public class SessionActivity extends FragmentActivity implements ListInstruction
setContentView
(
R
.
layout
.
activity_session
);
User
student
=
PCBcontext
.
getPcbdb
().
getCurrentUser
();
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
ToggleButton
onoffBtn
=((
ToggleButton
)
findViewById
(
R
.
id
.
sessionOnOffBtn
));
final
ToggleButton
pauseBtn
=((
ToggleButton
)
findViewById
(
R
.
id
.
sessionPauseBtn
));
...
...
@@ -173,7 +172,6 @@ public class SessionActivity extends FragmentActivity implements ListInstruction
final
Button
modBtn
=((
Button
)
findViewById
(
R
.
id
.
btn_model
));
((
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
());
StudentUserNameView
.
setText
(
student
.
get_office
());
try
{
StudentPhotoView
.
setImageBitmap
(
student
.
get_bitmap_stu
(
this
.
getBaseContext
()));
}
catch
(
IOException
e
)
{
...
...
android/Pictogram/tabletlibrary/src/main/res/layout/activity_session.xml
View file @
0cf55e28
...
...
@@ -10,7 +10,8 @@
android:id=
"@+id/sessionTopbarLayout"
android:layout_width=
"match_parent"
android:layout_height=
"64dp"
android:background=
"@color/VerdeApp"
>
android:background=
"@color/VerdeApp"
android:layout_alignParentEnd=
"true"
>
<ImageView
android:id=
"@+id/sessionTopbarStudentPhoto"
...
...
@@ -38,15 +39,8 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
""
android:textAppearance=
"?android:attr/textAppearanceMedium"
/>
<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"
/>
android:textAppearance=
"?android:attr/textAppearanceMedium"
android:textColor=
"@color/white"
/>
</LinearLayout>
...
...
@@ -93,11 +87,12 @@
android:id=
"@+id/sessionOnOffBtn"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textOff=
"REC"
android:textOn=
"REC"
android:layout_alignBaseline=
"@+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>
...
...
android/Pictogram/tabletlibrary/src/main/res/layout/fragment_instructions_session.xml
View file @
0cf55e28
...
...
@@ -27,13 +27,15 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_weight=
"4"
>
<TextView
android:text=
"@string/session_method"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:textStyle=
"normal|bold"
android:background=
"@color/VerdeApp"
android:textColor=
"@color/white"
android:textAlignment=
"center"
android:background=
"@color/VerdeApp"
/>
android:textStyle=
"normal|bold"
android:text=
"@string/session_method"
/>
<ListView
android:id=
"@+id/methodsListView"
...
...
@@ -56,6 +58,7 @@
<TextView
android:text=
"@string/session_instruction"
android:background=
"@color/VerdeApp"
android:textColor=
"@color/white"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:textStyle=
"normal|bold"
...
...
android/Pictogram/tabletlibrary/tabletlibrary.iml
View file @
0cf55e28
...
...
@@ -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-lite-9.2.1"
level=
"project"
/>
<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>
</module>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment