github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-01-31 13:48:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Gradle] Update CommunityMaterial to v5.8.55.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-03-21 23:39:51 +01:00
parent 177ffd92f7
commit da953c9b1c
23 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -128,7 +128,7 @@ dependencies {
// Iconics & related // Iconics & related
implementation "com.mikepenz:iconics-core:5.2.8" implementation "com.mikepenz:iconics-core:5.2.8"
implementation "com.mikepenz:iconics-views:5.2.8" implementation "com.mikepenz:iconics-views:5.2.8"
implementation "com.mikepenz:community-material-typeface:3.5.95.1-kotlin@aar" implementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar"
implementation "eu.szkolny:szkolny-font:1dab7d64ed" implementation "eu.szkolny:szkolny-font:1dab7d64ed"
// Other dependencies // Other dependencies

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

@ -152,7 +152,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
.withPopToHome(false) .withPopToHome(false)
list += NavTarget(DRAWER_ITEM_TIMETABLE, R.string.menu_timetable, TimetableFragment::class) list += NavTarget(DRAWER_ITEM_TIMETABLE, R.string.menu_timetable, TimetableFragment::class)
.withIcon(CommunityMaterial.Icon2.cmd_timetable) .withIcon(CommunityMaterial.Icon3.cmd_timetable)
.withBadgeTypeId(TYPE_LESSON_CHANGE) .withBadgeTypeId(TYPE_LESSON_CHANGE)
.isInDrawer(true) .isInDrawer(true)
@ -162,7 +162,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
.isInDrawer(true) .isInDrawer(true)
list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesListFragment::class) list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesListFragment::class)
.withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline) .withIcon(CommunityMaterial.Icon3.cmd_numeric_5_box_outline)
.withBadgeTypeId(TYPE_GRADE) .withBadgeTypeId(TYPE_GRADE)
.isInDrawer(true) .isInDrawer(true)
@ -200,7 +200,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
.isBelowSeparator(true) .isBelowSeparator(true)
list += NavTarget(DRAWER_ITEM_SETTINGS, R.string.menu_settings, SettingsNewFragment::class) list += NavTarget(DRAWER_ITEM_SETTINGS, R.string.menu_settings, SettingsNewFragment::class)
.withIcon(CommunityMaterial.Icon2.cmd_settings_outline) .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
.isInDrawer(true) .isInDrawer(true)
.isStatic(true) .isStatic(true)
.isBelowSeparator(true) .isBelowSeparator(true)
@ -208,7 +208,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
// profile settings items // profile settings items
list += NavTarget(DRAWER_PROFILE_ADD_NEW, R.string.menu_add_new_profile, null) list += NavTarget(DRAWER_PROFILE_ADD_NEW, R.string.menu_add_new_profile, null)
.withIcon(CommunityMaterial.Icon2.cmd_plus) .withIcon(CommunityMaterial.Icon3.cmd_plus)
.withDescription(R.string.drawer_add_new_profile_desc) .withDescription(R.string.drawer_add_new_profile_desc)
.isInProfileList(true) .isInProfileList(true)
@ -237,7 +237,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
if (App.devMode) { if (App.devMode) {
list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class) list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
list += NavTarget(TARGET_LAB, R.string.menu_lab, LabFragment::class) list += NavTarget(TARGET_LAB, R.string.menu_lab, LabFragment::class)
.withIcon(CommunityMaterial.Icon.cmd_flask_outline) .withIcon(CommunityMaterial.Icon2.cmd_flask_outline)
.isInDrawer(true) .isInDrawer(true)
.isBelowSeparator(true) .isBelowSeparator(true)
.isStatic(true) .isStatic(true)
@ -520,7 +520,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
CafeBar.builder(this) CafeBar.builder(this)
.content(R.string.rate_snackbar_text) .content(R.string.rate_snackbar_text)
.icon(IconicsDrawable(this).apply { .icon(IconicsDrawable(this).apply {
icon = CommunityMaterial.Icon2.cmd_star_outline icon = CommunityMaterial.Icon3.cmd_star_outline
sizeDp = 20 sizeDp = 20
colorInt = Themes.getPrimaryTextColor(this@MainActivity) colorInt = Themes.getPrimaryTextColor(this@MainActivity)
}) })
@ -565,7 +565,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
BottomSheetSeparatorItem(false), BottomSheetSeparatorItem(false),
BottomSheetPrimaryItem(false) BottomSheetPrimaryItem(false)
.withTitle(R.string.menu_settings) .withTitle(R.string.menu_settings)
.withIcon(CommunityMaterial.Icon2.cmd_settings_outline) .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
.withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_SETTINGS) }), .withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_SETTINGS) }),
BottomSheetPrimaryItem(false) BottomSheetPrimaryItem(false)
.withTitle(R.string.menu_feedback) .withTitle(R.string.menu_feedback)

5
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt
View File

@ -18,7 +18,6 @@ import com.github.tibolte.agendacalendarview.models.CalendarEvent
import com.github.tibolte.agendacalendarview.models.IDayItem import com.github.tibolte.agendacalendarview.models.IDayItem
import com.mikepenz.iconics.IconicsDrawable import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon2
import com.mikepenz.iconics.utils.colorInt import com.mikepenz.iconics.utils.colorInt
import com.mikepenz.iconics.utils.sizeDp import com.mikepenz.iconics.utils.sizeDp
import eu.szkolny.font.SzkolnyFont import eu.szkolny.font.SzkolnyFont
@ -89,7 +88,7 @@ class AgendaFragment : Fragment(), CoroutineScope {
}), }),
BottomSheetPrimaryItem(true) BottomSheetPrimaryItem(true)
.withTitle(R.string.menu_agenda_change_view) .withTitle(R.string.menu_agenda_change_view)
.withIcon(if (type == Profile.AGENDA_DEFAULT) CommunityMaterial.Icon.cmd_calendar_outline else CommunityMaterial.Icon.cmd_format_list_bulleted_square) .withIcon(if (type == Profile.AGENDA_DEFAULT) CommunityMaterial.Icon.cmd_calendar_outline else CommunityMaterial.Icon2.cmd_format_list_bulleted_square)
.withOnClickListener(View.OnClickListener { .withOnClickListener(View.OnClickListener {
activity.bottomSheet.close() activity.bottomSheet.close()
type = if (type == Profile.AGENDA_DEFAULT) Profile.AGENDA_CALENDAR else Profile.AGENDA_DEFAULT type = if (type == Profile.AGENDA_DEFAULT) Profile.AGENDA_CALENDAR else Profile.AGENDA_DEFAULT
@ -111,7 +110,7 @@ class AgendaFragment : Fragment(), CoroutineScope {
activity.navView.bottomBar.fabEnable = true activity.navView.bottomBar.fabEnable = true
activity.navView.bottomBar.fabExtendedText = getString(R.string.add) activity.navView.bottomBar.fabExtendedText = getString(R.string.add)
activity.navView.bottomBar.fabIcon = Icon2.cmd_plus activity.navView.bottomBar.fabIcon = CommunityMaterial.Icon3.cmd_plus
activity.navView.setFabOnClickListener(View.OnClickListener { activity.navView.setFabOnClickListener(View.OnClickListener {
EventManualDialog(activity, app.profileId, defaultDate = actualDate) EventManualDialog(activity, app.profileId, defaultDate = actualDate)
}) })

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt
View File

@ -60,7 +60,7 @@ class AttendanceFragment : Fragment(), CoroutineScope {
activity.bottomSheet.prependItems( activity.bottomSheet.prependItems(
BottomSheetPrimaryItem(true) BottomSheetPrimaryItem(true)
.withTitle(R.string.menu_attendance_config) .withTitle(R.string.menu_attendance_config)
.withIcon(CommunityMaterial.Icon2.cmd_settings_outline) .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
.withOnClickListener(View.OnClickListener { .withOnClickListener(View.OnClickListener {
activity.bottomSheet.close() activity.bottomSheet.close()
AttendanceConfigDialog(activity, true, null, null) AttendanceConfigDialog(activity, true, null, null)

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
View File

@ -50,7 +50,7 @@ class NoticesAdapter//getting the context and product list with constructor
if (notice.type == Notice.TYPE_POSITIVE) { if (notice.type == Notice.TYPE_POSITIVE) {
holder.noticesItemType.setImageDrawable( holder.noticesItemType.setImageDrawable(
IconicsDrawable(context, CommunityMaterial.Icon2.cmd_plus_circle_outline).apply { IconicsDrawable(context, CommunityMaterial.Icon3.cmd_plus_circle_outline).apply {
colorRes = R.color.md_green_600 colorRes = R.color.md_green_600
sizeDp = 36 sizeDp = 36
} }

5
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
View File

@ -15,7 +15,6 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon2
import kotlinx.coroutines.* import kotlinx.coroutines.*
import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.*
import pl.szczodrzynski.edziennik.MainActivity.Companion.TARGET_GRADES_EDITOR import pl.szczodrzynski.edziennik.MainActivity.Companion.TARGET_GRADES_EDITOR
@ -71,7 +70,7 @@ 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 { grades -> this@GradesListFragment.launch { app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(viewLifecycleOwner, Observer { grades -> this@GradesListFragment.launch {
if (!isAdded) return@launch if (!isAdded) return@launch
val items = when { val items = when {
@ -135,7 +134,7 @@ class GradesListFragment : Fragment(), CoroutineScope {
activity.bottomSheet.prependItems( activity.bottomSheet.prependItems(
BottomSheetPrimaryItem(true) BottomSheetPrimaryItem(true)
.withTitle(R.string.menu_grades_config) .withTitle(R.string.menu_grades_config)
.withIcon(Icon2.cmd_settings_outline) .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
.withOnClickListener(View.OnClickListener { .withOnClickListener(View.OnClickListener {
activity.bottomSheet.close() activity.bottomSheet.close()
GradesConfigDialog(activity, true, null, null) GradesConfigDialog(activity, true, null, null)

4
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
View File

@ -88,7 +88,7 @@ class HomeTimetableCard(
holder.root += b.root holder.root += b.root
b.settings.setImageDrawable( b.settings.setImageDrawable(
IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_settings_outline).apply { IconicsDrawable(activity, CommunityMaterial.Icon.cmd_cog_outline).apply {
colorAttr(activity, R.attr.colorIcon) colorAttr(activity, R.attr.colorIcon)
sizeDp = 20 sizeDp = 20
} }
@ -102,7 +102,7 @@ class HomeTimetableCard(
) )
b.showCounter.setImageDrawable( b.showCounter.setImageDrawable(
IconicsDrawable(activity, CommunityMaterial.Icon.cmd_fullscreen).apply { IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_fullscreen).apply {
colorAttr(activity, R.attr.colorIcon) colorAttr(activity, R.attr.colorIcon)
sizeDp = 20 sizeDp = 20
} }

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

@ -100,7 +100,7 @@ class HomeworkFragment : Fragment(), CoroutineScope {
bottomBar.apply { bottomBar.apply {
fabEnable = true fabEnable = true
fabExtendedText = getString(R.string.add) fabExtendedText = getString(R.string.add)
fabIcon = CommunityMaterial.Icon2.cmd_plus fabIcon = CommunityMaterial.Icon3.cmd_plus
} }
setFabOnClickListener(View.OnClickListener { setFabOnClickListener(View.OnClickListener {

8
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
View File

@ -110,7 +110,7 @@ object LoginInfo {
FormField( FormField(
keyName = "accountPin", keyName = "accountPin",
name = R.string.login_hint_pin, name = R.string.login_hint_pin,
icon = CommunityMaterial.Icon2.cmd_lock, icon = CommunityMaterial.Icon2.cmd_lock_outline,
emptyText = R.string.login_error_no_pin, emptyText = R.string.login_error_no_pin,
invalidText = R.string.login_error_incorrect_pin, invalidText = R.string.login_error_incorrect_pin,
errorCodes = mapOf(), errorCodes = mapOf(),
@ -157,7 +157,7 @@ object LoginInfo {
FormField( FormField(
keyName = "symbol", keyName = "symbol",
name = R.string.login_hint_symbol, name = R.string.login_hint_symbol,
icon = CommunityMaterial.Icon2.cmd_school, icon = CommunityMaterial.Icon3.cmd_school_outline,
emptyText = R.string.login_error_no_symbol, emptyText = R.string.login_error_no_symbol,
invalidText = R.string.login_error_incorrect_symbol, invalidText = R.string.login_error_incorrect_symbol,
errorCodes = mapOf( errorCodes = mapOf(
@ -170,7 +170,7 @@ object LoginInfo {
FormField( FormField(
keyName = "devicePin", keyName = "devicePin",
name = R.string.login_hint_pin, name = R.string.login_hint_pin,
icon = CommunityMaterial.Icon2.cmd_lock, icon = CommunityMaterial.Icon2.cmd_lock_outline,
emptyText = R.string.login_error_no_pin, emptyText = R.string.login_error_no_pin,
invalidText = R.string.login_error_incorrect_pin, invalidText = R.string.login_error_incorrect_pin,
errorCodes = mapOf( errorCodes = mapOf(
@ -252,7 +252,7 @@ object LoginInfo {
FormField( FormField(
keyName = "serverName", keyName = "serverName",
name = R.string.login_hint_address, name = R.string.login_hint_address,
icon = CommunityMaterial.Icon2.cmd_web, icon = CommunityMaterial.Icon3.cmd_web,
emptyText = R.string.login_error_no_address, emptyText = R.string.login_error_no_address,
invalidText = R.string.login_error_incorrect_address, invalidText = R.string.login_error_incorrect_address,
errorCodes = mapOf( errorCodes = mapOf(

4
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
View File

@ -65,7 +65,7 @@ class MessageFragment : Fragment(), CoroutineScope {
if (!isAdded) return if (!isAdded) return
b.closeButton.setImageDrawable( b.closeButton.setImageDrawable(
IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_window_close).apply { IconicsDrawable(activity, CommunityMaterial.Icon3.cmd_window_close).apply {
colorAttr(activity, android.R.attr.textColorSecondary) colorAttr(activity, android.R.attr.textColorSecondary)
sizeDp = 12 sizeDp = 12
} }
@ -231,7 +231,7 @@ class MessageFragment : Fragment(), CoroutineScope {
bottomBar.apply { bottomBar.apply {
fabEnable = true fabEnable = true
fabExtendedText = getString(R.string.messages_reply) fabExtendedText = getString(R.string.messages_reply)
fabIcon = CommunityMaterial.Icon2.cmd_reply fabIcon = CommunityMaterial.Icon3.cmd_reply_outline
} }
setFabOnClickListener(View.OnClickListener { setFabOnClickListener(View.OnClickListener {

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
View File

@ -97,7 +97,7 @@ class MessagesFragment : Fragment(), CoroutineScope {
bottomBar.apply { bottomBar.apply {
fabEnable = true fabEnable = true
fabExtendedText = getString(R.string.compose) fabExtendedText = getString(R.string.compose)
fabIcon = CommunityMaterial.Icon2.cmd_pencil_outline fabIcon = CommunityMaterial.Icon3.cmd_pencil_outline
} }
setFabOnClickListener(View.OnClickListener { setFabOnClickListener(View.OnClickListener {

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt
View File

@ -316,7 +316,7 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
activity.navView.bottomBar.apply { activity.navView.bottomBar.apply {
fabEnable = true fabEnable = true
fabExtendedText = getString(R.string.messages_compose_send) fabExtendedText = getString(R.string.messages_compose_send)
fabIcon = CommunityMaterial.Icon2.cmd_send fabIcon = CommunityMaterial.Icon3.cmd_send_outline
setFabOnClickListener(View.OnClickListener { setFabOnClickListener(View.OnClickListener {
sendMessage() sendMessage()

30
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
View File

@ -239,7 +239,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
new MaterialAboutActionItem( new MaterialAboutActionItem(
getString(R.string.settings_profile_notifications_text), getString(R.string.settings_profile_notifications_text),
getString(R.string.settings_profile_notifications_subtext), getString(R.string.settings_profile_notifications_subtext),
icon(CommunityMaterial.Icon.cmd_filter_outline, iconSizeDp, iconColor) icon(CommunityMaterial.Icon2.cmd_filter_outline, iconSizeDp, iconColor)
) )
.setOnClickAction(() -> { .setOnClickAction(() -> {
new NotificationFilterDialog(activity, null, null); new NotificationFilterDialog(activity, null, null);
@ -295,7 +295,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
new MaterialAboutSwitchItem.Builder() new MaterialAboutSwitchItem.Builder()
.text(R.string.settings_theme_snowfall_text) .text(R.string.settings_theme_snowfall_text)
.subText(R.string.settings_theme_snowfall_subtext) .subText(R.string.settings_theme_snowfall_subtext)
.icon(icon(CommunityMaterial.Icon2.cmd_snowflake, iconSizeDp, iconColor)) .icon(icon(CommunityMaterial.Icon3.cmd_snowflake, iconSizeDp, iconColor))
.setChecked(app.getConfig().getUi().getSnowfall()) .setChecked(app.getConfig().getUi().getSnowfall())
.setOnCheckedChanged((item, isChecked) -> { .setOnCheckedChanged((item, isChecked) -> {
app.getConfig().getUi().setSnowfall(isChecked); app.getConfig().getUi().setSnowfall(isChecked);
@ -310,7 +310,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
new MaterialAboutActionItem( new MaterialAboutActionItem(
getString(R.string.settings_theme_theme_text), getString(R.string.settings_theme_theme_text),
Themes.INSTANCE.getThemeName(activity), Themes.INSTANCE.getThemeName(activity),
icon(CommunityMaterial.Icon2.cmd_palette_outline, iconSizeDp, iconColor) icon(CommunityMaterial.Icon3.cmd_palette_outline, iconSizeDp, iconColor)
) )
.setOnClickAction(() -> { .setOnClickAction(() -> {
new MaterialDialog.Builder(activity) new MaterialDialog.Builder(activity)
@ -354,7 +354,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
new MaterialAboutActionItem( new MaterialAboutActionItem(
getString(R.string.settings_theme_mini_drawer_buttons_text), getString(R.string.settings_theme_mini_drawer_buttons_text),
null, null,
icon(CommunityMaterial.Icon.cmd_format_list_checks, iconSizeDp, iconColor) icon(CommunityMaterial.Icon2.cmd_format_list_checks, iconSizeDp, iconColor)
) )
.setOnClickAction(() -> { .setOnClickAction(() -> {
List<Integer> buttonIds = new ArrayList<>(); List<Integer> buttonIds = new ArrayList<>();
@ -472,7 +472,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
items.add( items.add(
new MaterialAboutSwitchItem.Builder( ) new MaterialAboutSwitchItem.Builder( )
.text(R.string.settings_theme_open_drawer_on_back_pressed_text) .text(R.string.settings_theme_open_drawer_on_back_pressed_text)
.icon(icon(CommunityMaterial.Icon2.cmd_menu_open, iconSizeDp, iconColor)) .icon(icon(CommunityMaterial.Icon3.cmd_menu_open, iconSizeDp, iconColor))
.setChecked(app.getConfig().getUi().getOpenDrawerOnBackPressed()) .setChecked(app.getConfig().getUi().getOpenDrawerOnBackPressed())
.setOnCheckedChanged((item, isChecked) -> { .setOnCheckedChanged((item, isChecked) -> {
app.getConfig().getUi().setOpenDrawerOnBackPressed(isChecked); app.getConfig().getUi().setOpenDrawerOnBackPressed(isChecked);
@ -521,7 +521,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
return new MaterialAboutSwitchItem.Builder() return new MaterialAboutSwitchItem.Builder()
.text(R.string.settings_sync_wifi_text) .text(R.string.settings_sync_wifi_text)
.subText(R.string.settings_sync_wifi_subtext) .subText(R.string.settings_sync_wifi_subtext)
.icon(icon(CommunityMaterial.Icon2.cmd_wifi_strength_2, iconSizeDp, iconColor)) .icon(icon(CommunityMaterial.Icon3.cmd_wifi_strength_2, iconSizeDp, iconColor))
.setChecked(app.getConfig().getSync().getOnlyWifi()) .setChecked(app.getConfig().getSync().getOnlyWifi())
.setOnCheckedChanged((item, isChecked) -> { .setOnCheckedChanged((item, isChecked) -> {
app.getConfig().getSync().setOnlyWifi(isChecked); app.getConfig().getSync().setOnlyWifi(isChecked);
@ -721,7 +721,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
new MaterialAboutActionItem( new MaterialAboutActionItem(
getString(R.string.settings_sync_notifications_settings_text), getString(R.string.settings_sync_notifications_settings_text),
getString(R.string.settings_sync_notifications_settings_subtext), getString(R.string.settings_sync_notifications_settings_subtext),
icon(CommunityMaterial.Icon2.cmd_settings_outline, iconSizeDp, iconColor) icon(CommunityMaterial.Icon.cmd_cog_outline, iconSizeDp, iconColor)
) )
.setOnClickAction(() -> { .setOnClickAction(() -> {
String channel = app.getNotificationChannelsManager().getData().getKey(); String channel = app.getNotificationChannelsManager().getData().getKey();
@ -794,7 +794,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
return new MaterialAboutSwitchItem.Builder() return new MaterialAboutSwitchItem.Builder()
.text(R.string.settings_register_shared_events_text) .text(R.string.settings_register_shared_events_text)
.subText(R.string.settings_register_shared_events_subtext) .subText(R.string.settings_register_shared_events_subtext)
.icon(icon(CommunityMaterial.Icon2.cmd_share_outline, iconSizeDp, iconColor)) .icon(icon(CommunityMaterial.Icon3.cmd_share_outline, iconSizeDp, iconColor))
.setChecked(app.getProfile().getEnableSharedEvents()) .setChecked(app.getProfile().getEnableSharedEvents())
.setOnCheckedChanged((item, isChecked) -> { .setOnCheckedChanged((item, isChecked) -> {
app.getProfile().setEnableSharedEvents(isChecked); app.getProfile().setEnableSharedEvents(isChecked);
@ -822,7 +822,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
items.add(new MaterialAboutActionItem( items.add(new MaterialAboutActionItem(
getString(R.string.menu_grades_config), getString(R.string.menu_grades_config),
null, null,
icon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline, iconSizeDp, iconColor) icon(CommunityMaterial.Icon3.cmd_numeric_5_box_outline, iconSizeDp, iconColor)
).setOnClickAction(() -> new GradesConfigDialog(activity, false, null, null))); ).setOnClickAction(() -> new GradesConfigDialog(activity, false, null, null)));
items.add(new MaterialAboutActionItem( items.add(new MaterialAboutActionItem(
@ -958,7 +958,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
new MaterialAboutSwitchItem.Builder() new MaterialAboutSwitchItem.Builder()
.text(R.string.settings_register_count_in_seconds_text) .text(R.string.settings_register_count_in_seconds_text)
.subText(R.string.settings_register_count_in_seconds_subtext) .subText(R.string.settings_register_count_in_seconds_subtext)
.icon(icon(CommunityMaterial.Icon2.cmd_timer, iconSizeDp, iconColor)) .icon(icon(CommunityMaterial.Icon3.cmd_timer, iconSizeDp, iconColor))
.setChecked(app.getConfig().getTimetable().getCountInSeconds()) .setChecked(app.getConfig().getTimetable().getCountInSeconds())
.setOnCheckedChanged((item, isChecked) -> { .setOnCheckedChanged((item, isChecked) -> {
app.getConfig().getTimetable().setCountInSeconds(isChecked); app.getConfig().getTimetable().setCountInSeconds(isChecked);
@ -986,7 +986,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
items.add( items.add(
new MaterialAboutSwitchItem.Builder() new MaterialAboutSwitchItem.Builder()
.text(R.string.settings_register_hide_sticks_from_old) .text(R.string.settings_register_hide_sticks_from_old)
.icon(icon(CommunityMaterial.Icon2.cmd_numeric_1_box_outline, iconSizeDp, iconColor)) .icon(icon(CommunityMaterial.Icon3.cmd_numeric_1_box_outline, iconSizeDp, iconColor))
.setChecked(app.getConfig().forProfile().getGrades().getHideSticksFromOld()) .setChecked(app.getConfig().forProfile().getGrades().getHideSticksFromOld())
.setOnCheckedChanged((item, isChecked) -> { .setOnCheckedChanged((item, isChecked) -> {
app.getConfig().forProfile().getGrades().setHideSticksFromOld(isChecked); app.getConfig().forProfile().getGrades().setHideSticksFromOld(isChecked);
@ -1041,7 +1041,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
items.add(new MaterialAboutActionItem.Builder() items.add(new MaterialAboutActionItem.Builder()
.text(R.string.settings_about_privacy_policy_text) .text(R.string.settings_about_privacy_policy_text)
.icon(icon(CommunityMaterial.Icon2.cmd_shield_outline, iconSizeDp, primaryTextOnPrimaryBg)) .icon(icon(CommunityMaterial.Icon3.cmd_shield_outline, iconSizeDp, primaryTextOnPrimaryBg))
.setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://szkolny.eu/privacy-policy"))) .setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://szkolny.eu/privacy-policy")))
.build()); .build());
@ -1055,7 +1055,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
items.add(new MaterialAboutActionItem.Builder() items.add(new MaterialAboutActionItem.Builder()
.text(R.string.settings_about_language_text) .text(R.string.settings_about_language_text)
.subText(R.string.settings_about_language_subtext) .subText(R.string.settings_about_language_subtext)
.icon(icon(CommunityMaterial.Icon2.cmd_translate, iconSizeDp, primaryTextOnPrimaryBg)) .icon(icon(CommunityMaterial.Icon3.cmd_translate, iconSizeDp, primaryTextOnPrimaryBg))
.setOnClickAction(() -> { .setOnClickAction(() -> {
new MaterialDialog.Builder(activity) new MaterialDialog.Builder(activity)
.title(getString(R.string.settings_about_language_dialog_title)) .title(getString(R.string.settings_about_language_dialog_title))
@ -1090,7 +1090,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
items.add(new MaterialAboutActionItem.Builder() items.add(new MaterialAboutActionItem.Builder()
.text(R.string.settings_about_update_text) .text(R.string.settings_about_update_text)
.subText(R.string.settings_about_update_subtext) .subText(R.string.settings_about_update_subtext)
.icon(icon(CommunityMaterial.Icon2.cmd_update, iconSizeDp, primaryTextOnPrimaryBg)) .icon(icon(CommunityMaterial.Icon3.cmd_update, iconSizeDp, primaryTextOnPrimaryBg))
.setOnClickAction(() -> { .setOnClickAction(() -> {
//open browser or intent here //open browser or intent here
NetworkUtils net = new NetworkUtils(app); NetworkUtils net = new NetworkUtils(app);
@ -1110,7 +1110,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
items.add(new MaterialAboutActionItem.Builder() items.add(new MaterialAboutActionItem.Builder()
.text(R.string.settings_about_changelog_text) .text(R.string.settings_about_changelog_text)
.icon(icon(CommunityMaterial.Icon2.cmd_radar, iconSizeDp, primaryTextOnPrimaryBg)) .icon(icon(CommunityMaterial.Icon3.cmd_radar, iconSizeDp, primaryTextOnPrimaryBg))
.setOnClickAction(() -> new ChangelogDialog(activity, null, null)) .setOnClickAction(() -> new ChangelogDialog(activity, null, null))
.build()); .build());

3
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
View File

@ -17,7 +17,6 @@ import android.widget.Toast
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon2
import com.wdullaer.materialdatetimepicker.date.DatePickerDialog import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
import eu.szkolny.font.SzkolnyFont import eu.szkolny.font.SzkolnyFont
import kotlinx.coroutines.* import kotlinx.coroutines.*
@ -192,7 +191,7 @@ class TimetableFragment : Fragment(), CoroutineScope {
BottomSheetPrimaryItem(true) BottomSheetPrimaryItem(true)
.withTitle(R.string.menu_generate_block_timetable) .withTitle(R.string.menu_generate_block_timetable)
.withDescription(R.string.menu_generate_block_timetable_desc) .withDescription(R.string.menu_generate_block_timetable_desc)
.withIcon(Icon2.cmd_table_large) .withIcon(CommunityMaterial.Icon3.cmd_table_large)
.withOnClickListener(View.OnClickListener { .withOnClickListener(View.OnClickListener {
activity.bottomSheet.close() activity.bottomSheet.close()
GenerateBlockTimetableDialog(activity) GenerateBlockTimetableDialog(activity)

4
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt
View File

@ -69,7 +69,7 @@ class AttachmentAdapter(
"jpg", "jpeg", "png", "bmp", "gif" -> SzkolnyFont.Icon.szf_file_image_outline "jpg", "jpeg", "png", "bmp", "gif" -> SzkolnyFont.Icon.szf_file_image_outline
"zip", "rar", "tar", "7z" -> SzkolnyFont.Icon.szf_zip_box_outline "zip", "rar", "tar", "7z" -> SzkolnyFont.Icon.szf_zip_box_outline
"html", "cpp", "c", "h", "css", "java", "py" -> SzkolnyFont.Icon.szf_file_code_outline "html", "cpp", "c", "h", "css", "java", "py" -> SzkolnyFont.Icon.szf_file_code_outline
else -> CommunityMaterial.Icon.cmd_file_document_outline else -> CommunityMaterial.Icon2.cmd_file_document_outline
} }
b.chip.text = if (item.isDownloading) { b.chip.text = if (item.isDownloading) {
@ -83,7 +83,7 @@ class AttachmentAdapter(
b.chip.chipIcon = IconicsDrawable(context).apply { b.chip.chipIcon = IconicsDrawable(context).apply {
icon = attachmentIcon icon = attachmentIcon
colorAttr(context, R.attr.colorSurface) colorAttr(context, R.attr.colorOnSurface)
sizeDp = 24 sizeDp = 24
paddingDp = 2 paddingDp = 2
} }

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
View File

@ -117,7 +117,7 @@ class WidgetTimetableProvider : AppWidgetProvider() {
views.setImageViewBitmap( views.setImageViewBitmap(
R.id.widgetTimetableRefresh, R.id.widgetTimetableRefresh,
IconicsDrawable(context, CommunityMaterial.Icon2.cmd_refresh).apply { IconicsDrawable(context, CommunityMaterial.Icon3.cmd_refresh).apply {
colorInt = Color.WHITE colorInt = Color.WHITE
sizeDp = if (config.bigStyle) 24 else 16 sizeDp = if (config.bigStyle) 24 else 16
}.toBitmap() }.toBitmap()

25
app/src/main/res/layout/dialog_event_details.xml
View File

@ -206,6 +206,7 @@
app:flexWrap="wrap" app:flexWrap="wrap"
app:justifyContent="flex_end"> app:justifyContent="flex_end">
<!-- cmd_eye_check_outline -->
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/checkDoneButton" android:id="@+id/checkDoneButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@ -213,53 +214,57 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:checkable="true" android:checkable="true"
android:fontFamily="@font/community_material_font_v3_5_95_1" android:fontFamily="@font/community_material_font_v5_8_55"
android:minWidth="0dp" android:minWidth="0dp"
android:text="\uFCE1" android:text="\uf4df"
android:textSize="20sp" /> android:textSize="20sp" />
<!-- cmd_pencil_outline -->
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/editButton" android:id="@+id/editButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:fontFamily="@font/community_material_font_v3_5_95_1" android:fontFamily="@font/community_material_font_v5_8_55"
android:minWidth="0dp" android:minWidth="0dp"
android:text="\uFC92" android:text="\uf2f4"
android:textSize="20sp" /> android:textSize="20sp" />
<!-- cmd_calendar_export -->
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/saveInCalendarButton" android:id="@+id/saveInCalendarButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:fontFamily="@font/community_material_font_v3_5_95_1" android:fontFamily="@font/community_material_font_v5_8_55"
android:minWidth="0dp" android:minWidth="0dp"
android:text="\uFB09" android:text="\uf97a"
android:textSize="20sp" /> android:textSize="20sp" />
<!-- cmd_cursor_default_click_outline -->
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/goToTimetableButton" android:id="@+id/goToTimetableButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:fontFamily="@font/community_material_font_v3_5_95_1" android:fontFamily="@font/community_material_font_v5_8_55"
android:minWidth="0dp" android:minWidth="0dp"
android:text="\uFCDA" android:text="\ufc90"
android:textSize="20sp" /> android:textSize="20sp" />
<!-- cmd_download_outline -->
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/downloadButton" android:id="@+id/downloadButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:fontFamily="@font/community_material_font_v3_5_95_1" android:fontFamily="@font/community_material_font_v5_8_55"
android:minWidth="0dp" android:minWidth="0dp"
android:text="\uFB6B" android:text="\uf436"
android:textSize="20sp" /> android:textSize="20sp" />
</com.google.android.flexbox.FlexboxLayout> </com.google.android.flexbox.FlexboxLayout>
</LinearLayout> </LinearLayout>

5
app/src/main/res/layout/event_list_item.xml
View File

@ -73,14 +73,15 @@
android:textAppearance="@style/NavView.TextView.Medium" android:textAppearance="@style/NavView.TextView.Medium"
tools:text="Rozdział II: Panowanie Piastów i Jagiellonów.Przeniesiony z 11 grudnia. Nie wiem co się dzieje w tym roku nie będzie już religii w szkołach podstawowych w Polsce i Europie zachodniej Afryki" /> tools:text="Rozdział II: Panowanie Piastów i Jagiellonów.Przeniesiony z 11 grudnia. Nie wiem co się dzieje w tym roku nie będzie już religii w szkołach podstawowych w Polsce i Europie zachodniej Afryki" />
<!-- cmd_pencil_outline -->
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/editButton" android:id="@+id/editButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/community_material_font_v3_5_95_1" android:fontFamily="@font/community_material_font_v5_8_55"
android:minWidth="0dp" android:minWidth="0dp"
android:text="\uFC92" android:text="\uf2f4"
android:textSize="20sp" android:textSize="20sp"
tools:visibility="gone" /> tools:visibility="gone" />

2
app/src/main/res/layout/login_chooser_fragment.xml
View File

@ -18,7 +18,7 @@
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="24dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
app:iiv_color="@color/colorPrimary" app:iiv_color="@color/colorPrimary"
app:iiv_icon="cmd-school" app:iiv_icon="cmd-school-outline"
app:iiv_size="32dp" app:iiv_size="32dp"
tools:srcCompat="@tools:sample/avatars" /> tools:srcCompat="@tools:sample/avatars" />

2
app/src/main/res/layout/login_form_fragment.xml
View File

@ -29,7 +29,7 @@
android:layout_height="32dp" android:layout_height="32dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
app:iiv_color="@color/colorPrimary" app:iiv_color="@color/colorPrimary"
app:iiv_icon="cmd-account-circle" app:iiv_icon="cmd-account-circle-outline"
app:iiv_size="32dp" app:iiv_size="32dp"
tools:srcCompat="@tools:sample/avatars" /> tools:srcCompat="@tools:sample/avatars" />

2
app/src/main/res/layout/login_platform_list_fragment.xml
View File

@ -18,7 +18,7 @@
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="24dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
app:iiv_color="@color/colorPrimary" app:iiv_color="@color/colorPrimary"
app:iiv_icon="cmd-tooltip-account" app:iiv_icon="cmd-comment-account-outline"
app:iiv_size="32dp" app:iiv_size="32dp"
tools:srcCompat="@tools:sample/avatars" /> tools:srcCompat="@tools:sample/avatars" />

2
app/src/main/res/layout/login_summary_fragment.xml
View File

@ -28,7 +28,7 @@
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="24dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
app:iiv_color="@color/colorPrimary" app:iiv_color="@color/colorPrimary"
app:iiv_icon="cmd-account-check" app:iiv_icon="cmd-account-check-outline"
app:iiv_size="32dp" app:iiv_size="32dp"
tools:srcCompat="@tools:sample/avatars" /> tools:srcCompat="@tools:sample/avatars" />

2
app/src/main/res/layout/message_fragment.xml
View File

@ -217,7 +217,7 @@
android:layout_height="24dp" android:layout_height="24dp"
android:padding="4dp" android:padding="4dp"
app:iiv_color="?android:textColorSecondary" app:iiv_color="?android:textColorSecondary"
app:iiv_icon="cmd-reply" app:iiv_icon="cmd-reply-outline"
tools:srcCompat="@android:drawable/ic_menu_revert" /> tools:srcCompat="@android:drawable/ic_menu_revert" />
<TextView <TextView