Changed to Fluent Icons

README.md

@@ -28,6 +28,7 @@ This is an open-source personal project and I am very happy to accept community
 * [joda-time-android](https://github.com/dlew/joda-time-android) - Daniel Lew
 * [Doki](https://github.com/doubledotlabs/doki) - Double Dot Labs
 * [Konfetti](https://github.com/DanielMartinus/Konfetti) - Daniel Martinus
+* [Fluent System Icons](https://github.com/microsoft/fluentui-system-icons) - Microsoft
 
 ### Other materials used
 * [Launcher Icon](https://flaticon.com/authors/freepik) - Freepik via Flaticon

app/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
+    implementation 'com.microsoft.design:fluent-system-icons:1.1.23'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
     implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0'

app/src/main/java/com/isaiahvonrundstedt/fokus/features/core/activities/MainActivity.kt

@@ -21,7 +21,7 @@ class MainActivity: BaseActivity() {
         setPersistentActionBar(toolbar)
         setToolbarTitle(R.string.activity_tasks)
 
-        toolbar?.navigationIcon = ContextCompat.getDrawable(this, R.drawable.ic_menu)
+        toolbar?.navigationIcon = ContextCompat.getDrawable(this, R.drawable.ic_fluent_navigation_24_filled)
         toolbar?.setNavigationOnClickListener {
             NavigationBottomSheet().invoke(supportFragmentManager)
     }

app/src/main/java/com/isaiahvonrundstedt/fokus/features/shared/abstracts/BaseWorker.kt

@@ -139,7 +139,7 @@ abstract class BaseWorker(context: Context, workerParameters: WorkerParameters)
 
            manager.notify(tag ?: taskNotificationTag, taskNotificationID,
                 createNotification(history, taskNotificationChannelID,
-                    NotificationCompat.Action(R.drawable.ic_check,
+                    NotificationCompat.Action(R.drawable.ic_fluent_checkmark_24_regular,
                         applicationContext.getString(R.string.button_mark_as_finished), intent)))
         } else if (history.type == History.typeEventReminder)
             manager.notify(tag ?: eventNotificationTag, eventNotificationID,
@@ -180,7 +180,7 @@ abstract class BaseWorker(context: Context, workerParameters: WorkerParameters)
                                    @Nullable action: NotificationCompat.Action? = null): Notification {
         return NotificationCompat.Builder(applicationContext, id).apply {
             setSound(notificationSoundUri)
-            setSmallIcon(R.drawable.ic_done_all)
+            setSmallIcon(R.drawable.ic_fluent_lightbulb_24_regular)
             setContentIntent(contentIntent)
             setContentTitle(history?.title)
             setContentText(history?.content)

app/src/main/java/com/isaiahvonrundstedt/fokus/features/shared/custom/ItemSwipeCallback.kt

@@ -15,7 +15,7 @@ import com.isaiahvonrundstedt.fokus.features.shared.abstracts.BaseAdapter
 class ItemSwipeCallback<T, VH: RecyclerView.ViewHolder>(context: Context, private var adapter: BaseAdapter<T, VH>)
     : ItemTouchHelper.Callback() {
 
-    private var icon: Drawable? = ContextCompat.getDrawable(context, R.drawable.ic_delete)
+    private var icon: Drawable? = ContextCompat.getDrawable(context, R.drawable.ic_fluent_delete_24_regular)
     private var background: ColorDrawable = ColorDrawable(Color.parseColor("#ea4335"))
 
     override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {

app/src/main/res/color/fluent_default_icon_tint.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorSecondaryText"/>
+</selector>

app/src/main/res/drawable/shape_button_remove.xml

@@ -5,11 +5,11 @@
     <item>
         <shape android:shape="oval">
             <size android:width="4dp" android:height="4dp"/>
-            <solid android:color="@color/colorWidgetTint"/>
+            <solid android:color="@color/colorEditorButton"/>
         </shape>
     </item>
 
-    <item android:drawable="@drawable/ic_clear"
+    <item android:drawable="@drawable/ic_fluent_dismiss_12_regular"
         android:top="2dp"
         android:bottom="2dp"
         android:left="2dp"

app/src/main/res/layout/activity_history.xml

@@ -26,7 +26,7 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_marginBottom="16dp"
-            app:srcCompat="@drawable/ic_history"
+            app:srcCompat="@drawable/ic_fluent_history_24_regular"
             app:tint="@color/colorOnSurface"/>
 
         <androidx.appcompat.widget.AppCompatTextView

app/src/main/res/layout/fragment_event.xml

@@ -24,7 +24,7 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_marginBottom="16dp"
-            app:srcCompat="@drawable/ic_event"
+            app:srcCompat="@drawable/ic_fluent_calendar_24_regular"
             app:tint="@color/colorOnSurface"/>
 
         <TextView
@@ -50,6 +50,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_padding"
-        android:src="@drawable/ic_add" />
+        android:src="@drawable/ic_fluent_add_24_regular" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_subject.xml

@@ -24,7 +24,7 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_marginBottom="16dp"
-            app:srcCompat="@drawable/ic_palette"
+            app:srcCompat="@drawable/ic_fluent_beaker_24_regular"
             app:tint="@color/colorOnSurface"/>
 
         <TextView
@@ -50,6 +50,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_padding"
-        app:srcCompat="@drawable/ic_add"/>
+        app:srcCompat="@drawable/ic_fluent_add_24_regular"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_task.xml

@@ -29,7 +29,7 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_marginBottom="16dp"
-            app:srcCompat="@drawable/ic_check"
+            app:srcCompat="@drawable/ic_fluent_checkmark_24_regular"
             app:tint="@color/colorOnSurface"/>
 
         <TextView
@@ -56,6 +56,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_padding"
-        android:src="@drawable/ic_add"/>
+        android:src="@drawable/ic_fluent_add_24_regular"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/layout_appbar_editor.xml

@@ -10,6 +10,6 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@android:color/transparent"/>
+        android:background="@android:color/transparent" />
 
 </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/layout_appbar_selector.xml

@@ -11,6 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="@android:color/transparent"
-        app:navigationIcon="@drawable/ic_close"/>
+        app:navigationIcon="@drawable/ic_fluent_dismiss_24_regular"/>
 
 </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/layout_editor_event.xml

@@ -155,7 +155,7 @@
                     android:paddingHorizontal="16dp"
                     android:text="@string/helper_this_is_important"
                     android:textColor="@color/colorSecondaryText"
-                    android:drawableStart="@drawable/ic_info"
+                    android:drawableStart="@drawable/ic_fluent_info_24_regular"
                     android:drawablePadding="16dp"/>
 
             </LinearLayout>
@@ -202,6 +202,6 @@
         android:layout_margin="@dimen/activity_padding"
         android:layout_gravity="bottom|end"
         android:text="@string/button_save"
-        app:icon="@drawable/ic_save"/>
+        app:icon="@drawable/ic_fluent_save_24_regular"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/layout_editor_subject.xml

@@ -231,6 +231,6 @@
         android:layout_margin="@dimen/activity_padding"
         android:layout_gravity="bottom|end"
         android:text="@string/button_save"
-        app:icon="@drawable/ic_save"/>
+        app:icon="@drawable/ic_fluent_save_20_regular"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/layout_editor_task.xml

@@ -136,7 +136,7 @@
                     android:paddingHorizontal="16dp"
                     android:text="@string/helper_this_is_important"
                     android:textColor="@color/colorSecondaryText"
-                    android:drawableStart="@drawable/ic_info"
+                    android:drawableStart="@drawable/ic_fluent_info_24_regular"
                     android:drawablePadding="16dp"/>
 
             </LinearLayout>
@@ -215,6 +215,6 @@
         android:layout_margin="@dimen/activity_padding"
         android:layout_gravity="bottom|end"
         android:text="@string/button_save"
-        app:icon="@drawable/ic_save"/>
+        app:icon="@drawable/ic_fluent_save_24_regular"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/layout_preference_info.xml

@@ -19,7 +19,7 @@
         android:id="@android:id/summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:drawableStart="@drawable/ic_info"
+        android:drawableStart="@drawable/ic_fluent_info_24_regular"
         android:drawablePadding="32dp"
         tools:text="text"/>
 

app/src/main/res/layout/layout_selector_subject.xml

@@ -27,7 +27,7 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_marginBottom="16dp"
-            app:srcCompat="@drawable/ic_palette"
+            app:srcCompat="@drawable/ic_fluent_beaker_24_regular"
             app:tint="@color/colorOnSurface"/>
 
         <androidx.appcompat.widget.AppCompatTextView

app/src/main/res/menu/menu_editor.xml

@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_delete"
         android:title="@string/menu_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_fluent_delete_24_regular"
         app:iconTint="@color/colorOnSurface"
         app:showAsAction="ifRoom"/>