From 4d985fff61b95839e3663e3cc4f76e1c45d52f90 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Fri, 25 Sep 2020 20:53:14 +0200
Subject: [PATCH 01/11] register app to receive magnet/torrent intent

---
 app/app/src/main/AndroidManifest.xml | 122 +++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml
index 992298cc1..eacc0e819 100644
--- a/app/app/src/main/AndroidManifest.xml
+++ b/app/app/src/main/AndroidManifest.xml
@@ -20,6 +20,128 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <!-- Shamelessly copied from LibreTorrent-->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent"
+                    android:scheme="file" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.torrent"
+                    android:scheme="file" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent"
+                    android:scheme="content" />
+            </intent-filter>
+            <!-- accept all the incoming torrent and magnet links -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.torrent"
+                    android:scheme="content" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.torrent"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.torrent"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern=".*\\.torrent"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern=".*\\.torrent"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="magnet" />
+            </intent-filter>
         </activity>
 
         <meta-data

From 38a1a7f43e1f896c48ee20a86cbd9f68e396679e Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Sat, 26 Sep 2020 16:56:33 +0200
Subject: [PATCH 02/11] support null for isMagnet extension

---
 .../unchained/utilities/extension/StringExtension.kt          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/StringExtension.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/StringExtension.kt
index d357ba3c2..cd30c9bfc 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/StringExtension.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/StringExtension.kt
@@ -18,7 +18,9 @@ fun String.isWebUrl(): Boolean =
 /**
  * check if a String is a magnet link
  */
-fun String.isMagnet(): Boolean {
+fun String?.isMagnet(): Boolean {
+    if (this == null)
+        return false
     val m: Matcher = Pattern.compile(MAGNET_PATTERN).matcher(this)
     return m.lookingAt()
 }

From a45f4204d06c9b9d21b1eb774aca2b0c17253fd0 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Sat, 26 Sep 2020 16:57:07 +0200
Subject: [PATCH 03/11] added Context version of showToast extension

---
 .../unchained/utilities/extension/Extension.kt                | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
index 19c56506d..bebf8c3fd 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
@@ -25,6 +25,10 @@ fun Fragment.showToast(stringResource: Int, length: Int = Toast.LENGTH_SHORT) {
     Toast.makeText(requireContext(), getString(stringResource), length).show()
 }
 
+fun Context.showToast(stringResource: Int, length: Int = Toast.LENGTH_SHORT) {
+    Toast.makeText(this, getString(stringResource), length).show()
+}
+
 /**
  * Show a toast message
  * @param message: the message and shown

From 17e124e420bbb979aacbbbaaa77a899127884619 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Mon, 28 Sep 2020 11:26:17 +0200
Subject: [PATCH 04/11] added livedata extension functions

---
 .../utilities/extension/Extension.kt          | 58 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
index bebf8c3fd..90fd3b4c4 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
@@ -11,9 +11,13 @@ import android.net.Uri
 import android.util.Log
 import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.Observer
 import com.github.livingwithhippos.unchained.BuildConfig
 import com.github.livingwithhippos.unchained.R
-import java.util.*
+import java.util.Locale
 
 /**
 * Show a toast message
@@ -25,8 +29,10 @@ fun Fragment.showToast(stringResource: Int, length: Int = Toast.LENGTH_SHORT) {
     Toast.makeText(requireContext(), getString(stringResource), length).show()
 }
 
-fun Context.showToast(stringResource: Int, length: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(this, getString(stringResource), length).show()
+fun Context.showToast(stringResource: Int, length: Int = Toast.LENGTH_SHORT) = this.showToast(getString(stringResource, length))
+
+fun Context.showToast(message: String, length: Int = Toast.LENGTH_SHORT) {
+    Toast.makeText(this, message, length).show()
 }
 
 /**
@@ -111,4 +117,50 @@ fun Activity.getUpdatedLocaleContext(context: Context, language: String): Contex
     Locale.setDefault(locale)
     configuration.setLocale(locale)
     return context.createConfigurationContext(configuration)
+}
+
+fun <T, K, R> LiveData<T>.combineWith(
+    liveData: LiveData<K>,
+    block: (T?, K?) -> R
+): LiveData<R> {
+    val result = MediatorLiveData<R>()
+    result.addSource(this) {
+        result.value = block(this.value, liveData.value)
+    }
+    result.addSource(liveData) {
+        result.value = block(this.value, liveData.value)
+    }
+    return result
+}
+
+fun <T, K> zipLiveData(t: LiveData<T>, k: LiveData<K>): LiveData<Pair<T, K>> {
+    return MediatorLiveData<Pair<T, K>>().apply {
+        var lastT: T? = null
+        var lastK: K? = null
+
+        fun update() {
+            val localLastT = lastT
+            val localLastK = lastK
+            if (localLastT != null && localLastK != null)
+                this.value = Pair(localLastT, localLastK)
+        }
+
+        addSource(t) {
+            lastT = it
+            update()
+        }
+        addSource(k) {
+            lastK = it
+            update()
+        }
+    }
+}
+
+fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer<T>) {
+    observe(lifecycleOwner, object : Observer<T> {
+        override fun onChanged(t: T?) {
+            observer.onChanged(t)
+            removeObserver(this)
+        }
+    })
 }
\ No newline at end of file

From 44663b71346eb5abb061b1469e0ba97b0b6ac4f8 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Mon, 28 Sep 2020 11:28:00 +0200
Subject: [PATCH 05/11] process external click on magnet links as a new
 download

---
 .../unchained/base/MainActivity.kt            | 41 ++++++++++++++++++-
 .../newdownload/view/NewDownloadFragment.kt   |  9 ++++
 .../start/viewmodel/MainActivityViewModel.kt  |  7 ++++
 app/app/src/main/res/values-it/strings.xml    |  4 +-
 app/app/src/main/res/values/strings.xml       |  2 +
 5 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
index 3586a00fd..312158cb0 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
@@ -1,5 +1,8 @@
 package com.github.livingwithhippos.unchained.base
 
+
+import com.github.livingwithhippos.unchained.utilities.extension.observeOnce
+
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
@@ -13,6 +16,8 @@ import com.github.livingwithhippos.unchained.databinding.ActivityMainBinding
 import com.github.livingwithhippos.unchained.settings.SettingsActivity
 import com.github.livingwithhippos.unchained.start.viewmodel.MainActivityViewModel
 import com.github.livingwithhippos.unchained.utilities.BottomNavManager
+import com.github.livingwithhippos.unchained.utilities.extension.isMagnet
+import com.github.livingwithhippos.unchained.utilities.extension.showToast
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -27,6 +32,8 @@ class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
 
+    val viewModel: MainActivityViewModel by viewModels()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -47,7 +54,6 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        val viewModel: MainActivityViewModel by viewModels()
         viewModel.authenticationState.observe(this, Observer { state ->
             when (state.peekContent()) {
                 // go to login fragment
@@ -71,6 +77,39 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         })
+
+        getIntentData()
+    }
+
+    private fun getIntentData() {
+
+        intent?.let{
+            /* Implicit intent with path to torrent file, http or magnet link */
+
+            // clicks on magnets arrive here
+            val data = it.data
+            // check uri content
+            if (data!=null && data.toString().isMagnet()) {
+                // check auth state before loading them
+                viewModel.authenticationState.observeOnce(this, { auth ->
+                    when (auth.peekContent()) {
+                        AuthenticationState.AUTHENTICATED -> processMagnetIntent(data.toString())
+                        AuthenticationState.AUTHENTICATED_NO_PREMIUM -> baseContext.showToast(R.string.premium_needed_torrent)
+                        else -> showToast(R.string.please_login)
+                    }
+                })
+
+            }
+        }
+    }
+
+    private fun processMagnetIntent(magnet: String) {
+        // simulate click on new download tab
+        val bottomNav = findViewById<BottomNavigationView>(R.id.bottom_nav_view)
+        if (bottomNav.selectedItemId != R.id.navigation_download) {
+            bottomNav.selectedItemId = R.id.navigation_download
+        }
+        viewModel.addMagnet(magnet)
     }
 
     private fun openSettings() {
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
index aab719b0a..286264deb 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
@@ -192,6 +192,15 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
             downloadBinding.bUnrestrict.runRippleAnimation()
         }
 
+        activityViewModel.externalMagnetLiveData.observe(viewLifecycleOwner, {
+            it.getContentIfNotHandled()?.let { magnet ->
+                // set as text input text
+                downloadBinding.tiLink.setText(magnet, TextView.BufferType.EDITABLE)
+                // simulate button click
+                downloadBinding.bUnrestrict.performClick()
+            }
+        })
+
         return downloadBinding.root
     }
 
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
index 17e48ec2f..f478ba81e 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
@@ -13,6 +13,7 @@ import com.github.livingwithhippos.unchained.data.repositoy.UserRepository
 import com.github.livingwithhippos.unchained.data.model.User
 import com.github.livingwithhippos.unchained.utilities.Event
 import com.github.livingwithhippos.unchained.utilities.PRIVATE_TOKEN
+import com.github.livingwithhippos.unchained.utilities.extension.zipLiveData
 import kotlinx.coroutines.launch
 
 /**
@@ -29,6 +30,8 @@ class MainActivityViewModel @ViewModelInject constructor(
 
     val userLiveData = MutableLiveData<User?>()
 
+    val externalMagnetLiveData = MutableLiveData<Event<String?>>()
+
     // fixme: this is here because userLiveData.postValue(user) is throwing an unsafe error
     //  but auto-correcting it changes the value of val authenticationState = MutableLiveData<Event<AuthenticationState>>() to a nullable one
     @SuppressLint("NullSafeMutableLiveData")
@@ -129,4 +132,8 @@ class MainActivityViewModel @ViewModelInject constructor(
         }
     }
 
+    fun addMagnet(magnet: String) {
+        externalMagnetLiveData.postValue(Event(magnet))
+    }
+
 }
\ No newline at end of file
diff --git a/app/app/src/main/res/values-it/strings.xml b/app/app/src/main/res/values-it/strings.xml
index 19ef7cb37..e10af6b5c 100644
--- a/app/app/src/main/res/values-it/strings.xml
+++ b/app/app/src/main/res/values-it/strings.xml
@@ -53,7 +53,7 @@
     <string name="magnet_conversion">Conversione Magnet</string>
     <string name="waiting_files_selection">In attesa di selezione files</string>
     <string name="queued">In coda</string>
-    <string name="downloading">Scaricando</string>
+    <string name="downloading">Scaricamento</string>
     <string name="downloaded">Scaricato</string>
     <string name="error">Errore</string>
     <string name="virus">Virus</string>
@@ -144,4 +144,6 @@
     <string name="premium_needed">Per utilizzare questa funzionalità è richiesto un account premium</string>
     <string name="downloading_torrent">Torrent in preparazione, attendere…</string>
     <string name="please_insert_url">Inserisci un magnet o un link</string>
+    <string name="please_login">Si prega di autenticarsi sull\'account</string>
+    <string name="premium_needed_torrent">Per torrent e magnet è richiestoun abbonamento premium</string>
 </resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/values/strings.xml b/app/app/src/main/res/values/strings.xml
index 3f78de59d..f3e7e52fd 100644
--- a/app/app/src/main/res/values/strings.xml
+++ b/app/app/src/main/res/values/strings.xml
@@ -356,6 +356,8 @@
     ]]>
     </string>
     <string name="premium_needed">A premium subscription is required to use this</string>
+    <string name="premium_needed_torrent">A premium subscription is required for magnet and torrents</string>
     <string name="downloading_torrent">Preparing torrent, please wait…</string>
     <string name="please_insert_url">Please insert a magnet or a link</string>
+    <string name="please_login">Please log in your account</string>
 </resources>
\ No newline at end of file

From ebd5ed9309cfc30e1b891fe323d6491b499e6b44 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Mon, 28 Sep 2020 11:41:42 +0200
Subject: [PATCH 06/11] some layout updates

---
 .../res/layout/fragment_torrent_details.xml   |  6 +++--
 .../main/res/layout/fragment_user_profile.xml | 23 ++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/app/src/main/res/layout/fragment_torrent_details.xml b/app/app/src/main/res/layout/fragment_torrent_details.xml
index d5cd5fc58..3c214eb93 100644
--- a/app/app/src/main/res/layout/fragment_torrent_details.xml
+++ b/app/app/src/main/res/layout/fragment_torrent_details.xml
@@ -53,7 +53,8 @@
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/cvTorrentDetails"
-            android:layout_width="350dp"
+            android:layout_width="0dp"
+            app:layout_constraintWidth_max="400dp"
             android:layout_height="wrap_content"
             android:layout_margin="20dp"
             android:checkable="false"
@@ -128,7 +129,8 @@
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/cvDownloadDetails"
-            android:layout_width="350dp"
+            android:layout_width="0dp"
+            app:layout_constraintWidth_max="400dp"
             android:layout_height="wrap_content"
             android:layout_margin="20dp"
             android:checkable="false"
diff --git a/app/app/src/main/res/layout/fragment_user_profile.xml b/app/app/src/main/res/layout/fragment_user_profile.xml
index 53feed009..ebe9a62bc 100644
--- a/app/app/src/main/res/layout/fragment_user_profile.xml
+++ b/app/app/src/main/res/layout/fragment_user_profile.xml
@@ -29,7 +29,6 @@
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
             android:layout_marginTop="30dp"
             android:layout_marginEnd="20dp"
             android:ellipsize="end"
@@ -37,7 +36,7 @@
             android:text="@{user.username, default=`User Name`}"
             android:textAppearance="?attr/textAppearanceHeadline5"
             app:layout_constraintEnd_toStartOf="@id/ivProfilePic"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@id/cvPremium"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -57,16 +56,16 @@
             android:id="@+id/ivProfilePic"
             android:layout_width="70dp"
             android:layout_height="70dp"
-            android:layout_marginEnd="30dp"
             android:contentDescription="@string/user_avatar"
             android:src="@drawable/android_black"
             app:imageURL="@{user.avatar}"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/cvPremium"
             app:layout_constraintTop_toTopOf="@id/tvName" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/cvPremium"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
+            app:layout_constraintWidth_max="500dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="20dp"
@@ -159,15 +158,13 @@
             style="@style/TextAppearance.UnchainedTheme.Body2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:layout_marginStart="20dp"
             android:layout_marginTop="10dp"
             android:autoLink="web"
             android:textAlignment="center"
             android:text="@{privateToken == true ? @string/login_type_private : @string/login_type_open, default=@string/login_type_private }"
             app:layout_constraintBottom_toTopOf="@+id/divider"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/cvPremium"
+            app:layout_constraintEnd_toEndOf="@id/cvPremium"
             app:layout_constraintTop_toBottomOf="@id/cvPremium" />
 
         <View
@@ -176,7 +173,7 @@
             android:layout_width="300dp"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="10dp"
             app:layout_constraintTop_toBottomOf="@+id/tvLoginDescription"
             app:layout_constraintBottom_toTopOf="@+id/tvDescription"
             app:layout_constraintEnd_toEndOf="parent"
@@ -189,15 +186,13 @@
             style="@style/TextAppearance.UnchainedTheme.Body2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:layout_marginStart="20dp"
             android:layout_marginTop="10dp"
             android:autoLink="web"
             android:textAlignment="center"
             android:text="@string/rd_settings_link_description"
             app:layout_constraintBottom_toTopOf="@+id/bPremium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/cvPremium"
+            app:layout_constraintEnd_toEndOf="@id/cvPremium"
             app:layout_constraintTop_toBottomOf="@id/divider" />
 
         <Button

From a40cf09424c65f2ebbf3a4fce633008ca48461fe Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Mon, 28 Sep 2020 12:31:26 +0200
Subject: [PATCH 07/11] added torrent files external support

---
 .../unchained/base/MainActivity.kt            | 35 ++++++++++++-------
 .../newdownload/view/NewDownloadFragment.kt   | 25 +++++++++----
 .../start/viewmodel/MainActivityViewModel.kt  |  7 ++--
 .../unchained/utilities/Constants.kt          |  4 +++
 app/app/src/main/res/values-it/strings.xml    |  2 ++
 app/app/src/main/res/values/strings.xml       |  2 ++
 6 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
index 312158cb0..605c9ba33 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
@@ -1,9 +1,12 @@
 package com.github.livingwithhippos.unchained.base
 
 
+import android.content.ContentResolver.SCHEME_CONTENT
+import android.content.ContentResolver.SCHEME_FILE
 import com.github.livingwithhippos.unchained.utilities.extension.observeOnce
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -16,7 +19,9 @@ import com.github.livingwithhippos.unchained.databinding.ActivityMainBinding
 import com.github.livingwithhippos.unchained.settings.SettingsActivity
 import com.github.livingwithhippos.unchained.start.viewmodel.MainActivityViewModel
 import com.github.livingwithhippos.unchained.utilities.BottomNavManager
-import com.github.livingwithhippos.unchained.utilities.extension.isMagnet
+import com.github.livingwithhippos.unchained.utilities.SCHEME_HTTP
+import com.github.livingwithhippos.unchained.utilities.SCHEME_HTTPS
+import com.github.livingwithhippos.unchained.utilities.SCHEME_MAGNET
 import com.github.livingwithhippos.unchained.utilities.extension.showToast
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import dagger.hilt.android.AndroidEntryPoint
@@ -89,27 +94,33 @@ class MainActivity : AppCompatActivity() {
             // clicks on magnets arrive here
             val data = it.data
             // check uri content
-            if (data!=null && data.toString().isMagnet()) {
-                // check auth state before loading them
-                viewModel.authenticationState.observeOnce(this, { auth ->
-                    when (auth.peekContent()) {
-                        AuthenticationState.AUTHENTICATED -> processMagnetIntent(data.toString())
-                        AuthenticationState.AUTHENTICATED_NO_PREMIUM -> baseContext.showToast(R.string.premium_needed_torrent)
-                        else -> showToast(R.string.please_login)
+            if (data!=null) {
+
+                when (data.scheme) {
+                    //clicked on a torrent file or a magnet link
+                    SCHEME_MAGNET, SCHEME_CONTENT, SCHEME_FILE -> {
+                        // check auth state before loading it
+                        viewModel.authenticationState.observeOnce(this, { auth ->
+                            when (auth.peekContent()) {
+                                AuthenticationState.AUTHENTICATED -> processLinkIntent(data)
+                                AuthenticationState.AUTHENTICATED_NO_PREMIUM -> baseContext.showToast(R.string.premium_needed_torrent)
+                                else -> showToast(R.string.please_login)
+                            }
+                        })
                     }
-                })
-
+                    SCHEME_HTTP, SCHEME_HTTPS -> {}
+                }
             }
         }
     }
 
-    private fun processMagnetIntent(magnet: String) {
+    private fun processLinkIntent(uri: Uri) {
         // simulate click on new download tab
         val bottomNav = findViewById<BottomNavigationView>(R.id.bottom_nav_view)
         if (bottomNav.selectedItemId != R.id.navigation_download) {
             bottomNav.selectedItemId = R.id.navigation_download
         }
-        viewModel.addMagnet(magnet)
+        viewModel.addLink(uri)
     }
 
     private fun openSettings() {
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
index 286264deb..e3c7358d4 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
@@ -1,6 +1,8 @@
 package com.github.livingwithhippos.unchained.newdownload.view
 
 import android.content.ContentResolver
+import android.content.ContentResolver.SCHEME_CONTENT
+import android.content.ContentResolver.SCHEME_FILE
 import android.net.Uri
 import android.os.Bundle
 import android.os.ParcelFileDescriptor
@@ -21,8 +23,8 @@ import com.github.livingwithhippos.unchained.base.UnchainedFragment
 import com.github.livingwithhippos.unchained.data.model.AuthenticationState
 import com.github.livingwithhippos.unchained.databinding.NewDownloadFragmentBinding
 import com.github.livingwithhippos.unchained.newdownload.viewmodel.NewDownloadViewModel
-import com.github.livingwithhippos.unchained.start.viewmodel.MainActivityViewModel
 import com.github.livingwithhippos.unchained.utilities.REMOTE_TRAFFIC_ON
+import com.github.livingwithhippos.unchained.utilities.SCHEME_MAGNET
 import com.github.livingwithhippos.unchained.utilities.extension.getClipboardText
 import com.github.livingwithhippos.unchained.utilities.extension.isMagnet
 import com.github.livingwithhippos.unchained.utilities.extension.isWebUrl
@@ -192,12 +194,21 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
             downloadBinding.bUnrestrict.runRippleAnimation()
         }
 
-        activityViewModel.externalMagnetLiveData.observe(viewLifecycleOwner, {
-            it.getContentIfNotHandled()?.let { magnet ->
-                // set as text input text
-                downloadBinding.tiLink.setText(magnet, TextView.BufferType.EDITABLE)
-                // simulate button click
-                downloadBinding.bUnrestrict.performClick()
+        activityViewModel.externalLinkLiveData.observe(viewLifecycleOwner, {
+            it.getContentIfNotHandled()?.let { link ->
+                when (link.scheme)  {
+                    SCHEME_MAGNET -> {
+                        showToast(R.string.loading_magnet_link)
+                        // set as text input text
+                        downloadBinding.tiLink.setText(link.toString(), TextView.BufferType.EDITABLE)
+                        // simulate button click
+                        downloadBinding.bUnrestrict.performClick()
+                    }
+                    SCHEME_CONTENT, SCHEME_FILE -> {
+                        showToast(R.string.loading_torrent_file)
+                        loadTorrent(requireContext().contentResolver, link)
+                    }
+                }
             }
         })
 
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
index f478ba81e..eb053bd6b 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
@@ -1,6 +1,7 @@
 package com.github.livingwithhippos.unchained.start.viewmodel
 
 import android.annotation.SuppressLint
+import android.net.Uri
 import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -30,7 +31,7 @@ class MainActivityViewModel @ViewModelInject constructor(
 
     val userLiveData = MutableLiveData<User?>()
 
-    val externalMagnetLiveData = MutableLiveData<Event<String?>>()
+    val externalLinkLiveData = MutableLiveData<Event<Uri?>>()
 
     // fixme: this is here because userLiveData.postValue(user) is throwing an unsafe error
     //  but auto-correcting it changes the value of val authenticationState = MutableLiveData<Event<AuthenticationState>>() to a nullable one
@@ -132,8 +133,8 @@ class MainActivityViewModel @ViewModelInject constructor(
         }
     }
 
-    fun addMagnet(magnet: String) {
-        externalMagnetLiveData.postValue(Event(magnet))
+    fun addLink(uri: Uri) {
+        externalLinkLiveData.postValue(Event(uri))
     }
 
 }
\ No newline at end of file
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
index 3fefad431..7b455ce6f 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
@@ -20,6 +20,10 @@ const val MAGNET_PATTERN: String = "magnet:\\?xt=urn:btih:[a-zA-Z0-9]{32}"
 const val FEEDBACK_URL="https://github.com/LivingWithHippos/unchained-android"
 const val GPLV3_URL="https://www.gnu.org/licenses/gpl-3.0.en.html"
 
+const val SCHEME_MAGNET="magnet"
+const val SCHEME_HTTP="http"
+const val SCHEME_HTTPS="https"
+
 val errorMap = mapOf(
     -1 to "Internal error",
     1 to "Missing parameter",
diff --git a/app/app/src/main/res/values-it/strings.xml b/app/app/src/main/res/values-it/strings.xml
index e10af6b5c..705ddb01e 100644
--- a/app/app/src/main/res/values-it/strings.xml
+++ b/app/app/src/main/res/values-it/strings.xml
@@ -146,4 +146,6 @@
     <string name="please_insert_url">Inserisci un magnet o un link</string>
     <string name="please_login">Si prega di autenticarsi sull\'account</string>
     <string name="premium_needed_torrent">Per torrent e magnet è richiestoun abbonamento premium</string>
+    <string name="loading_magnet_link">Caricando link magnet...</string>
+    <string name="loading_torrent_file">Caricando file torrent...</string>
 </resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/values/strings.xml b/app/app/src/main/res/values/strings.xml
index f3e7e52fd..829b17886 100644
--- a/app/app/src/main/res/values/strings.xml
+++ b/app/app/src/main/res/values/strings.xml
@@ -360,4 +360,6 @@
     <string name="downloading_torrent">Preparing torrent, please wait…</string>
     <string name="please_insert_url">Please insert a magnet or a link</string>
     <string name="please_login">Please log in your account</string>
+    <string name="loading_magnet_link">Loading magnet link…</string>
+    <string name="loading_torrent_file">Loading torrent file…</string>
 </resources>
\ No newline at end of file

From d10e5cefcf301152386a2c5d2cb7c048804a16cc Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Mon, 28 Sep 2020 18:03:15 +0200
Subject: [PATCH 08/11] added torrent files link support

---
 app/app/src/main/AndroidManifest.xml          |   5 +
 .../unchained/base/MainActivity.kt            | 115 ++++++++++++++----
 .../newdownload/view/NewDownloadFragment.kt   |  45 ++++++-
 .../start/viewmodel/MainActivityViewModel.kt  |  25 +++-
 .../unchained/utilities/Constants.kt          |   1 +
 .../utilities/extension/StringExtension.kt    |  11 ++
 app/app/src/main/res/values-it/strings.xml    |   2 +
 app/app/src/main/res/values/strings.xml       |   2 +
 8 files changed, 182 insertions(+), 24 deletions(-)

diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml
index eacc0e819..4518be726 100644
--- a/app/app/src/main/AndroidManifest.xml
+++ b/app/app/src/main/AndroidManifest.xml
@@ -21,6 +21,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <!-- Shamelessly copied from LibreTorrent-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain"/>
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
index 605c9ba33..b0ee9a6a8 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/base/MainActivity.kt
@@ -1,11 +1,13 @@
 package com.github.livingwithhippos.unchained.base
 
 
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
 import android.content.ContentResolver.SCHEME_CONTENT
 import android.content.ContentResolver.SCHEME_FILE
-import com.github.livingwithhippos.unchained.utilities.extension.observeOnce
-
+import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.net.Uri
 import android.os.Bundle
 import androidx.activity.viewModels
@@ -22,10 +24,14 @@ import com.github.livingwithhippos.unchained.utilities.BottomNavManager
 import com.github.livingwithhippos.unchained.utilities.SCHEME_HTTP
 import com.github.livingwithhippos.unchained.utilities.SCHEME_HTTPS
 import com.github.livingwithhippos.unchained.utilities.SCHEME_MAGNET
+import com.github.livingwithhippos.unchained.utilities.extension.isMagnet
+import com.github.livingwithhippos.unchained.utilities.extension.isTorrent
+import com.github.livingwithhippos.unchained.utilities.extension.observeOnce
 import com.github.livingwithhippos.unchained.utilities.extension.showToast
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import dagger.hilt.android.AndroidEntryPoint
 
+
 /**
  * A [AppCompatActivity] subclass.
  * Shared between all the fragments except for the preferences.
@@ -59,6 +65,7 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        // manage the authentication state
         viewModel.authenticationState.observe(this, Observer { state ->
             when (state.peekContent()) {
                 // go to login fragment
@@ -83,37 +90,101 @@ class MainActivity : AppCompatActivity() {
             }
         })
 
+        // check if the app has been opened by clicking on torrents/magnet on sharing links
         getIntentData()
+
+        // observe for torrents downloaded
+        registerReceiver(getDownloadCompleteReceiver(), IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+    }
+
+    private fun getDownloadCompleteReceiver(): BroadcastReceiver {
+        return object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                intent?.let {
+                    viewModel.checkDownload(it.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1))
+                }
+            }
+        }
     }
 
     private fun getIntentData() {
 
-        intent?.let{
-            /* Implicit intent with path to torrent file, http or magnet link */
-
-            // clicks on magnets arrive here
-            val data = it.data
-            // check uri content
-            if (data!=null) {
-
-                when (data.scheme) {
-                    //clicked on a torrent file or a magnet link
-                    SCHEME_MAGNET, SCHEME_CONTENT, SCHEME_FILE -> {
-                        // check auth state before loading it
-                        viewModel.authenticationState.observeOnce(this, { auth ->
-                            when (auth.peekContent()) {
-                                AuthenticationState.AUTHENTICATED -> processLinkIntent(data)
-                                AuthenticationState.AUTHENTICATED_NO_PREMIUM -> baseContext.showToast(R.string.premium_needed_torrent)
-                                else -> showToast(R.string.please_login)
+        when (intent?.action) {
+            Intent.ACTION_SEND -> {
+                if (intent.type == "text/plain")
+                    intent.getStringExtra(Intent.EXTRA_TEXT)?.let { text ->
+                        when {
+                            text.isMagnet() -> {
+                                // check auth state before loading it
+                                viewModel.authenticationState.observeOnce(this, { auth ->
+                                    when (auth.peekContent()) {
+                                        AuthenticationState.AUTHENTICATED -> processLinkIntent(text)
+                                        AuthenticationState.AUTHENTICATED_NO_PREMIUM -> baseContext.showToast(
+                                            R.string.premium_needed_torrent
+                                        )
+                                        else -> showToast(R.string.please_login)
+                                    }
+                                })
+                            }
+                            text.isTorrent() -> {
+                                viewModel.authenticationState.observeOnce(this, { auth ->
+                                    when (auth.peekContent()) {
+                                        AuthenticationState.AUTHENTICATED -> processLinkIntent(text)
+                                        AuthenticationState.AUTHENTICATED_NO_PREMIUM -> baseContext.showToast(
+                                            R.string.premium_needed_torrent
+                                        )
+                                        else -> showToast(R.string.please_login)
+                                    }
+                                })
                             }
-                        })
+                            else -> {
+                                // we do not have other cases
+                            }
+                        }
+                    }
+
+            }
+            Intent.ACTION_VIEW -> {
+                /* Implicit intent with path to torrent file or magnet link */
+
+                val data = intent.data
+                // check uri content
+                if (data != null) {
+
+                    when (data.scheme) {
+                        //clicked on a torrent file or a magnet link
+                        SCHEME_MAGNET, SCHEME_CONTENT, SCHEME_FILE -> {
+                            // check auth state before loading it
+                            viewModel.authenticationState.observeOnce(this, { auth ->
+                                when (auth.peekContent()) {
+                                    AuthenticationState.AUTHENTICATED -> processLinkIntent(data)
+                                    AuthenticationState.AUTHENTICATED_NO_PREMIUM -> baseContext.showToast(
+                                        R.string.premium_needed_torrent
+                                    )
+                                    else -> showToast(R.string.please_login)
+                                }
+                            })
+                        }
+                        SCHEME_HTTP, SCHEME_HTTPS -> {
+                            showToast("You activated the http/s scheme somehow")
+                        }
                     }
-                    SCHEME_HTTP, SCHEME_HTTPS -> {}
                 }
             }
+            null -> { // app opened directly by the user. Do nothing.
+            }
+            else -> {
+
+            }
         }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        //todo: test if this works (probably not)
+        unregisterReceiver(getDownloadCompleteReceiver())
+    }
+
     private fun processLinkIntent(uri: Uri) {
         // simulate click on new download tab
         val bottomNav = findViewById<BottomNavigationView>(R.id.bottom_nav_view)
@@ -123,6 +194,8 @@ class MainActivity : AppCompatActivity() {
         viewModel.addLink(uri)
     }
 
+    private fun processLinkIntent(text: String) = processLinkIntent(Uri.parse(text))
+
     private fun openSettings() {
         val intent = Intent(this, SettingsActivity::class.java)
         startActivity(intent)
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
index e3c7358d4..627d151d6 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
@@ -1,10 +1,13 @@
 package com.github.livingwithhippos.unchained.newdownload.view
 
+import android.app.DownloadManager
 import android.content.ContentResolver
 import android.content.ContentResolver.SCHEME_CONTENT
 import android.content.ContentResolver.SCHEME_FILE
+import android.content.Context
 import android.net.Uri
 import android.os.Bundle
+import android.os.Environment
 import android.os.ParcelFileDescriptor
 import android.util.Log
 import android.view.LayoutInflater
@@ -13,6 +16,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.net.toUri
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
@@ -24,6 +28,8 @@ import com.github.livingwithhippos.unchained.data.model.AuthenticationState
 import com.github.livingwithhippos.unchained.databinding.NewDownloadFragmentBinding
 import com.github.livingwithhippos.unchained.newdownload.viewmodel.NewDownloadViewModel
 import com.github.livingwithhippos.unchained.utilities.REMOTE_TRAFFIC_ON
+import com.github.livingwithhippos.unchained.utilities.SCHEME_HTTP
+import com.github.livingwithhippos.unchained.utilities.SCHEME_HTTPS
 import com.github.livingwithhippos.unchained.utilities.SCHEME_MAGNET
 import com.github.livingwithhippos.unchained.utilities.extension.getClipboardText
 import com.github.livingwithhippos.unchained.utilities.extension.isMagnet
@@ -31,8 +37,12 @@ import com.github.livingwithhippos.unchained.utilities.extension.isWebUrl
 import com.github.livingwithhippos.unchained.utilities.extension.runRippleAnimation
 import com.github.livingwithhippos.unchained.utilities.extension.showToast
 import dagger.hilt.android.AndroidEntryPoint
+import java.io.File
 import java.io.FileDescriptor
 import java.io.FileInputStream
+import java.nio.file.Path
+import java.util.regex.Matcher
+import java.util.regex.Pattern
 
 /**
  * A simple [UnchainedFragment] subclass.
@@ -75,6 +85,7 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
 
         viewModel.apiErrorLiveData.observe(viewLifecycleOwner, Observer {
             it.getContentIfNotHandled()?.let { error ->
+                //todo: move this code outside onCreateView
                 when (error.errorCode) {
                     -1 -> showToast(R.string.internal_error)
                     1 -> showToast(R.string.missing_parameter)
@@ -196,11 +207,14 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
 
         activityViewModel.externalLinkLiveData.observe(viewLifecycleOwner, {
             it.getContentIfNotHandled()?.let { link ->
-                when (link.scheme)  {
+                when (link.scheme) {
                     SCHEME_MAGNET -> {
                         showToast(R.string.loading_magnet_link)
                         // set as text input text
-                        downloadBinding.tiLink.setText(link.toString(), TextView.BufferType.EDITABLE)
+                        downloadBinding.tiLink.setText(
+                            link.toString(),
+                            TextView.BufferType.EDITABLE
+                        )
                         // simulate button click
                         downloadBinding.bUnrestrict.performClick()
                     }
@@ -208,10 +222,21 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
                         showToast(R.string.loading_torrent_file)
                         loadTorrent(requireContext().contentResolver, link)
                     }
+                    SCHEME_HTTP, SCHEME_HTTPS -> {
+                        showToast(R.string.loading_torrent_file)
+                        downloadTorrent(link)
+                    }
                 }
             }
         })
 
+        activityViewModel.downloadedTorrentLiveData.observe(viewLifecycleOwner, {
+            it.getContentIfNotHandled()?.let { fileName ->
+                val torrentFile = File(requireContext().getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),fileName)
+                loadTorrent(requireContext().contentResolver, torrentFile.toUri())
+            }
+        })
+
         return downloadBinding.root
     }
 
@@ -251,6 +276,22 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
         }
 
     }
+
+    private fun downloadTorrent(uri: Uri) {
+        val nameRegex= "/([^/]+.torrent)\$"
+        val m: Matcher = Pattern.compile(nameRegex).matcher(uri.toString())
+        val torrentName = if(m.find())m.group(1) else null
+        if (!torrentName.isNullOrBlank() && context!=null) {
+            val manager = requireContext().getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+            val request: DownloadManager.Request = DownloadManager.Request(uri)
+                .setTitle(getString(R.string.unchained_torrent_download))
+                .setDescription(getString(R.string.temporary_torrent_download))
+                .setDestinationInExternalFilesDir(requireContext(), Environment.DIRECTORY_DOWNLOADS,torrentName)
+            val downloadID = manager.enqueue(request)
+            activityViewModel.setDownload(downloadID, torrentName)
+        }
+
+    }
 }
 
 interface NewDownloadListener {
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
index eb053bd6b..83fc845ec 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/start/viewmodel/MainActivityViewModel.kt
@@ -2,8 +2,10 @@ package com.github.livingwithhippos.unchained.start.viewmodel
 
 import android.annotation.SuppressLint
 import android.net.Uri
+import androidx.hilt.Assisted
 import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.github.livingwithhippos.unchained.data.model.AuthenticationState
@@ -14,7 +16,6 @@ import com.github.livingwithhippos.unchained.data.repositoy.UserRepository
 import com.github.livingwithhippos.unchained.data.model.User
 import com.github.livingwithhippos.unchained.utilities.Event
 import com.github.livingwithhippos.unchained.utilities.PRIVATE_TOKEN
-import com.github.livingwithhippos.unchained.utilities.extension.zipLiveData
 import kotlinx.coroutines.launch
 
 /**
@@ -22,6 +23,7 @@ import kotlinx.coroutines.launch
  * Shared between the fragments to observe the authentication status and update it.
  */
 class MainActivityViewModel @ViewModelInject constructor(
+    @Assisted private val savedStateHandle: SavedStateHandle,
     private val authRepository: AuthenticationRepository,
     private val credentialRepository: CredentialsRepository,
     private val userRepository: UserRepository
@@ -33,6 +35,8 @@ class MainActivityViewModel @ViewModelInject constructor(
 
     val externalLinkLiveData = MutableLiveData<Event<Uri?>>()
 
+    val downloadedTorrentLiveData = MutableLiveData<Event<String?>>()
+
     // fixme: this is here because userLiveData.postValue(user) is throwing an unsafe error
     //  but auto-correcting it changes the value of val authenticationState = MutableLiveData<Event<AuthenticationState>>() to a nullable one
     @SuppressLint("NullSafeMutableLiveData")
@@ -137,4 +141,23 @@ class MainActivityViewModel @ViewModelInject constructor(
         externalLinkLiveData.postValue(Event(uri))
     }
 
+    fun setDownload(downloadID: Long, filePath: String) {
+        savedStateHandle.set(KEY_TORRENT_DOWNLOAD_ID, downloadID)
+        savedStateHandle.set(KEY_TORRENT_PATH, filePath)
+    }
+
+    fun checkDownload(downloadID: Long) {
+        val id = savedStateHandle.get<Long>(KEY_TORRENT_DOWNLOAD_ID)
+        if (id == downloadID) {
+            val fileName = savedStateHandle.get<String>(KEY_TORRENT_PATH)
+            if (fileName != null)
+                downloadedTorrentLiveData.postValue(Event(fileName))
+        }
+    }
+
+    companion object {
+        const val KEY_TORRENT_DOWNLOAD_ID = "torrent_download_id_key"
+        const val KEY_TORRENT_PATH = "torrent_path_key"
+    }
+
 }
\ No newline at end of file
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
index 7b455ce6f..792e05b1a 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
@@ -16,6 +16,7 @@ const val REMOTE_TRAFFIC_OFF: Int = 0
 const val REMOTE_TRAFFIC_ON: Int = 1
 
 const val MAGNET_PATTERN: String = "magnet:\\?xt=urn:btih:[a-zA-Z0-9]{32}"
+const val TORRENT_PATTERN: String = "https?://[^\\s]{7,}.torrent"
 
 const val FEEDBACK_URL="https://github.com/LivingWithHippos/unchained-android"
 const val GPLV3_URL="https://www.gnu.org/licenses/gpl-3.0.en.html"
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/StringExtension.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/StringExtension.kt
index cd30c9bfc..a55611ce1 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/StringExtension.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/StringExtension.kt
@@ -5,6 +5,7 @@ import android.icu.text.DateFormat
 import android.icu.text.SimpleDateFormat
 import android.util.Patterns
 import com.github.livingwithhippos.unchained.utilities.MAGNET_PATTERN
+import com.github.livingwithhippos.unchained.utilities.TORRENT_PATTERN
 import java.util.*
 import java.util.regex.Matcher
 import java.util.regex.Pattern
@@ -25,6 +26,16 @@ fun String?.isMagnet(): Boolean {
     return m.lookingAt()
 }
 
+/**
+ * check if a String is a torrent link
+ */
+fun String?.isTorrent(): Boolean {
+    if (this == null)
+        return false
+    val m: Matcher = Pattern.compile(TORRENT_PATTERN).matcher(this)
+    return m.matches()
+}
+
 /**
  * parse a string from a custom date pattern to the current Locale pattern
  * @return the parsed String
diff --git a/app/app/src/main/res/values-it/strings.xml b/app/app/src/main/res/values-it/strings.xml
index 705ddb01e..1db309961 100644
--- a/app/app/src/main/res/values-it/strings.xml
+++ b/app/app/src/main/res/values-it/strings.xml
@@ -148,4 +148,6 @@
     <string name="premium_needed_torrent">Per torrent e magnet è richiestoun abbonamento premium</string>
     <string name="loading_magnet_link">Caricando link magnet...</string>
     <string name="loading_torrent_file">Caricando file torrent...</string>
+    <string name="unchained_torrent_download">Unchained Scaricamento Torrent</string>
+    <string name="temporary_torrent_download">Scaricamento temporaneo di un file torrent</string>
 </resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/values/strings.xml b/app/app/src/main/res/values/strings.xml
index 829b17886..61c8344e8 100644
--- a/app/app/src/main/res/values/strings.xml
+++ b/app/app/src/main/res/values/strings.xml
@@ -362,4 +362,6 @@
     <string name="please_login">Please log in your account</string>
     <string name="loading_magnet_link">Loading magnet link…</string>
     <string name="loading_torrent_file">Loading torrent file…</string>
+    <string name="unchained_torrent_download">Unchained Torrent Download</string>
+    <string name="temporary_torrent_download">Temporary download of a torrent file</string>
 </resources>
\ No newline at end of file

From 242995971b6867ba250e91b633f378d50b9e92c5 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Mon, 28 Sep 2020 18:36:59 +0200
Subject: [PATCH 09/11] switched to wider toast extension

---
 .../view/AuthenticationFragment.kt            |  4 +-
 .../view/DownloadDetailsFragment.kt           |  4 +-
 .../unchained/lists/view/ListsTabFragment.kt  |  8 +-
 .../newdownload/view/NewDownloadFragment.kt   | 88 +++++++++----------
 .../utilities/extension/Extension.kt          | 15 +---
 5 files changed, 56 insertions(+), 63 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/authentication/view/AuthenticationFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/authentication/view/AuthenticationFragment.kt
index 604b6b991..f3fc31a9f 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/authentication/view/AuthenticationFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/authentication/view/AuthenticationFragment.kt
@@ -109,7 +109,7 @@ class AuthenticationFragment : UnchainedFragment(), ButtonListener {
 
     override fun onCopyClick(text: String) {
         copyToClipboard("real-debrid authorization code", text)
-        showToast(R.string.code_copied)
+        context?.showToast(R.string.code_copied)
     }
 
     override fun onInsertTokenClick(etToken: EditText) {
@@ -117,7 +117,7 @@ class AuthenticationFragment : UnchainedFragment(), ButtonListener {
         val token = etToken.text.toString().trim()
         // mine is 52 characters
         if (token.length < 40)
-            showToast(R.string.invalid_token)
+            context?.showToast(R.string.invalid_token)
         else
         // pass the value to be checked and eventually saved
             viewModel.checkAndSaveToken(privateKey = token)
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/view/DownloadDetailsFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/view/DownloadDetailsFragment.kt
index 447afb115..df0af65a1 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/view/DownloadDetailsFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/view/DownloadDetailsFragment.kt
@@ -50,7 +50,7 @@ class DownloadDetailsFragment : UnchainedFragment(), DownloadDetailsListener {
 
     override fun onCopyClick(text: String) {
         copyToClipboard("Real-Debrid Download Link", text)
-        showToast(R.string.link_copied)
+        context?.showToast(R.string.link_copied)
     }
 
     override fun onOpenClick(url: String) {
@@ -62,7 +62,7 @@ class DownloadDetailsFragment : UnchainedFragment(), DownloadDetailsListener {
             if (activityViewModel.isTokenPrivate()) {
                 viewModel.fetchStreamingInfo(id)
             } else
-                showToast(R.string.api_needs_private_token)
+                context?.showToast(R.string.api_needs_private_token)
 
         }
     }
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/lists/view/ListsTabFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/lists/view/ListsTabFragment.kt
index cfc5543a0..6eb746f96 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/lists/view/ListsTabFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/lists/view/ListsTabFragment.kt
@@ -167,7 +167,7 @@ class ListsTabFragment : UnchainedFragment(), DownloadListListener, TorrentListL
             val action = ListsTabFragmentDirections.actionListsTabToDownloadDetails(item)
             findNavController().navigate(action)
         } else
-            showToast(R.string.premium_needed)
+            context?.showToast(R.string.premium_needed)
     }
 
     override fun onClick(item: TorrentItem) {
@@ -176,13 +176,13 @@ class ListsTabFragment : UnchainedFragment(), DownloadListListener, TorrentListL
             if (item.status == "downloaded") {
                 // if the item has many links to download, show a toast
                 if (item.links.size>2)
-                    showToast(R.string.downloading_torrent)
+                    context?.showToast(R.string.downloading_torrent)
                 viewModel.downloadTorrent(item)
             }
             else
-                showToast(R.string.torrent_not_downloaded)
+                context?.showToast(R.string.torrent_not_downloaded)
         } else
-            showToast(R.string.premium_needed)
+            context?.showToast(R.string.premium_needed)
     }
 
     companion object {
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
index 627d151d6..8f591c02e 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/newdownload/view/NewDownloadFragment.kt
@@ -87,52 +87,52 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
             it.getContentIfNotHandled()?.let { error ->
                 //todo: move this code outside onCreateView
                 when (error.errorCode) {
-                    -1 -> showToast(R.string.internal_error)
-                    1 -> showToast(R.string.missing_parameter)
-                    2 -> showToast(R.string.bad_parameter_value)
-                    3 -> showToast(R.string.unknown_method)
-                    4 -> showToast(R.string.method_not_allowed)
+                    -1 -> context?.showToast(R.string.internal_error)
+                    1 -> context?.showToast(R.string.missing_parameter)
+                    2 -> context?.showToast(R.string.bad_parameter_value)
+                    3 -> context?.showToast(R.string.unknown_method)
+                    4 -> context?.showToast(R.string.method_not_allowed)
                     // what is this error for?
-                    5 -> showToast(R.string.slow_down)
-                    6 -> showToast(R.string.resource_unreachable)
-                    7 -> showToast(R.string.resource_not_found)
+                    5 -> context?.showToast(R.string.slow_down)
+                    6 -> context?.showToast(R.string.resource_unreachable)
+                    7 -> context?.showToast(R.string.resource_not_found)
                     //todo: check these
                     8 -> {
-                        showToast(R.string.bad_token)
+                        context?.showToast(R.string.bad_token)
                         activityViewModel.setUnauthenticated()
                     }
-                    9 -> showToast(R.string.permission_denied)
-                    10 -> showToast(R.string.tfa_needed)
-                    11 -> showToast(R.string.tfa_pending)
+                    9 -> context?.showToast(R.string.permission_denied)
+                    10 -> context?.showToast(R.string.tfa_needed)
+                    11 -> context?.showToast(R.string.tfa_pending)
                     12 -> {
-                        showToast(R.string.invalid_login)
+                        context?.showToast(R.string.invalid_login)
                         activityViewModel.setUnauthenticated()
                     }
-                    13 -> showToast(R.string.invalid_password)
+                    13 -> context?.showToast(R.string.invalid_password)
                     14 -> {
-                        showToast(R.string.account_locked)
+                        context?.showToast(R.string.account_locked)
                         activityViewModel.setUnauthenticated()
                     }
-                    15 -> showToast(R.string.account_not_activated)
-                    16 -> showToast(R.string.unsupported_hoster)
-                    17 -> showToast(R.string.hoster_in_maintenance)
-                    18 -> showToast(R.string.hoster_limit_reached)
-                    19 -> showToast(R.string.hoster_temporarily_unavailable)
-                    20 -> showToast(R.string.hoster_not_available_for_free_users)
-                    21 -> showToast(R.string.too_many_active_downloads)
-                    22 -> showToast(R.string.ip_Address_not_allowed)
-                    23 -> showToast(R.string.traffic_exhausted)
-                    24 -> showToast(R.string.file_unavailable)
-                    25 -> showToast(R.string.service_unavailable)
-                    26 -> showToast(R.string.upload_too_big)
-                    27 -> showToast(R.string.upload_error)
-                    28 -> showToast(R.string.file_not_allowed)
-                    29 -> showToast(R.string.torrent_too_big)
-                    30 -> showToast(R.string.torrent_file_invalid)
-                    31 -> showToast(R.string.action_already_done)
-                    32 -> showToast(R.string.image_resolution_error)
-                    33 -> showToast(R.string.torrent_already_active)
-                    else -> showToast(R.string.error_unrestricting_download)
+                    15 -> context?.showToast(R.string.account_not_activated)
+                    16 -> context?.showToast(R.string.unsupported_hoster)
+                    17 -> context?.showToast(R.string.hoster_in_maintenance)
+                    18 -> context?.showToast(R.string.hoster_limit_reached)
+                    19 -> context?.showToast(R.string.hoster_temporarily_unavailable)
+                    20 -> context?.showToast(R.string.hoster_not_available_for_free_users)
+                    21 -> context?.showToast(R.string.too_many_active_downloads)
+                    22 -> context?.showToast(R.string.ip_Address_not_allowed)
+                    23 -> context?.showToast(R.string.traffic_exhausted)
+                    24 -> context?.showToast(R.string.file_unavailable)
+                    25 -> context?.showToast(R.string.service_unavailable)
+                    26 -> context?.showToast(R.string.upload_too_big)
+                    27 -> context?.showToast(R.string.upload_error)
+                    28 -> context?.showToast(R.string.file_not_allowed)
+                    29 -> context?.showToast(R.string.torrent_too_big)
+                    30 -> context?.showToast(R.string.torrent_file_invalid)
+                    31 -> context?.showToast(R.string.action_already_done)
+                    32 -> context?.showToast(R.string.image_resolution_error)
+                    33 -> context?.showToast(R.string.torrent_already_active)
+                    else -> context?.showToast(R.string.error_unrestricting_download)
                 }
                 // re enable buttons to let the user take other actions
                 //todo: this needs to be done also for other errors. maybe throw another error from the ViewModel
@@ -172,16 +172,16 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
                         viewModel.fetchAddedMagnet(link)
                     }
                     link.isBlank()-> {
-                        showToast(R.string.please_insert_url)
+                        context?.showToast(R.string.please_insert_url)
                     }
                     else -> {
-                        showToast(R.string.invalid_url)
+                        context?.showToast(R.string.invalid_url)
                     }
                 }
 
             }
             else
-                showToast(R.string.premium_needed)
+                context?.showToast(R.string.premium_needed)
         }
 
         downloadBinding.bPasteLink.setOnClickListener {
@@ -190,7 +190,7 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
             if (pasteText.isWebUrl() || pasteText.isMagnet())
                 downloadBinding.tiLink.setText(pasteText, TextView.BufferType.EDITABLE)
             else
-                showToast(R.string.invalid_url)
+                context?.showToast(R.string.invalid_url)
         }
 
         downloadBinding.bPastePassword.setOnClickListener {
@@ -209,7 +209,7 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
             it.getContentIfNotHandled()?.let { link ->
                 when (link.scheme) {
                     SCHEME_MAGNET -> {
-                        showToast(R.string.loading_magnet_link)
+                        context?.showToast(R.string.loading_magnet_link)
                         // set as text input text
                         downloadBinding.tiLink.setText(
                             link.toString(),
@@ -219,11 +219,11 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
                         downloadBinding.bUnrestrict.performClick()
                     }
                     SCHEME_CONTENT, SCHEME_FILE -> {
-                        showToast(R.string.loading_torrent_file)
+                        context?.showToast(R.string.loading_torrent_file)
                         loadTorrent(requireContext().contentResolver, link)
                     }
                     SCHEME_HTTP, SCHEME_HTTPS -> {
-                        showToast(R.string.loading_torrent_file)
+                        context?.showToast(R.string.loading_torrent_file)
                         downloadTorrent(link)
                     }
                 }
@@ -245,7 +245,7 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
             if (uri != null) {
                 loadTorrent(requireContext().contentResolver, uri)
             } else {
-                showToast(R.string.error_loading_torrent)
+                context?.showToast(R.string.error_loading_torrent)
             }
         }
 
@@ -254,7 +254,7 @@ class NewDownloadFragment : UnchainedFragment(), NewDownloadListener {
         if (authState == AuthenticationState.AUTHENTICATED)
             getTorrent.launch("application/x-bittorrent")
         else
-            showToast(R.string.premium_needed)
+            context?.showToast(R.string.premium_needed)
     }
 
     private fun loadTorrent(contentResolver: ContentResolver, uri: Uri) {
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
index 90fd3b4c4..d7217218c 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/Extension.kt
@@ -25,23 +25,15 @@ import java.util.Locale
  * @param length How long to display the message.  Either {@link #LENGTH_SHORT} or
  *                 {@link #LENGTH_LONG} Defaults to short
 */
-fun Fragment.showToast(stringResource: Int, length: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(requireContext(), getString(stringResource), length).show()
-}
-
 fun Context.showToast(stringResource: Int, length: Int = Toast.LENGTH_SHORT) = this.showToast(getString(stringResource, length))
 
-fun Context.showToast(message: String, length: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(this, message, length).show()
-}
-
 /**
  * Show a toast message
  * @param message: the message and shown
  * @param length: the duration of the toast. Defaults to short
  */
-fun Fragment.showToast(message: String, length: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(requireContext(), message, length).show()
+fun Context.showToast(message: String, length: Int = Toast.LENGTH_SHORT) {
+    Toast.makeText(this, message, length).show()
 }
 
 /**
@@ -93,7 +85,8 @@ fun Fragment.openExternalWebPage(url: String, showErrorToast: Boolean = true): B
         return true
     } else
         if (showErrorToast)
-            showToast(R.string.invalid_url)
+            context?.showToast(R.string.invalid_url)
+
 
     return false
 }

From 0e3d3eb098eaf6a2c3b2338e6f9514598e9fae02 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Mon, 28 Sep 2020 18:46:23 +0200
Subject: [PATCH 10/11] CHanged statusbar color for day theme

close #18
---
 app/app/src/main/res/values/colors.xml | 3 ++-
 app/app/src/main/res/values/themes.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/app/src/main/res/values/colors.xml b/app/app/src/main/res/values/colors.xml
index 017034e80..5201eb416 100644
--- a/app/app/src/main/res/values/colors.xml
+++ b/app/app/src/main/res/values/colors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="purple_200">#bb86fc</color> <!--Color primary (dark)-->
+    <color name="purple_100">#DFCCFB</color> <!--Color primary (dark)-->
+    <color name="purple_200">#A066F4</color> <!--Color primary (dark)-->
     <color name="purple_500">#6200ee</color> <!--Color primary (light)-->
     <color name="purple_600">#4b01d0</color> <!--Color primary variant (dark)-->
     <color name="purple_700">#3700b3</color> <!--Color primary variant (light)-->
diff --git a/app/app/src/main/res/values/themes.xml b/app/app/src/main/res/values/themes.xml
index 95597cc3f..8c99406cc 100644
--- a/app/app/src/main/res/values/themes.xml
+++ b/app/app/src/main/res/values/themes.xml
@@ -26,7 +26,7 @@
         <!--colorSecondary colors are most often used as accents on components, such as FABs and -->
         <!--selection controls.-->
         <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimaryVariant">@color/purple_100</item>
         <item name="colorSecondary">@color/green_200</item>
         <item name="colorSecondaryVariant">@color/green_500</item>
         <!--colorBackground appears behind scrollable content and is used for the default window-->

From 52de9c5ce66ab153d93046bb8b6f2bcc066d9a44 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Mon, 28 Sep 2020 18:48:46 +0200
Subject: [PATCH 11/11] Revert "CHanged statusbar color for day theme"

This reverts commit 0e3d3eb098eaf6a2c3b2338e6f9514598e9fae02.
---
 app/app/src/main/res/values/colors.xml | 3 +--
 app/app/src/main/res/values/themes.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/app/src/main/res/values/colors.xml b/app/app/src/main/res/values/colors.xml
index 5201eb416..017034e80 100644
--- a/app/app/src/main/res/values/colors.xml
+++ b/app/app/src/main/res/values/colors.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="purple_100">#DFCCFB</color> <!--Color primary (dark)-->
-    <color name="purple_200">#A066F4</color> <!--Color primary (dark)-->
+    <color name="purple_200">#bb86fc</color> <!--Color primary (dark)-->
     <color name="purple_500">#6200ee</color> <!--Color primary (light)-->
     <color name="purple_600">#4b01d0</color> <!--Color primary variant (dark)-->
     <color name="purple_700">#3700b3</color> <!--Color primary variant (light)-->
diff --git a/app/app/src/main/res/values/themes.xml b/app/app/src/main/res/values/themes.xml
index 8c99406cc..95597cc3f 100644
--- a/app/app/src/main/res/values/themes.xml
+++ b/app/app/src/main/res/values/themes.xml
@@ -26,7 +26,7 @@
         <!--colorSecondary colors are most often used as accents on components, such as FABs and -->
         <!--selection controls.-->
         <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_100</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
         <item name="colorSecondary">@color/green_200</item>
         <item name="colorSecondaryVariant">@color/green_500</item>
         <!--colorBackground appears behind scrollable content and is used for the default window-->