forked from github/szkolny
[Settings/Grades] Add hiding sticks from old.
This commit is contained in:
parent
752cdfa8d6
commit
5c84086f42
@ -49,4 +49,9 @@ class ProfileConfigGrades(private val config: ProfileConfig) {
|
|||||||
var dontCountGrades: List<String>
|
var dontCountGrades: List<String>
|
||||||
get() { mDontCountGrades = mDontCountGrades ?: config.values.get("dontCountGrades", listOf()); return mDontCountGrades ?: listOf() }
|
get() { mDontCountGrades = mDontCountGrades ?: config.values.get("dontCountGrades", listOf()); return mDontCountGrades ?: listOf() }
|
||||||
set(value) { config.set("dontCountGrades", value); mDontCountGrades = value }
|
set(value) { config.set("dontCountGrades", value); mDontCountGrades = value }
|
||||||
|
|
||||||
|
private var mHideSticksFromOld: Boolean? = null
|
||||||
|
var hideSticksFromOld: Boolean
|
||||||
|
get() { mHideSticksFromOld = mHideSticksFromOld ?: config.values.get("hideSticksFromOld", false); return mHideSticksFromOld ?: false }
|
||||||
|
set(value) { config.set("hideSticksFromOld", value); mHideSticksFromOld = value }
|
||||||
}
|
}
|
||||||
|
@ -71,9 +71,14 @@ class GradesListFragment : Fragment(), CoroutineScope {
|
|||||||
val adapter = GradesAdapter(activity)
|
val adapter = GradesAdapter(activity)
|
||||||
var firstRun = true
|
var firstRun = true
|
||||||
|
|
||||||
app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(this@GradesListFragment, Observer { items -> this@GradesListFragment.launch {
|
app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(this@GradesListFragment, Observer { grades -> this@GradesListFragment.launch {
|
||||||
if (!isAdded) return@launch
|
if (!isAdded) return@launch
|
||||||
|
|
||||||
|
val items = when {
|
||||||
|
app.config.forProfile().grades.hideSticksFromOld && App.devMode -> grades.filter { it.value != 1.0f }
|
||||||
|
else -> grades
|
||||||
|
}
|
||||||
|
|
||||||
// load & configure the adapter
|
// load & configure the adapter
|
||||||
adapter.items = withContext(Dispatchers.Default) { processGrades(items) }
|
adapter.items = withContext(Dispatchers.Default) { processGrades(items) }
|
||||||
if (items.isNotNullNorEmpty() && b.list.adapter == null) {
|
if (items.isNotNullNorEmpty() && b.list.adapter == null) {
|
||||||
|
@ -1059,6 +1059,24 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (App.Companion.getDevMode()) {
|
||||||
|
items.add(
|
||||||
|
new MaterialAboutSwitchItem(
|
||||||
|
getString(R.string.settings_register_hide_sticks_from_old),
|
||||||
|
null,
|
||||||
|
new IconicsDrawable(activity)
|
||||||
|
.icon(CommunityMaterial.Icon2.cmd_numeric_1_box_outline)
|
||||||
|
.size(IconicsSize.dp(iconSizeDp))
|
||||||
|
.color(IconicsColor.colorInt(iconColor))
|
||||||
|
)
|
||||||
|
.setChecked(app.getConfig().forProfile().getGrades().getHideSticksFromOld())
|
||||||
|
.setOnChangeAction((isChecked, tag) -> {
|
||||||
|
app.getConfig().forProfile().getGrades().setHideSticksFromOld(isChecked);
|
||||||
|
return true;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
@ -1233,4 +1233,5 @@
|
|||||||
<string name="permissions_attachment">In order to download the file, you have to grant file storage permission for the application.\n\nClick OK to grant the permission.</string>
|
<string name="permissions_attachment">In order to download the file, you have to grant file storage permission for the application.\n\nClick OK to grant the permission.</string>
|
||||||
<string name="permissions_denied">You denied the required permissions for the application.\n\nIn order to grant the permission, open the Permissions screen for Szkolny.eu in phone settings.\n\nClick OK to open app settings now.</string>
|
<string name="permissions_denied">You denied the required permissions for the application.\n\nIn order to grant the permission, open the Permissions screen for Szkolny.eu in phone settings.\n\nClick OK to open app settings now.</string>
|
||||||
<string name="permissions_required">Required permissions</string>
|
<string name="permissions_required">Required permissions</string>
|
||||||
|
<string name="settings_register_hide_sticks_from_old">Your mother won\'t see your F grades</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -1378,4 +1378,5 @@
|
|||||||
<string name="home_availability_info">Zobacz więcej</string>
|
<string name="home_availability_info">Zobacz więcej</string>
|
||||||
<string name="home_availability_update">Aktualizuj</string>
|
<string name="home_availability_update">Aktualizuj</string>
|
||||||
<string name="register_unavailable_read_more">Dowiedz się więcej</string>
|
<string name="register_unavailable_read_more">Dowiedz się więcej</string>
|
||||||
|
<string name="settings_register_hide_sticks_from_old">Stara nie zobaczy pał</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user