Skip to content

Commit 9735d1b

Browse files
opticodopticod
committed
Added ComprehensionTemplate simulator's last fragment toolbar
1 parent b5e1577 commit 9735d1b

File tree

4 files changed

+143
-83
lines changed

4 files changed

+143
-83
lines changed

‎source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensionTemplate/fragment/LastFragment.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
import android.database.Cursor;
66
import android.os.Bundle;
77
import android.support.v4.app.Fragment;
8+
import android.support.v7.app.AlertDialog;
9+
import android.support.v7.widget.Toolbar;
10+
import android.text.method.LinkMovementMethod;
811
import android.view.LayoutInflater;
12+
import android.view.MenuItem;
913
import android.view.View;
1014
import android.view.ViewGroup;
1115
import android.widget.TextView;
1216

1317
import org.buildmlearn.toolkit.R;
18+
import org.buildmlearn.toolkit.comprehensionTemplate.Constants;
1419
import org.buildmlearn.toolkit.comprehensionTemplate.data.ComprehensionDb;
1520

1621
import java.util.Locale;
@@ -40,6 +45,35 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
4045
cursor.moveToFirst();
4146

4247
int stat[] = db.getStatistics();
48+
49+
Toolbar maintoolbar = (Toolbar) rootView.findViewById(R.id.toolbar_main);
50+
Cursor meta = db.getMetaCursor();
51+
meta.moveToFirst();
52+
String title = meta.getString(Constants.COL_TITLE);
53+
maintoolbar.setTitle(title);
54+
maintoolbar.inflateMenu(R.menu.menu_main_white);
55+
56+
maintoolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
57+
@Override
58+
public boolean onMenuItemClick(MenuItem menuItem) {
59+
switch (menuItem.getItemId()) {
60+
case R.id.action_about:
61+
AlertDialog.Builder builder =
62+
new AlertDialog.Builder(getActivity());
63+
builder.setTitle(String.format("%1$s", getString(R.string.comprehension_about_us)));
64+
builder.setMessage(getResources().getText(R.string.comprehension_about_text));
65+
builder.setPositiveButton("OK", null);
66+
AlertDialog welcomeAlert = builder.create();
67+
welcomeAlert.show();
68+
assert welcomeAlert.findViewById(android.R.id.message) != null;
69+
assert welcomeAlert.findViewById(android.R.id.message) != null;
70+
((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
71+
break;
72+
}
73+
return true;
74+
}
75+
});
76+
4377
db.close();
4478

4579
((TextView) rootView.findViewById(R.id.correct)).setText(String.format(Locale.getDefault(), "Total Correct : %1$d", stat[0]));
@@ -66,6 +100,7 @@ public void onClick(View v) {
66100
}
67101
});
68102

103+
69104
return rootView;
70105
}
71106
}

‎source-code/app/src/main/res/layout/comprehension_content_question.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
android:layout_alignParentBottom="true"
109109
android:layout_alignParentRight="true"
110110
android:background="@android:color/transparent"
111-
android:paddingBottom="@dimen/headline_leading"
111+
android:paddingBottom="@dimen/headline_leading_simulator"
112112
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
113113
android:paddingRight="@dimen/activity_vertical_margin_simulator"
114114
android:paddingTop="@dimen/activity_vertical_margin_simulator"

‎source-code/app/src/main/res/layout/comprehension_fragment_last.xml

Lines changed: 106 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,115 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="match_parent"
4-
android:layout_height="@dimen/comprehension_cardHeightLastActivity"
5-
android:layout_marginTop="@dimen/comprehension_paddingTop">
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:layout_width="wrap_content"
5+
android:layout_height="wrap_content"
6+
android:orientation="vertical">
67

7-
<RelativeLayout
8+
<android.support.v7.widget.Toolbar
9+
android:id="@+id/toolbar_main"
810
android:layout_width="match_parent"
9-
android:layout_height="match_parent">
11+
android:layout_height="@dimen/simulator_detail_toolbar"
12+
android:background="@color/colorPrimary_video"
13+
android:minHeight="?attr/actionBarSize"
14+
app:theme="@style/ToolBarStyle_video_heading"
15+
app:titleTextAppearance="@style/Toolbar.TitleText" />
1016

11-
<TextView
12-
android:id="@+id/text"
13-
android:layout_width="wrap_content"
14-
android:layout_height="wrap_content"
15-
android:layout_marginTop="@dimen/activity_vertical_margin_simulator"
16-
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
17-
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
18-
android:paddingRight="@dimen/activity_vertical_margin_simulator"
19-
android:paddingTop="@dimen/activity_vertical_margin_simulator"
20-
android:text="@string/comprehension_completed_message"
21-
android:textAppearance="?android:textAppearanceSmall" />
17+
<View
18+
android:layout_width="match_parent"
19+
android:layout_height="1dp"
20+
android:background="@drawable/shadow_toolbar"
21+
android:backgroundTint="@color/color_divider"
22+
android:visibility="gone" />
23+
24+
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
25+
xmlns:app="http://schemas.android.com/apk/res-auto"
26+
android:layout_width="match_parent"
27+
android:layout_height="@dimen/comprehension_cardHeightLastActivity"
28+
android:layout_marginTop="@dimen/comprehension_paddingTop">
29+
30+
<RelativeLayout
31+
android:layout_width="match_parent"
32+
android:layout_height="match_parent">
33+
34+
<TextView
35+
android:id="@+id/text"
36+
android:layout_width="wrap_content"
37+
android:layout_height="wrap_content"
38+
android:layout_marginTop="@dimen/activity_vertical_margin_simulator"
39+
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
40+
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
41+
android:paddingRight="@dimen/activity_vertical_margin_simulator"
42+
android:paddingTop="@dimen/activity_vertical_margin_simulator"
43+
android:text="@string/comprehension_completed_message"
44+
android:textAppearance="?android:textAppearanceSmall" />
2245

23-
<TextView
24-
android:id="@+id/correct"
25-
android:layout_width="wrap_content"
26-
android:layout_height="wrap_content"
27-
android:layout_below="@+id/text"
28-
android:layout_marginLeft="@dimen/comprehension_splash_button_margin_top"
29-
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
30-
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
31-
android:paddingRight="@dimen/activity_vertical_margin_simulator"
32-
android:paddingTop="@dimen/activity_vertical_margin_simulator"
33-
android:textAppearance="?android:textAppearanceSmall" />
46+
<TextView
47+
android:id="@+id/correct"
48+
android:layout_width="wrap_content"
49+
android:layout_height="wrap_content"
50+
android:layout_below="@+id/text"
51+
android:layout_marginLeft="@dimen/comprehension_splash_button_margin_top"
52+
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
53+
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
54+
android:paddingRight="@dimen/activity_vertical_margin_simulator"
55+
android:paddingTop="@dimen/activity_vertical_margin_simulator"
56+
android:textAppearance="?android:textAppearanceSmall" />
3457

35-
<TextView
36-
android:id="@+id/wrong"
37-
android:layout_width="wrap_content"
38-
android:layout_height="wrap_content"
39-
android:layout_below="@+id/correct"
40-
android:layout_marginLeft="@dimen/comprehension_splash_button_margin_top"
41-
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
42-
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
43-
android:paddingRight="@dimen/activity_vertical_margin_simulator"
44-
android:paddingTop="@dimen/activity_vertical_margin_simulator"
45-
android:textAppearance="?android:textAppearanceSmall" />
58+
<TextView
59+
android:id="@+id/wrong"
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content"
62+
android:layout_below="@+id/correct"
63+
android:layout_marginLeft="@dimen/comprehension_splash_button_margin_top"
64+
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
65+
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
66+
android:paddingRight="@dimen/activity_vertical_margin_simulator"
67+
android:paddingTop="@dimen/activity_vertical_margin_simulator"
68+
android:textAppearance="?android:textAppearanceSmall" />
4669

47-
<TextView
48-
android:id="@+id/un_answered"
49-
android:layout_width="wrap_content"
50-
android:layout_height="wrap_content"
51-
android:layout_below="@+id/wrong"
52-
android:layout_marginLeft="@dimen/comprehension_splash_button_margin_top"
53-
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
54-
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
55-
android:paddingRight="@dimen/activity_vertical_margin_simulator"
56-
android:paddingTop="@dimen/activity_vertical_margin_simulator"
57-
android:textAppearance="?android:textAppearanceSmall" />
70+
<TextView
71+
android:id="@+id/un_answered"
72+
android:layout_width="wrap_content"
73+
android:layout_height="wrap_content"
74+
android:layout_below="@+id/wrong"
75+
android:layout_marginLeft="@dimen/comprehension_splash_button_margin_top"
76+
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
77+
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
78+
android:paddingRight="@dimen/activity_vertical_margin_simulator"
79+
android:paddingTop="@dimen/activity_vertical_margin_simulator"
80+
android:textAppearance="?android:textAppearanceSmall" />
5881

59-
<Button
60-
android:id="@+id/exit"
61-
android:layout_width="wrap_content"
62-
android:layout_height="wrap_content"
63-
android:layout_alignParentBottom="true"
64-
android:layout_alignParentEnd="true"
65-
android:layout_alignParentRight="true"
66-
android:background="@android:color/transparent"
67-
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
68-
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
69-
android:paddingRight="@dimen/activity_vertical_margin_simulator"
70-
android:paddingTop="@dimen/activity_vertical_margin_simulator"
71-
android:text="@string/exit"
72-
android:textAppearance="?android:textAppearanceSmall"
73-
android:textColor="@color/colorAccent_comprehension" />
82+
<Button
83+
android:id="@+id/exit"
84+
android:layout_width="wrap_content"
85+
android:layout_height="wrap_content"
86+
android:layout_alignParentBottom="true"
87+
android:layout_alignParentEnd="true"
88+
android:layout_alignParentRight="true"
89+
android:background="@android:color/transparent"
90+
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
91+
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
92+
android:paddingRight="@dimen/activity_vertical_margin_simulator"
93+
android:paddingTop="@dimen/activity_vertical_margin_simulator"
94+
android:text="@string/exit_info"
95+
android:textAppearance="?android:textAppearanceSmall"
96+
android:textColor="@color/colorAccent_comprehension" />
7497

75-
<Button
76-
android:id="@+id/restart"
77-
android:layout_width="wrap_content"
78-
android:layout_height="wrap_content"
79-
android:layout_alignParentBottom="true"
80-
android:layout_toLeftOf="@+id/exit"
81-
android:layout_toStartOf="@+id/exit"
82-
android:background="@android:color/transparent"
83-
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
84-
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
85-
android:paddingRight="@dimen/activity_vertical_margin_simulator"
86-
android:paddingTop="@dimen/activity_vertical_margin_simulator"
87-
android:text="@string/restart"
88-
android:textAppearance="?android:textAppearanceSmall"
89-
android:textColor="@color/black_secondary_text" />
90-
</RelativeLayout>
91-
</android.support.v7.widget.CardView>
98+
<Button
99+
android:id="@+id/restart"
100+
android:layout_width="wrap_content"
101+
android:layout_height="wrap_content"
102+
android:layout_alignParentBottom="true"
103+
android:layout_toLeftOf="@+id/exit"
104+
android:layout_toStartOf="@+id/exit"
105+
android:background="@android:color/transparent"
106+
android:paddingBottom="@dimen/activity_vertical_margin_simulator"
107+
android:paddingLeft="@dimen/activity_vertical_margin_simulator"
108+
android:paddingRight="@dimen/activity_vertical_margin_simulator"
109+
android:paddingTop="@dimen/activity_vertical_margin_simulator"
110+
android:text="@string/restart_comprehension"
111+
android:textAppearance="?android:textAppearanceSmall"
112+
android:textColor="@color/black_secondary_text" />
113+
</RelativeLayout>
114+
</android.support.v7.widget.CardView>
115+
</LinearLayout>

‎source-code/app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,5 +268,6 @@
268268
<string name="comprehension_template_timer_hint">Enter time</string>
269269
<string name="comprehension_edit_meta_title">Edit Meta Details</string>
270270
<string name="meta_add_help">Click Add button to start adding meta details</string>
271+
<string name="restart_comprehension">RESTART</string>
271272

272273
</resources>

0 commit comments

Comments
 (0)