sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

Merge branch 'develop' into feature/teacher-absence

Browse Source
This commit is contained in:
Kacper Ziubryniewicz
2019-09-29 16:09:38 +02:00
parent c8f24611ba 1a74c2a174
commit b17675ec0c
6 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
View File

@ -755,7 +755,7 @@ class MainActivity : AppCompatActivity() {
drawer.setSelection(target.id, fireOnClick = false)
navView.toolbar.setTitle(target.title ?: target.name)
navView.bottomBar.fabEnable = false
navView.bottomBar.fabExtended = true
navView.bottomBar.fabExtended = false
navView.bottomBar.setFabOnClickListener(null)
Log.d("NavDebug", "Navigating from ${navTarget.fragmentClass?.java?.simpleName} to ${target.fragmentClass?.java?.simpleName}")
@ -868,10 +868,16 @@ class MainActivity : AppCompatActivity() {
}, 2000)
}
fun collapseFab() {
fun gainAttentionFAB() {
navView.bottomBar.fabExtended = false
b.navView.postDelayed({
navView.bottomBar.fabExtended = true
}, 1000)
b.navView.postDelayed({
navView.bottomBar.fabExtended = false
}, 2000)
}, 3000)
}
/* _____ _ _

32
app/src/main/java/pl/szczodrzynski/edziennik/data/api/Librus.java
View File

@ -294,6 +294,7 @@ public class Librus implements EdziennikInterface {
targetEndpoints.add("DescriptiveGrades");
targetEndpoints.add("TextGrades");
targetEndpoints.add("BehaviourGrades");
targetEndpoints.add("GradesComments");
targetEndpoints.add("Events");
targetEndpoints.add("TeacherFreeDays");
@ -369,6 +370,8 @@ public class Librus implements EdziennikInterface {
targetEndpoints.add("DescriptiveGrades");
targetEndpoints.add("TextGrades");
targetEndpoints.add("BehaviourGrades");
targetEndpoints.add("GradesComments");
break;
case FEATURE_HOMEWORK:
targetEndpoints.add("Homework");
@ -514,6 +517,9 @@ public class Librus implements EdziennikInterface {
case "TextGrades":
getTextGrades();
break;
case "GradesComments":
getGradesComments();
break;
case "BehaviourGrades":
getBehaviourGrades();
break;
@ -1977,6 +1983,32 @@ public class Librus implements EdziennikInterface {
});
}
private void getGradesComments() {
callback.onActionStarted(R.string.sync_action_syncing_grade_comments);
apiRequest("Grades/Comments", data -> {
if (data == null) {
r("finish", "GradesComments");
return;
}
JsonArray comments = data.get("Comments").getAsJsonArray();
for (JsonElement commentEl : comments) {
JsonObject comment = commentEl.getAsJsonObject();
long gradeId = comment.get("Grade").getAsJsonObject().get("Id").getAsLong();
String text = comment.get("Text").getAsString();
for (Grade grade : gradeList) {
if (grade.id == gradeId) {
grade.description = text;
break;
}
}
}
r("finish", "GradesComments");
});
}
private void getPointGradesCategories() {
if (!fullSync || !enablePointGrades) {
// cancel every not-full sync; no need to download categories again

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
View File

@ -101,6 +101,6 @@ class HomeworkFragment : Fragment() {
})
activity.gainAttention()
activity.collapseFab()
activity.gainAttentionFAB()
}
}

4
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt
View File

@ -47,8 +47,8 @@ class HomeworkListFragment : Fragment() {
}
val layoutManager = LinearLayoutManager(context)
layoutManager.reverseLayout = false
layoutManager.stackFromEnd = false
layoutManager.reverseLayout = true
layoutManager.stackFromEnd = true
b.homeworkView.setHasFixedSize(true)
b.homeworkView.layoutManager = layoutManager