github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Show grades average from register if exist instead of calculating (#374)

Browse Source
This commit is contained in:
Mikołaj Pich
2019-05-31 14:40:53 +02:00
committed by Rafał Borcz
parent 383cab4dae
commit 0f75ff3206
15 changed files with 1607 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/res/layout/item_grade_summary.xml
View File

@ -24,7 +24,7 @@
android:layout_marginRight="40dp"
android:layout_weight="1"
android:textSize="17sp"
tools:text="@tools:sample/lorem" />
tools:text="Fizyka" />
<TextView
android:id="@+id/gradeSummaryItemAverage"
@ -32,7 +32,39 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textSize="12sp"
tools:text="@string/aboutlibrary_lib_version" />
tools:text="4.74" />
</LinearLayout>
<LinearLayout
android:id="@+id/gradeSummaryItemPointsContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_all_divider"
android:minHeight="35dp"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"
android:layout_weight="1"
android:text="@string/grade_summary_points"
android:textSize="14sp" />
<TextView
android:id="@+id/gradeSummaryItemPoints"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_marginEnd="25dp"
android:layout_marginRight="25dp"
android:gravity="end"
android:textSize="12sp"
tools:text="123/150" />
</LinearLayout>
<LinearLayout
@ -63,7 +95,7 @@
android:layout_marginRight="25dp"
android:gravity="end"
android:textSize="12sp"
tools:text="@string/aboutlibrary_lib_version" />
tools:text="dobry" />
</LinearLayout>
<LinearLayout
@ -94,6 +126,6 @@
android:layout_marginRight="25dp"
android:gravity="end"
android:textSize="12sp"
tools:text="@string/aboutlibrary_lib_version" />
tools:text="bardzo dobry" />
</LinearLayout>
</LinearLayout>

1
app/src/main/res/values-pl/strings.xml
View File

@ -57,6 +57,7 @@
<string name="grade_no_average">Brak średniej</string>
<string name="grade_predicted">Przewidywana: %1$s</string>
<string name="grade_final">Końcowa: %1$s</string>
<string name="grade_summary_points">Suma punktów</string>
<string name="grade_summary_final_grade">Ocena końcowa</string>
<string name="grade_summary_predicted_grade">Przewidywana ocena</string>
<string name="grade_summary_calculated_average">Obliczona średnia</string>

1
app/src/main/res/values/strings.xml
View File

@ -57,6 +57,7 @@
<string name="grade_no_average">No average</string>
<string name="grade_predicted">Predicted: %1$s</string>
<string name="grade_final">Final: %1$s</string>
<string name="grade_summary_points">Total points</string>
<string name="grade_summary_final_grade">Final grade</string>
<string name="grade_summary_predicted_grade">Predicted grade</string>
<string name="grade_summary_calculated_average">Calculated average</string>