From 86b6060a092050d13aaad173ea82212208481d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Sat, 23 Nov 2019 18:32:18 +0100 Subject: [PATCH] [UI] Migrate to outlined icons. --- .../szczodrzynski/edziennik/MainActivity.kt | 32 ++++++------- .../edziennik/WidgetTimetable.kt | 2 +- .../ui/dialogs/event/EventManualDialog.java | 2 +- .../ui/modules/agenda/AgendaFragment.java | 26 +++++----- .../announcements/AnnouncementsFragment.java | 2 +- .../attendance/AttendanceFragment.java | 4 +- .../modules/behaviour/BehaviourFragment.java | 2 +- .../ui/modules/behaviour/NoticesAdapter.kt | 15 +++--- .../ui/modules/grades/GradesFragment.java | 4 +- .../ui/modules/home/HomeFragment.java | 5 +- .../ui/modules/homework/HomeworkFragment.kt | 5 +- .../ui/modules/login/LoginVulcanFragment.java | 2 +- .../ui/modules/messages/MessageFragment.kt | 22 +++++---- .../settings/SettingsLicenseActivity.kt | 2 +- .../modules/settings/SettingsNewFragment.java | 37 +++++++------- .../modules/timetable/TimetableFragment.java | 5 +- .../modules/timetable/v2/TimetableFragment.kt | 4 +- .../notifications/WidgetNotifications.java | 2 +- build.gradle | 2 +- settings.gradle | 2 +- szkolny-font/build.gradle | 8 ++-- .../library/szkolny/font/SzkolnyFont.kt | 45 ++++++++++-------- .../main/res/font/szkolny_font_font_v1_0.ttf | Bin 6136 -> 0 bytes .../main/res/font/szkolny_font_font_v1_1.ttf | Bin 0 -> 11232 bytes 24 files changed, 122 insertions(+), 108 deletions(-) delete mode 100644 szkolny-font/src/main/res/font/szkolny_font_font_v1_0.ttf create mode 100644 szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt index 7e5eb17e..64dec607 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt @@ -124,7 +124,7 @@ class MainActivity : AppCompatActivity() { // home item list += NavTarget(DRAWER_ITEM_HOME, R.string.menu_home_page, HomeFragment::class) .withTitle(R.string.app_name) - .withIcon(CommunityMaterial.Icon2.cmd_home) + .withIcon(CommunityMaterial.Icon2.cmd_home_outline) .isInDrawer(true) .isStatic(true) .withPopToHome(false) @@ -135,50 +135,50 @@ class MainActivity : AppCompatActivity() { .isInDrawer(true) list += NavTarget(DRAWER_ITEM_AGENDA, R.string.menu_agenda, AgendaFragment::class) - .withIcon(CommunityMaterial.Icon.cmd_calendar) + .withIcon(CommunityMaterial.Icon.cmd_calendar_outline) .withBadgeTypeId(TYPE_EVENT) .isInDrawer(true) list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesFragment::class) - .withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box) + .withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline) .withBadgeTypeId(TYPE_GRADE) .isInDrawer(true) list += NavTarget(DRAWER_ITEM_MESSAGES, R.string.menu_messages, MessagesFragment::class) - .withIcon(CommunityMaterial.Icon.cmd_email) + .withIcon(CommunityMaterial.Icon.cmd_email_outline) .withBadgeTypeId(TYPE_MESSAGE) .isInDrawer(true) list += NavTarget(DRAWER_ITEM_HOMEWORK, R.string.menu_homework, HomeworkFragment::class) - .withIcon(SzkolnyFont.Icon.szf_file_document_edit) + .withIcon(SzkolnyFont.Icon.szf_notebook_outline) .withBadgeTypeId(TYPE_HOMEWORK) .isInDrawer(true) list += NavTarget(DRAWER_ITEM_BEHAVIOUR, R.string.menu_notices, BehaviourFragment::class) - .withIcon(CommunityMaterial.Icon2.cmd_message_alert) + .withIcon(CommunityMaterial.Icon.cmd_emoticon_outline) .withBadgeTypeId(TYPE_NOTICE) .isInDrawer(true) list += NavTarget(DRAWER_ITEM_ATTENDANCE, R.string.menu_attendance, AttendanceFragment::class) - .withIcon(CommunityMaterial.Icon.cmd_calendar_remove) + .withIcon(CommunityMaterial.Icon.cmd_calendar_remove_outline) .withBadgeTypeId(TYPE_ATTENDANCE) .isInDrawer(true) list += NavTarget(DRAWER_ITEM_ANNOUNCEMENTS, R.string.menu_announcements, AnnouncementsFragment::class) - .withIcon(CommunityMaterial.Icon.cmd_bulletin_board) + .withIcon(CommunityMaterial.Icon.cmd_bullhorn_outline) .withBadgeTypeId(TYPE_ANNOUNCEMENT) .isInDrawer(true) // static drawer items list += NavTarget(DRAWER_ITEM_NOTIFICATIONS, R.string.menu_notifications, NotificationsFragment::class) - .withIcon(CommunityMaterial.Icon.cmd_bell_ring) + .withIcon(CommunityMaterial.Icon.cmd_bell_ring_outline) .isInDrawer(true) .isStatic(true) .isBelowSeparator(true) list += NavTarget(DRAWER_ITEM_SETTINGS, R.string.menu_settings, SettingsNewFragment::class) - .withIcon(CommunityMaterial.Icon2.cmd_settings) + .withIcon(CommunityMaterial.Icon2.cmd_settings_outline) .isInDrawer(true) .isStatic(true) .isBelowSeparator(true) @@ -197,7 +197,7 @@ class MainActivity : AppCompatActivity() { .isInProfileList(false) list += NavTarget(DRAWER_PROFILE_SYNC_ALL, R.string.menu_sync_all, null) - .withIcon(CommunityMaterial.Icon2.cmd_sync) + .withIcon(CommunityMaterial.Icon.cmd_download_outline) .isInProfileList(true) @@ -434,7 +434,7 @@ class MainActivity : AppCompatActivity() { navView.coordinator.postDelayed({ CafeBar.builder(this) .content(R.string.rate_snackbar_text) - .icon(IconicsDrawable(this).icon(CommunityMaterial.Icon2.cmd_star).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.getPrimaryTextColor(this)))) + .icon(IconicsDrawable(this).icon(CommunityMaterial.Icon2.cmd_star_outline).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.getPrimaryTextColor(this)))) .positiveText(R.string.rate_snackbar_positive) .positiveColor(-0xb350b0) .negativeText(R.string.rate_snackbar_negative) @@ -471,7 +471,7 @@ class MainActivity : AppCompatActivity() { bottomSheet.appendItems( BottomSheetPrimaryItem(false) .withTitle(R.string.menu_sync) - .withIcon(CommunityMaterial.Icon2.cmd_sync) + .withIcon(CommunityMaterial.Icon.cmd_download_outline) .withOnClickListener(View.OnClickListener { bottomSheet.close() SyncViewListDialog(this, navTargetId) @@ -479,17 +479,17 @@ class MainActivity : AppCompatActivity() { BottomSheetSeparatorItem(false), BottomSheetPrimaryItem(false) .withTitle(R.string.menu_settings) - .withIcon(CommunityMaterial.Icon2.cmd_settings) + .withIcon(CommunityMaterial.Icon2.cmd_settings_outline) .withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_SETTINGS) }), BottomSheetPrimaryItem(false) .withTitle(R.string.menu_feedback) - .withIcon(CommunityMaterial.Icon2.cmd_help_circle) + .withIcon(CommunityMaterial.Icon2.cmd_help_circle_outline) .withOnClickListener(View.OnClickListener { loadTarget(TARGET_FEEDBACK) }) ) if (App.devMode) { bottomSheet += BottomSheetPrimaryItem(false) .withTitle(R.string.menu_debug) - .withIcon(CommunityMaterial.Icon.cmd_android_debug_bridge) + .withIcon(CommunityMaterial.Icon.cmd_android_studio) .withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_DEBUG) }) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt index ea5deca1..8a28d1f3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt @@ -87,7 +87,7 @@ class WidgetTimetable : AppWidgetProvider() { .colorInt(Color.WHITE) .sizeDp(if (widgetConfig.bigStyle) 24 else 16).toBitmap()) - views.setImageViewBitmap(R.id.widgetTimetableSync, IconicsDrawable(context, CommunityMaterial.Icon2.cmd_sync) + views.setImageViewBitmap(R.id.widgetTimetableSync, IconicsDrawable(context, CommunityMaterial.Icon.cmd_download_outline) .colorInt(Color.WHITE) .sizeDp(if (widgetConfig.bigStyle) 24 else 16).toBitmap()) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java index f3e747e5..2c50c406 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java @@ -517,7 +517,7 @@ public class EventManualDialog { registerEventManualDateLayout = dialogView.findViewById(R.id.registerEventManualDateLayout); registerEventManualDate = dialogView.findViewById(R.id.registerEventManualDate); - registerEventManualDate.setCompoundDrawablesWithIntrinsicBounds(null, null, new IconicsDrawable(context, CommunityMaterial.Icon.cmd_calendar).size(IconicsSize.dp(16)).color(IconicsColor.colorInt(primaryTextColor)), null); + registerEventManualDate.setCompoundDrawablesWithIntrinsicBounds(null, null, new IconicsDrawable(context, CommunityMaterial.Icon.cmd_calendar_outline).size(IconicsSize.dp(16)).color(IconicsColor.colorInt(primaryTextColor)), null); //registerEventManualDate.setCompoundDrawablePadding(Utils.dpToPx(6)); registerEventManualLessonLayout = dialogView.findViewById(R.id.registerEventManualLessonLayout); registerEventManualLesson = dialogView.findViewById(R.id.registerEventManualLesson); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java index 00252858..38964838 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java @@ -6,15 +6,16 @@ import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.databinding.DataBindingUtil; -import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.Fragment; + import com.afollestad.materialdialogs.MaterialDialog; import com.applandeo.materialcalendarview.CalendarView; import com.applandeo.materialcalendarview.EventDay; @@ -27,6 +28,7 @@ import com.mikepenz.iconics.IconicsColor; import com.mikepenz.iconics.IconicsDrawable; import com.mikepenz.iconics.IconicsSize; import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial; +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont; import java.util.ArrayList; import java.util.Calendar; @@ -34,13 +36,13 @@ import java.util.List; import java.util.Locale; import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.R; import pl.szczodrzynski.edziennik.MainActivity; +import pl.szczodrzynski.edziennik.R; +import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull; +import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull; import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceFull; import pl.szczodrzynski.edziennik.databinding.FragmentAgendaCalendarBinding; import pl.szczodrzynski.edziennik.databinding.FragmentAgendaDefaultBinding; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull; import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListDialog; import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog; import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog; @@ -51,11 +53,11 @@ import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange.LessonChangeEve import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceCounter; import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEvent; import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEventRenderer; -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; import pl.szczodrzynski.edziennik.utils.Colors; import pl.szczodrzynski.edziennik.utils.Themes; import pl.szczodrzynski.edziennik.utils.Utils; +import pl.szczodrzynski.edziennik.utils.models.Date; +import pl.szczodrzynski.edziennik.utils.models.Time; import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem; import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem; @@ -102,7 +104,7 @@ public class AgendaFragment extends Fragment { new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_add_event) .withDescription(R.string.menu_add_event_desc) - .withIcon(CommunityMaterial.Icon.cmd_calendar_plus) + .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); new MaterialDialog.Builder(activity) @@ -122,7 +124,7 @@ public class AgendaFragment extends Fragment { }), new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_agenda_change_view) - .withIcon(viewType == AGENDA_DEFAULT ? CommunityMaterial.Icon.cmd_calendar : CommunityMaterial.Icon2.cmd_view_list) + .withIcon(viewType == AGENDA_DEFAULT ? CommunityMaterial.Icon.cmd_calendar_outline : CommunityMaterial.Icon.cmd_format_list_bulleted_square) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); viewType = viewType == AGENDA_DEFAULT ? AGENDA_CALENDAR : AGENDA_DEFAULT; @@ -133,7 +135,7 @@ public class AgendaFragment extends Fragment { new BottomSheetSeparatorItem(true), new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_EVENT, true)); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java index c539486a..1edf378f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java @@ -58,7 +58,7 @@ public class AnnouncementsFragment extends Fragment { activity.getBottomSheet().prependItems( new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_ANNOUNCEMENT, true)); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java index d28aadf9..68942d5b 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java @@ -95,7 +95,7 @@ public class AttendanceFragment extends Fragment { activity.getBottomSheet().prependItems( new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_ATTENDANCE, true)); @@ -133,7 +133,7 @@ public class AttendanceFragment extends Fragment { CafeBar.builder(activity) .to(activity.getNavView().getCoordinator()) .content(R.string.sync_old_data_info) - .icon(new IconicsDrawable(activity).icon(CommunityMaterial.Icon2.cmd_sync).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.INSTANCE.getPrimaryTextColor(activity)))) + .icon(new IconicsDrawable(activity).icon(CommunityMaterial.Icon.cmd_download_outline).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.INSTANCE.getPrimaryTextColor(activity)))) .positiveText(R.string.refresh) .positiveColor(0xff4caf50) .negativeText(R.string.ok) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java index 29f46afe..b8a46801 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java @@ -69,7 +69,7 @@ public class BehaviourFragment extends Fragment { activity.getBottomSheet().prependItems( new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_NOTICE, true)); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt index 2f5bfe36..39ab4efd 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt @@ -9,21 +9,20 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView - -import com.mikepenz.iconics.IconicsDrawable import androidx.cardview.widget.CardView import androidx.recyclerview.widget.RecyclerView +import com.mikepenz.iconics.IconicsDrawable import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont import com.mikepenz.iconics.utils.colorRes import com.mikepenz.iconics.utils.sizeDp import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeFull -import pl.szczodrzynski.edziennik.utils.models.Date - -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK import pl.szczodrzynski.edziennik.utils.Utils.bs +import pl.szczodrzynski.edziennik.utils.models.Date class NoticesAdapter//getting the context and product list with constructor (private val context: Context, var noticeList: List) : RecyclerView.Adapter() { @@ -50,15 +49,15 @@ class NoticesAdapter//getting the context and product list with constructor holder.noticesItemAddedDate.text = Date.fromMillis(notice.addedDate).formattedString if (notice.type == Notice.TYPE_POSITIVE) { - holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon2.cmd_plus_circle) + holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon2.cmd_plus_circle_outline) .colorRes(R.color.md_green_600) .sizeDp(36)) } else if (notice.type == Notice.TYPE_NEGATIVE) { - holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon.cmd_alert_decagram) + holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon.cmd_alert_decagram_outline) .colorRes(R.color.md_red_600) .sizeDp(36)) } else { - holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon2.cmd_message_outline) + holder.noticesItemType.setImageDrawable(IconicsDrawable(context, SzkolnyFont.Icon.szf_message_processing_outline) .colorRes(R.color.md_blue_500) .sizeDp(36)) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java index 1a6b99dc..c756ccbd 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java @@ -132,7 +132,7 @@ public class GradesFragment extends Fragment { }), new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_grades_color_mode) - .withIcon(CommunityMaterial.Icon2.cmd_palette) + .withIcon(CommunityMaterial.Icon2.cmd_palette_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); new MaterialDialog.Builder(activity) @@ -195,7 +195,7 @@ public class GradesFragment extends Fragment { new BottomSheetSeparatorItem(true), new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_GRADE, true)); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java index 98c3e09d..c94da393 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java @@ -37,6 +37,7 @@ import com.mikepenz.iconics.IconicsColor; import com.mikepenz.iconics.IconicsDrawable; import com.mikepenz.iconics.IconicsSize; import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial; +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont; import java.io.File; import java.util.ArrayList; @@ -268,7 +269,7 @@ public class HomeFragment extends Fragment { activity.getBottomSheet().prependItems( new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_set_student_number) - .withIcon(CommunityMaterial.Icon.cmd_counter) + .withIcon(SzkolnyFont.Icon.szf_clipboard_list_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); setNumberDialog(); @@ -276,7 +277,7 @@ public class HomeFragment extends Fragment { new BottomSheetSeparatorItem(true), new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_mark_everything_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, true)); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt index f9ea01ff..6d498363 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt @@ -9,6 +9,7 @@ import android.widget.Toast import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.MainActivity import pl.szczodrzynski.edziennik.R @@ -52,7 +53,7 @@ class HomeworkFragment : Fragment() { BottomSheetPrimaryItem(true) .withTitle(R.string.menu_add_event) .withDescription(R.string.menu_add_event_desc) - .withIcon(CommunityMaterial.Icon.cmd_calendar_plus) + .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline) .withOnClickListener(View.OnClickListener { activity.bottomSheet.close() EventManualDialog(activity).show(app, null, null, null, EventManualDialog.DIALOG_HOMEWORK) @@ -60,7 +61,7 @@ class HomeworkFragment : Fragment() { BottomSheetSeparatorItem(true), BottomSheetPrimaryItem(true) .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) .withOnClickListener(View.OnClickListener { activity.bottomSheet.close() AsyncTask.execute { app.db.metadataDao().setAllSeen(App.profileId, Metadata.TYPE_HOMEWORK, true) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java index 253636d6..1dd0d45f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java @@ -104,7 +104,7 @@ public class LoginVulcanFragment extends Fragment { b.helpButton.setOnClickListener((v) -> nav.navigate(R.id.loginVulcanHelpFragment, null, LoginActivity.navOptions)); b.backButton.setOnClickListener((v) -> nav.navigateUp()); - b.loginQrScan.setImageDrawable(new IconicsDrawable(getActivity()).icon(CommunityMaterial.Icon2.cmd_qrcode).color(IconicsColor.colorInt(Color.BLACK)).size(IconicsSize.dp(72))); + b.loginQrScan.setImageDrawable(new IconicsDrawable(getActivity()).icon(CommunityMaterial.Icon2.cmd_qrcode_scan).color(IconicsColor.colorInt(Color.BLACK)).size(IconicsSize.dp(72))); b.loginQrScan.setOnClickListener((v -> { QrScannerActivity.resultHandler = result -> { try { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt index c8e1a53a..1f0e4849 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt @@ -22,6 +22,7 @@ import com.mikepenz.iconics.IconicsDrawable import com.mikepenz.iconics.IconicsSize import com.mikepenz.iconics.typeface.IIcon import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont import com.mikepenz.iconics.utils.sizeDp import kotlinx.coroutines.* import org.greenrobot.eventbus.EventBus @@ -224,17 +225,18 @@ class MessageFragment : Fragment(), CoroutineScope { attachmentChip.ellipsize = TextUtils.TruncateAt.MIDDLE // create an icon for the attachment - var icon: IIcon = CommunityMaterial.Icon.cmd_file + var icon: IIcon = CommunityMaterial.Icon.cmd_file_outline when (Utils.getExtensionFromFileName(name)) { - "txt" -> icon = CommunityMaterial.Icon.cmd_file_document - "doc", "docx", "odt", "rtf" -> icon = CommunityMaterial.Icon.cmd_file_word - "xls", "xlsx", "ods" -> icon = CommunityMaterial.Icon.cmd_file_excel - "ppt", "pptx", "odp" -> icon = CommunityMaterial.Icon.cmd_file_powerpoint - "pdf" -> icon = CommunityMaterial.Icon.cmd_file_pdf - "mp3", "wav", "aac" -> icon = CommunityMaterial.Icon.cmd_file_music - "mp4", "avi", "3gp", "mkv", "flv" -> icon = CommunityMaterial.Icon.cmd_file_video - "jpg", "jpeg", "png", "bmp", "gif" -> icon = CommunityMaterial.Icon.cmd_file_image - "zip", "rar", "tar", "7z" -> icon = CommunityMaterial.Icon.cmd_file_lock + "txt" -> icon = CommunityMaterial.Icon.cmd_file_document_outline + "doc", "docx", "odt", "rtf" -> icon = SzkolnyFont.Icon.szf_file_word_outline + "xls", "xlsx", "ods" -> icon = SzkolnyFont.Icon.szf_file_excel_outline + "ppt", "pptx", "odp" -> icon = SzkolnyFont.Icon.szf_file_powerpoint_outline + "pdf" -> icon = SzkolnyFont.Icon.szf_file_pdf_outline + "mp3", "wav", "aac" -> icon = SzkolnyFont.Icon.szf_file_music_outline + "mp4", "avi", "3gp", "mkv", "flv" -> icon = SzkolnyFont.Icon.szf_file_video_outline + "jpg", "jpeg", "png", "bmp", "gif" -> icon = SzkolnyFont.Icon.szf_file_image_outline + "zip", "rar", "tar", "7z" -> icon = SzkolnyFont.Icon.szf_zip_box_outline + "html", "cpp", "c", "h", "css", "java", "py" -> icon = SzkolnyFont.Icon.szf_file_code_outline } attachmentChip.chipIcon = IconicsDrawable(activity).color(IconicsColor.colorRes(R.color.colorPrimary)).icon(icon).size(IconicsSize.dp(26)) attachmentChip.closeIcon = IconicsDrawable(activity).icon(CommunityMaterial.Icon.cmd_check).size(IconicsSize.dp(18)).color(IconicsColor.colorInt(Utils.getAttr(activity, android.R.attr.textColorPrimary))) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt index 31933c4d..eb1a23e1 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt @@ -39,7 +39,7 @@ class SettingsLicenseActivity : MaterialAboutActivity() { libraryUrl: String): MaterialAboutCard { val licenseItem = MaterialAboutActionItem.Builder() .icon(IconicsDrawable(this) - .icon(CommunityMaterial.Icon.cmd_book) + .icon(CommunityMaterial.Icon.cmd_book_outline) .colorInt(foregroundColor) .sizeDp(18)) .setIconGravity(MaterialAboutActionItem.GRAVITY_TOP) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java index 05bff7c4..832eb77f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java @@ -29,6 +29,7 @@ import com.mikepenz.iconics.IconicsColor; import com.mikepenz.iconics.IconicsDrawable; import com.mikepenz.iconics.IconicsSize; import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial; +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont; import com.theartofdev.edmodo.cropper.CropImage; import com.theartofdev.edmodo.cropper.CropImageView; import com.wdullaer.materialdatetimepicker.time.TimePickerDialog; @@ -259,7 +260,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_profile_remove_text), getString(R.string.settings_profile_remove_subtext), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon.cmd_delete_empty) + .icon(SzkolnyFont.Icon.szf_delete_empty_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -287,7 +288,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_theme_theme_text), Themes.INSTANCE.getThemeName(activity), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_palette) + .icon(CommunityMaterial.Icon2.cmd_palette_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -313,7 +314,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_theme_mini_drawer_text), getString(R.string.settings_theme_mini_drawer_subtext), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon.cmd_chevron_left) + .icon(CommunityMaterial.Icon.cmd_dots_vertical) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -339,7 +340,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_theme_mini_drawer_buttons_text), null, new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_menu) + .icon(CommunityMaterial.Icon.cmd_format_list_checks) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -403,7 +404,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_theme_drawer_header_text), null, new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_image) + .icon(CommunityMaterial.Icon2.cmd_image_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -504,7 +505,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_sync_wifi_text), getString(R.string.settings_sync_wifi_subtext), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_wifi_strength_4) + .icon(CommunityMaterial.Icon2.cmd_wifi_strength_2) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -526,7 +527,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_sync_sync_interval_text), getString(R.string.settings_sync_sync_interval_subtext_disabled), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_sync) + .icon(CommunityMaterial.Icon.cmd_download_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ); @@ -619,7 +620,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_sync_quiet_hours_text), getString(R.string.settings_sync_quiet_hours_subtext_disabled), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon.cmd_bell_sleep) + .icon(CommunityMaterial.Icon.cmd_bell_sleep_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ); @@ -740,7 +741,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_sync_notifications_settings_text), getString(R.string.settings_sync_notifications_settings_subtext), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_settings) + .icon(CommunityMaterial.Icon2.cmd_settings_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -820,7 +821,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_register_shared_events_text), getString(R.string.settings_register_shared_events_subtext), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_share_variant) + .icon(CommunityMaterial.Icon2.cmd_share_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -888,7 +889,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_register_allow_registration_text), getString(R.string.settings_register_allow_registration_subtext), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon.cmd_account_circle) + .icon(CommunityMaterial.Icon.cmd_account_circle_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ); @@ -958,7 +959,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_register_bell_sync_text), getRegisterCardBellSyncSubText(), new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon.cmd_alarm_bell) + .icon(SzkolnyFont.Icon.szf_alarm_bell_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ); @@ -1030,7 +1031,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_register_dont_count_zero_text), null, new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_numeric_0_box) + .icon(CommunityMaterial.Icon2.cmd_numeric_0_box_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -1065,7 +1066,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { getString(R.string.settings_register_show_teacher_absences_text), null, new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon.cmd_account_arrow_right) + .icon(CommunityMaterial.Icon.cmd_account_arrow_right_outline) .size(IconicsSize.dp(iconSizeDp)) .color(IconicsColor.colorInt(iconColor)) ) @@ -1109,7 +1110,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { .subTextColor(secondaryTextOnPrimaryBg) .subText(BuildConfig.VERSION_NAME + ", " + BuildConfig.BUILD_TYPE) .icon(new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_information) + .icon(CommunityMaterial.Icon2.cmd_information_outline) .color(IconicsColor.colorInt(primaryTextOnPrimaryBg)) .size(IconicsSize.dp(iconSizeDp))) .build(); @@ -1133,7 +1134,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { .textColor(primaryTextOnPrimaryBg) .subTextColor(secondaryTextOnPrimaryBg) .icon(new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon2.cmd_shield_half_full) + .icon(CommunityMaterial.Icon2.cmd_shield_outline) .color(IconicsColor.colorInt(primaryTextOnPrimaryBg)) .size(IconicsSize.dp(iconSizeDp))) .setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://szkolny.eu/privacy-policy"))) @@ -1145,7 +1146,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { .subTextColor(secondaryTextOnPrimaryBg) .subText(R.string.settings_about_discord_subtext) .icon(new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon.cmd_discord) + .icon(SzkolnyFont.Icon.szf_discord_outline) .color(IconicsColor.colorInt(primaryTextOnPrimaryBg)) .size(IconicsSize.dp(iconSizeDp))) .setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://discord.gg/n9e8pWr"))) @@ -1270,7 +1271,7 @@ public class SettingsNewFragment extends MaterialAboutFragment { .textColor(primaryTextOnPrimaryBg) .subTextColor(secondaryTextOnPrimaryBg) .icon(new IconicsDrawable(activity) - .icon(CommunityMaterial.Icon.cmd_bug) + .icon(CommunityMaterial.Icon.cmd_bug_outline) .color(IconicsColor.colorInt(primaryTextOnPrimaryBg)) .size(IconicsSize.dp(iconSizeDp))) .setOnClickAction(() -> { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java index 1bce90fc..82c803f0 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java @@ -37,6 +37,7 @@ import androidx.viewpager.widget.ViewPager; import com.afollestad.materialdialogs.MaterialDialog; import com.google.android.material.tabs.TabLayout; import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial; +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont; import java.io.File; import java.io.FileOutputStream; @@ -103,7 +104,7 @@ public class TimetableFragment extends Fragment { new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_add_event) .withDescription(R.string.menu_add_event_desc) - .withIcon(CommunityMaterial.Icon.cmd_calendar_plus) + .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); new MaterialDialog.Builder(activity) @@ -132,7 +133,7 @@ public class TimetableFragment extends Fragment { new BottomSheetSeparatorItem(true), new BottomSheetPrimaryItem(true) .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) .withOnClickListener(v3 -> { activity.getBottomSheet().close(); AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_LESSON_CHANGE, true)); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt index 6ee0e6bd..9d8ef2c6 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt @@ -10,7 +10,7 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager -import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont import kotlinx.coroutines.* import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.MainActivity @@ -153,7 +153,7 @@ class TimetableFragment : Fragment(), CoroutineScope { //activity.navView.bottomBar.fabEnable = true activity.navView.bottomBar.fabExtendedText = getString(R.string.timetable_today) - activity.navView.bottomBar.fabIcon = CommunityMaterial.Icon.cmd_calendar_today + activity.navView.bottomBar.fabIcon = SzkolnyFont.Icon.szf_calendar_today_outline activity.navView.setFabOnClickListener(View.OnClickListener { b.tabLayout.setCurrentItem(items.indexOfFirst { it.value == today }, true) }) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotifications.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotifications.java index ea65b7aa..302ffbd3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotifications.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotifications.java @@ -117,7 +117,7 @@ public class WidgetNotifications extends AppWidgetProvider { .color(IconicsColor.colorInt(Color.WHITE)) .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap()); - views.setImageViewBitmap(R.id.widgetNotificationsSync, new IconicsDrawable(context, CommunityMaterial.Icon2.cmd_sync) + views.setImageViewBitmap(R.id.widgetNotificationsSync, new IconicsDrawable(context, CommunityMaterial.Icon.cmd_download_outline) .color(IconicsColor.colorInt(Color.WHITE)) .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap()); diff --git a/build.gradle b/build.gradle index 131c0747..124b33ed 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.5.2' classpath 'me.tatarka:gradle-retrolambda:3.7.0' classpath 'com.google.gms:google-services:4.3.1' classpath 'io.fabric.tools:gradle:1.28.1' diff --git a/settings.gradle b/settings.gradle index 692dbba0..0def8313 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -include ':app', ':agendacalendarview', ':mhttp', ':material-about-library', ':cafebar', ':szkolny-font', ':nachos' +include ':app', ':agendacalendarview', ':mhttp', ':material-about-library', ':cafebar', ':szkolny-font', ':nachos', ':community-material' /* include ':Navigation' project(':Navigation').projectDir = new File(settingsDir, '../Navigation/navlib')*/ diff --git a/szkolny-font/build.gradle b/szkolny-font/build.gradle index 3e136e8d..02d6e56b 100644 --- a/szkolny-font/build.gradle +++ b/szkolny-font/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2014 Mike Penz + * Copyright 2019 Mike Penz * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 1 - versionName "1.0" + versionCode 11 + versionName "1.1" } buildTypes { release { @@ -47,5 +47,5 @@ if (project.hasProperty('pushall') || project.hasProperty('SzkolnyFontonly')) { dependencies { implementation "com.mikepenz:iconics-core:${iconics}" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt b/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt index 593952fd..5e23dbd1 100644 --- a/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt +++ b/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt @@ -1,6 +1,5 @@ /* - * Copyright 2014 Mike Penz - * Copyright 2015 Haruki Hasegawa + * Copyright 2019 Mike Penz * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,21 +18,18 @@ package com.mikepenz.iconics.typeface.library.szkolny.font import com.mikepenz.iconics.typeface.IIcon import com.mikepenz.iconics.typeface.ITypeface import com.mikepenz.iconics.typeface.library.szkolny.R -import java.util.LinkedList +import java.util.* @Suppress("EnumEntryName") object SzkolnyFont : ITypeface { override val fontRes: Int - get() = R.font.szkolny_font_font_v1_0 + get() = R.font.szkolny_font_font_v1_1 override val characters: Map by lazy { - mutableMapOf().apply { - SzkolnyFont.Icon.values().associateTo(this) { it.name to it.character } - //Icon2.values().associateTo(this) { it.name to it.character } - } + Icon.values().associate { it.name to it.character } } - + override val mappingPrefix: String get() = "szf" @@ -41,7 +37,7 @@ object SzkolnyFont : ITypeface { get() = "Szkolny Font" override val version: String - get() = "1.0" + get() = "1.1" override val iconCount: Int get() = characters.size @@ -64,17 +60,28 @@ object SzkolnyFont : ITypeface { override val licenseUrl: String get() = "" - override fun getIcon(key: String): IIcon { - return SzkolnyFont.Icon.valueOf(key) - } + override fun getIcon(key: String): IIcon = Icon.valueOf(key) enum class Icon constructor(override val character: Char) : IIcon { - szf_eye_check('\ue800'), - szf_calendar_off('\ue801'), - szf_file_document_edit('\ue802'), - szf_message_off('\ue803'), - szf_numeric_0_box_multiple_outline_off('\ue804'); + szf_alarm_bell_outline('\ue800'), + szf_calendar_plus_outline('\ue801'), + szf_calendar_today_outline('\ue802'), + szf_clipboard_list_outline('\ue803'), + szf_delete_empty_outline('\ue804'), + szf_discord_outline('\ue805'), + szf_file_code_outline('\ue806'), + szf_file_excel_outline('\ue807'), + szf_file_image_outline('\ue808'), + szf_file_music_outline('\ue809'), + szf_file_pdf_outline('\ue80a'), + szf_file_percent_outline('\ue80b'), + szf_file_powerpoint_outline('\ue80c'), + szf_file_video_outline('\ue80d'), + szf_file_word_outline('\ue80e'), + szf_message_processing_outline('\ue80f'), + szf_notebook_outline('\ue810'), + szf_zip_box_outline('\ue811'); override val typeface: ITypeface by lazy { SzkolnyFont } } -} +} \ No newline at end of file diff --git a/szkolny-font/src/main/res/font/szkolny_font_font_v1_0.ttf b/szkolny-font/src/main/res/font/szkolny_font_font_v1_0.ttf deleted file mode 100644 index 351575db96fae653eaff094cbce9e87bdc7b97bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6136 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 diff --git a/szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf b/szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf new file mode 100644 index 0000000000000000000000000000000000000000..33ad627f3fa830143956fc4b3e8e5d0bb8abaaf2 GIT binary patch literal 11232 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 literal 0 HcmV?d00001