Merge pull request #1367 from SiKreuz/feature/dark-mode

Dark mode

app/src/main/java/de/tum/in/tumcampusapp/App.kt

@@ -1,11 +1,14 @@
 package de.tum.`in`.tumcampusapp
 
 import android.app.Application
+import android.content.res.Resources
 import android.os.StrictMode
+import androidx.appcompat.app.AppCompatDelegate
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.squareup.picasso.OkHttp3Downloader
 import com.squareup.picasso.Picasso
 import de.tum.`in`.tumcampusapp.component.notifications.NotificationUtils.setupNotificationChannels
+import de.tum.`in`.tumcampusapp.component.other.settings.ThemeProvider
 import de.tum.`in`.tumcampusapp.di.AppComponent
 import de.tum.`in`.tumcampusapp.di.DaggerAppComponent
 import io.reactivex.plugins.RxJavaPlugins
@@ -24,6 +27,7 @@ open class App : Application() {
         JodaTimeAndroid.init(this)
         initRxJavaErrorHandler()
         setupStrictMode()
+        loadTheme()
     }
 
     private fun buildAppComponent() {
@@ -68,4 +72,9 @@ open class App : Application() {
     private fun initRxJavaErrorHandler() {
         RxJavaPlugins.setErrorHandler(FirebaseCrashlytics.getInstance()::recordException)
     }
+
+    private fun loadTheme() {
+        val theme = ThemeProvider(this).getThemeFromPreferences()
+        AppCompatDelegate.setDefaultNightMode(theme)
+    }
 }

app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt

@@ -144,7 +144,7 @@ class DrawerMenuHelper(
 
         private val ABOUT = arrayOf(
                 NavItem.ActivityDestination(R.string.show_feedback, R.drawable.ic_outline_feedback_24px, FeedbackActivity::class.java),
-                NavItem.ActivityDestination(R.string.about_tca, R.drawable.ic_action_info_black, InformationActivity::class.java),
+                NavItem.ActivityDestination(R.string.about_tca, R.drawable.ic_action_info, InformationActivity::class.java),
                 NavItem.ActivityDestination(R.string.settings, R.drawable.ic_outline_settings_24px, SettingsActivity::class.java)
         )
     }

app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/SettingsFragment.kt

@@ -10,6 +10,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat.checkSelfPermission
 import androidx.core.content.edit
 import androidx.core.os.bundleOf
@@ -40,6 +41,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.activity_setup_eduroam.*
+import org.jetbrains.anko.appcompat.v7.Appcompat
 import org.jetbrains.anko.defaultSharedPreferences
 import org.jetbrains.anko.notificationManager
 import java.util.concurrent.ExecutionException
@@ -48,6 +50,8 @@ import javax.inject.Inject
 class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener,
         SharedPreferences.OnSharedPreferenceChangeListener {
 
+    private val themeProvider by lazy { ThemeProvider(requireContext()) }
+
     private val compositeDisposable = CompositeDisposable()
 
     @Inject
@@ -85,6 +89,7 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
             // (since it is not possible to add a button to the preferences screen)
             findPreference(BUTTON_LOGOUT).onPreferenceClickListener = this
             setSummary("language_preference")
+            setSummary(Const.DESIGN_THEME)
             setSummary("card_default_campus")
             setSummary("silent_mode_set_to")
             setSummary("background_mode_set_to")
@@ -193,6 +198,12 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
             }
         }
 
+        // Change design theme
+        if (key == Const.DESIGN_THEME) {
+            val theme = themeProvider.getTheme(sharedPrefs.getString(key, "system")!!)
+            AppCompatDelegate.setDefaultNightMode(theme)
+        }
+
         // If the background mode was activated, start the service. This will invoke
         // the service to call onHandleIntent which updates all background data
         if (key == Const.BACKGROUND_MODE) {

app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/ThemeProvider.kt

@@ -0,0 +1,27 @@
+package de.tum.`in`.tumcampusapp.component.other.settings
+
+import android.app.UiModeManager
+import android.content.Context
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.PreferenceManager
+import de.tum.`in`.tumcampusapp.utils.Const
+import java.security.InvalidParameterException
+
+class ThemeProvider(private val context: Context) {
+
+    fun getThemeFromPreferences(): Int {
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+        val selectedTheme = sharedPreferences.getString(Const.DESIGN_THEME, "system")
+
+        return selectedTheme?.let {
+            getTheme(it)
+        } ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+    }
+
+    fun getTheme(selectedTheme: String): Int = when (selectedTheme) {
+        "system" -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        "light" -> UiModeManager.MODE_NIGHT_NO
+        "dark" -> UiModeManager.MODE_NIGHT_YES
+        else -> throw InvalidParameterException("Theme not defined for $selectedTheme")
+    }
+}

app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt

@@ -3,6 +3,7 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.LayoutTransition
+import android.graphics.Color
 import android.graphics.drawable.Animatable
 import android.os.Bundle
 import android.util.ArrayMap
@@ -14,6 +15,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
+import com.github.mikephil.charting.charts.Chart
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
@@ -131,6 +133,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             })
             legend.setCustom(legend.entries)
             setTouchEnabled(false)
+
+            setHoleColor(Color.TRANSPARENT)
+            legend.textColor = resources.getColor(R.color.text_primary) // TODO exchange deprecated function
+
             invalidate()
         }
     }
@@ -148,6 +154,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
         val set = BarDataSet(entries, getString(R.string.grades_without_weight)).apply {
             setColors(GRADE_COLORS, requireContext())
+            valueTextColor = resources.getColor(R.color.text_primary)
         }
 
         barChartView.apply {
@@ -184,6 +191,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     )
             )
 
+            // TODO exchange deprecated function
+            legend.textColor = resources.getColor(R.color.text_primary)
+            xAxis.textColor = resources.getColor(R.color.text_primary)
+            axisLeft.textColor = resources.getColor(R.color.text_primary)
+            axisRight.textColor = resources.getColor(R.color.text_primary)
+
             invalidate()
         }
     }

app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/adapteritems/InformationContactItem.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import de.tum.`in`.tumcampusapp.R
 
-class InformationContactItem(text: String) : AbstractContactItem(R.string.additional_info, text, R.drawable.ic_action_info_black) {
+class InformationContactItem(text: String) : AbstractContactItem(R.string.additional_info, text, R.drawable.ic_action_info) {
 
     override fun getIntent(context: Context): Intent? = null
 }

app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt

@@ -65,7 +65,7 @@ class TuitionFeesFragment : FragmentForAccessingTumOnline<TuitionList>(
             if (nextWeek.isAfter(deadline)) {
                 amountTextView.setTextColor(ContextCompat.getColor(requireContext(), R.color.error))
             } else {
-                amountTextView.setTextColor(ContextCompat.getColor(requireContext(), R.color.black))
+                amountTextView.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_primary))
             }
         }
     }

app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt

@@ -31,6 +31,7 @@ import de.tum.`in`.tumcampusapp.utils.Utils
 import de.tum.`in`.tumcampusapp.utils.observeNonNull
 import kotlinx.android.synthetic.main.fragment_cafeteria.pager
 import kotlinx.android.synthetic.main.fragment_cafeteria.spinnerToolbar
+import kotlinx.android.synthetic.main.layout_error.*
 import org.joda.time.DateTime
 import javax.inject.Inject
 import javax.inject.Provider

app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java

@@ -173,7 +173,7 @@ private void updateSendingStatus(Context context, ChatMessage message) {
             statusImageView.setVisibility(inProgress ? View.GONE : View.VISIBLE);
             sendingProgressBar.setVisibility(inProgress ? View.VISIBLE : View.GONE);
 
-            int darkTextColor = ContextCompat.getColor(context, R.color.text_dark_secondary);
+            int darkTextColor = ContextCompat.getColor(context, R.color.text_secondary);
 
             if (inProgress) {
                 timestampTextView.setTextColor(darkTextColor);
@@ -198,7 +198,7 @@ private void updateSendingStatus(Context context, ChatMessage message) {
                 timestampTextView.setText(R.string.chat_message_send_error);
                 timestampTextView.setTextColor(iconTint);
             } else {
-                int textColor = ContextCompat.getColor(context, R.color.text_dark_secondary);
+                int textColor = ContextCompat.getColor(context, R.color.text_secondary);
                 timestampTextView.setTextColor(textColor);
                 timestampTextView.setText(message.getFormattedTimestamp(context));
             }

app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomAdapter.kt

@@ -19,7 +19,7 @@ class StudyRoomAdapter(private val fragment: Fragment, private val studyRooms: L
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StudyRoomViewHolder {
         val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.card_header_details_button, parent, false)
+                .inflate(R.layout.card_studyroom_detail, parent, false)
         return StudyRoomViewHolder(view)
     }
 

app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/DepartureView.kt

@@ -13,6 +13,7 @@ import android.view.animation.AnimationUtils
 import android.widget.LinearLayout
 import android.widget.TextSwitcher
 import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
@@ -72,19 +73,19 @@ class DepartureView
                 setBackgroundColor(mvvSymbol.getHighlight())
             } else {
                 setBackgroundColor(mvvSymbol.backgroundColor)
-                lineView.setTextColor(Color.WHITE)
+                lineView.setTextColor(ResourcesCompat.getColor(resources, R.color.text_primary_dark, null))
                 for (index in 0 until timeSwitcher.childCount) {
                     val tw = timeSwitcher.getChildAt(index) as TextView
-                    tw.setTextColor(Color.WHITE)
+                    tw.setTextColor(ResourcesCompat.getColor(resources, R.color.text_secondary_dark, null))
                 }
             }
         } else {
-            setBackgroundColor(mvvSymbol.textColor)
-            lineView.setTextColor(Color.BLACK)
+            setBackgroundColor(ResourcesCompat.getColor(resources, R.color.default_window_background, null))
+            lineView.setTextColor(ResourcesCompat.getColor(resources, R.color.text_primary, null))
 
             for (index in 0 until timeSwitcher.childCount) {
                 val tw = timeSwitcher.getChildAt(index) as TextView
-                tw.setTextColor(Color.GRAY)
+                tw.setTextColor(ResourcesCompat.getColor(resources, R.color.text_secondary, null))
             }
         }
     }

app/src/main/java/de/tum/in/tumcampusapp/utils/Const.kt

@@ -171,4 +171,6 @@ object Const {
     const val NO_CAFETERIA_FOUND = -1
 
     const val SETTINGS_RESTART = "settingsRestart"
+
+    const val DESIGN_THEME = "design_theme_preference"
 }

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/tum_500_alpha_15" android:state_checked="true" />
+    <item android:color="@color/navigation_drawer_item_background_selected" android:state_checked="true" />
     <item android:color="@color/navigation_drawer_item_background" />
 </selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/tum_blue" android:state_checked="true" />
+    <item android:color="@color/navigation_drawer_item_text_selected" android:state_checked="true" />
     <item android:color="@color/navigation_drawer_item_text" />
 </selector>

app/src/main/res/drawable-mdpi/ic_facebook_white.xml → app/src/main/res/drawable-mdpi/ic_facebook.xml

@@ -4,6 +4,6 @@
         android:viewportHeight="266.895"
         android:viewportWidth="266.893">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M182.41,262.31v-99.8h33.5l5.02,-38.9h-38.51V98.78c0,-11.26 3.13,-18.93 19.27,-18.93l20.6,-0.01V45.04c-3.56,-0.47 -15.79,-1.53 -30.01,-1.53c-29.69,0 -50.03,18.13 -50.03,51.41v28.68h-33.58v38.9h33.58v99.8H182.41z"/>
 </vector>

app/src/main/res/drawable-mdpi/ic_github_white.xml → app/src/main/res/drawable-mdpi/ic_github.xml

@@ -5,7 +5,6 @@
         android:viewportWidth="40.723747">
     <path
         android:fillAlpha="1"
-        android:fillColor="#FFFFFF"
-        android:pathData="m20.36,0c-11.24,0 -20.36,9.12 -20.36,20.36 0,9 5.83,16.63 13.93,19.32 1.02,0.19 1.39,-0.44 1.39,-0.98 0,-0.48 -0.02,-1.76 -0.03,-3.46 -5.66,1.23 -6.86,-2.73 -6.86,-2.73 -0.93,-2.35 -2.26,-2.98 -2.26,-2.98 -1.85,-1.26 0.14,-1.24 0.14,-1.24 2.04,0.14 3.12,2.1 3.12,2.1 1.82,3.11 4.77,2.21 5.93,1.69 0.19,-1.32 0.71,-2.21 1.29,-2.72 -4.52,-0.51 -9.27,-2.26 -9.27,-10.06 0,-2.22 0.79,-4.04 2.1,-5.46 -0.21,-0.51 -0.91,-2.59 0.2,-5.39 0,0 1.71,-0.55 5.6,2.09 1.62,-0.45 3.37,-0.68 5.1,-0.68 1.73,0.01 3.47,0.23 5.1,0.68 3.89,-2.63 5.59,-2.09 5.59,-2.09 1.11,2.8 0.41,4.87 0.2,5.39 1.31,1.42 2.09,3.24 2.09,5.46 0,7.82 -4.76,9.54 -9.3,10.05 0.73,0.63 1.38,1.87 1.38,3.77 0,2.72 -0.02,4.92 -0.02,5.59 0,0.54 0.37,1.18 1.4,0.98 8.09,-2.7 13.91,-10.33 13.91,-19.32C40.72,9.12 31.61,0 20.36,0"
-        android:strokeColor="#00000000"/>
+        android:fillColor="@color/text_primary"
+        android:pathData="m20.36,0c-11.24,0 -20.36,9.12 -20.36,20.36 0,9 5.83,16.63 13.93,19.32 1.02,0.19 1.39,-0.44 1.39,-0.98 0,-0.48 -0.02,-1.76 -0.03,-3.46 -5.66,1.23 -6.86,-2.73 -6.86,-2.73 -0.93,-2.35 -2.26,-2.98 -2.26,-2.98 -1.85,-1.26 0.14,-1.24 0.14,-1.24 2.04,0.14 3.12,2.1 3.12,2.1 1.82,3.11 4.77,2.21 5.93,1.69 0.19,-1.32 0.71,-2.21 1.29,-2.72 -4.52,-0.51 -9.27,-2.26 -9.27,-10.06 0,-2.22 0.79,-4.04 2.1,-5.46 -0.21,-0.51 -0.91,-2.59 0.2,-5.39 0,0 1.71,-0.55 5.6,2.09 1.62,-0.45 3.37,-0.68 5.1,-0.68 1.73,0.01 3.47,0.23 5.1,0.68 3.89,-2.63 5.59,-2.09 5.59,-2.09 1.11,2.8 0.41,4.87 0.2,5.39 1.31,1.42 2.09,3.24 2.09,5.46 0,7.82 -4.76,9.54 -9.3,10.05 0.73,0.63 1.38,1.87 1.38,3.77 0,2.72 -0.02,4.92 -0.02,5.59 0,0.54 0.37,1.18 1.4,0.98 8.09,-2.7 13.91,-10.33 13.91,-19.32C40.72,9.12 31.61,0 20.36,0" />
 </vector>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/default_window_background" />
     <corners
         android:topLeftRadius="@dimen/material_corner_radius"
         android:topRightRadius="@dimen/material_corner_radius" />

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

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>

app/src/main/res/drawable/ic_action_info_black.xml → app/src/main/res/drawable/ic_action_info.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
 </vector>

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

@@ -5,9 +5,9 @@
         android:viewportWidth="24.0">
     <path
         android:fillAlpha=".3"
-        android:fillColor="#000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M3.53,10.95l8.46,10.54 0.01,0.01 0.01,-0.01 8.46,-10.54C20.04,10.62 16.81,8 12,8c-4.81,0 -8.04,2.62 -8.47,2.95z"/>
 </vector>

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

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_secondary"
         android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm-1,5v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
 </vector>

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

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>

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

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
 </vector>

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

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>

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

@@ -10,7 +10,7 @@
                 android:viewportHeight="24.0">
             <path
                 android:name="arrowPath"
-                android:fillColor="#FFFFFF"
+                android:fillColor="@color/text_primary"
                 android:pathData="@string/arrow_up_path"/>
         </vector>
     </aapt:attr>

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

@@ -10,7 +10,7 @@
                 android:viewportHeight="24.0">
             <path
                 android:name="arrowPath"
-                android:fillColor="#FFFFFF"
+                android:fillColor="@color/text_primary"
                 android:pathData="@string/arrow_down_path"/>
         </vector>
     </aapt:attr>

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

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z"/>
 </vector>

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

@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
 </vector>