36 support file uploads for submissions

app/dependencies.gradle

@@ -39,25 +39,25 @@ dependencies {
     // AndroidX
     // architecture
     implementation "androidx.multidex:multidex:2.0.0"
-    implementation "androidx.appcompat:appcompat:1.0.0-rc01"
+    implementation "androidx.appcompat:appcompat:1.0.0-rc02"
     implementation "androidx.lifecycle:lifecycle-extensions:2.0.0-rc01"
     kapt "androidx.lifecycle:lifecycle-compiler:2.0.0-rc01"
     implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha05'
     implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha05'
-    implementation "androidx.browser:browser:1.0.0-rc01"
-    implementation "androidx.annotation:annotation:1.0.0-rc01"
+    implementation "androidx.browser:browser:1.0.0-rc02"
+    implementation "androidx.annotation:annotation:1.0.0-rc02"
     // ui
-    implementation "com.google.android.material:material:1.0.0-rc01"
-    implementation "androidx.cardview:cardview:1.0.0-rc01"
-    implementation "androidx.recyclerview:recyclerview:1.0.0-rc01"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.2"
+    implementation "com.google.android.material:material:1.0.0-rc02"
+    implementation "androidx.cardview:cardview:1.0.0-rc02"
+    implementation "androidx.recyclerview:recyclerview:1.0.0-rc02"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     // other
-    implementation "androidx.core:core-ktx:1.0.0-rc01"
+    implementation "androidx.core:core-ktx:1.0.0-rc02"
 
     // unit tests
     testImplementation "junit:junit:4.12"
 
     // instrumented tests
-    androidTestImplementation "androidx.annotation:annotation:1.0.0-rc01"
+    androidTestImplementation "androidx.annotation:annotation:1.0.0-rc02"
     androidTestImplementation "androidx.test:runner:1.1.0-alpha4"
 }

app/src/main/AndroidManifest.xml

@@ -34,6 +34,17 @@
 
         <activity android:name=".controllers.login.LoginActivity" />
 
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
     </application>
 
 </manifest>

app/src/main/java/org/schulcloud/mobile/config/Config.kt

@@ -1,8 +1,12 @@
 package org.schulcloud.mobile.config
 
+import org.schulcloud.mobile.BuildConfig
+
 object Config {
     val HEADER_AUTH = "Authorization"
     val HEADER_AUTH_VALUE_PREFIX = "Bearer "
 
     val REALM_SCHEMA_VERSION = 1L
+
+    const val FILE_PROVIDER = "${BuildConfig.APPLICATION_ID}.fileprovider"
 }

app/src/main/java/org/schulcloud/mobile/controllers/base/BaseActivity.kt

@@ -1,10 +1,14 @@
 package org.schulcloud.mobile.controllers.base
 
+import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageManager
+import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.ViewModelProviders
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.launch
@@ -14,39 +18,36 @@ import org.schulcloud.mobile.utils.asUri
 import org.schulcloud.mobile.utils.openUrl
 import org.schulcloud.mobile.utils.setup
 import org.schulcloud.mobile.utils.shareLink
-import java.util.*
-import kotlin.coroutines.experimental.Continuation
+import org.schulcloud.mobile.viewmodels.BaseActivityViewModel
 import kotlin.coroutines.experimental.suspendCoroutine
 import kotlin.properties.Delegates
 
 
-abstract class BaseActivity : AppCompatActivity() {
+abstract class BaseActivity : AppCompatActivity(), ContextAware {
+    override val baseActivity: BaseActivity? get() = this
+    override val currentContext: Context get() = this
+
     open var url: String? = null
     var swipeRefreshLayout by Delegates.observable<SwipeRefreshLayout?>(null) { _, _, new ->
         new?.setup()
         new?.setOnRefreshListener { performRefresh() }
     }
 
-    private val permissionRequests: MutableList<Continuation<Boolean>>
-            by lazy { LinkedList<Continuation<Boolean>>() }
+    private val viewModel: BaseActivityViewModel by lazy {
+        ViewModelProviders.of(this).get(BaseActivityViewModel::class.java)
+    }
 
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when (item?.itemId) {
             R.id.base_action_share -> shareLink(url!!, supportActionBar?.title)
             R.id.base_action_refresh -> performRefresh()
-        // TODO: Remove when deep linking is readded
+            // TODO: Remove when deep linking is readded
             R.id.base_action_openInBrowser -> openUrl(url.asUri())
             else -> return super.onOptionsItemSelected(item)
         }
         return true
     }
 
-    protected fun setupActionBar() {
-        supportActionBar?.apply {
-            setDisplayHomeAsUpEnabled(true)
-        }
-    }
-
     protected open suspend fun refresh() {}
     protected fun performRefresh() {
         swipeRefreshLayout?.isRefreshing = true
@@ -56,29 +57,36 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
-    suspend fun requestPermission(permission: String): Boolean = suspendCoroutine { cont ->
+
+    override suspend fun requestPermission(permission: String): Boolean = suspendCoroutine { cont ->
         if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
             cont.resume(true)
             return@suspendCoroutine
         }
 
-        permissionRequests.add(cont)
-        ActivityCompat.requestPermissions(this, arrayOf(permission), permissionRequests.size - 1)
+        ActivityCompat.requestPermissions(this, arrayOf(permission), viewModel.addPermissionRequest(cont))
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         // Request not from this class
-        if (requestCode >= permissionRequests.size) {
+        if (!viewModel.onPermissionResult(requestCode, permissions, grantResults)) {
             super.onRequestPermissionsResult(requestCode, permissions, grantResults)
             return
         }
+    }
 
-        //The request was interrupted
-        if (permissions.isEmpty()) {
-            permissionRequests[requestCode].resume(false)
-            return
+
+    override suspend fun startActivityForResult(intent: Intent, options: Bundle?): StartActivityResult {
+        return suspendCoroutine { cont ->
+            startActivityForResult(intent, viewModel.addActivityRequest(cont), options)
         }
+    }
 
-        permissionRequests[requestCode].resume(grantResults[0] == PackageManager.PERMISSION_GRANTED)
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        // Request not from this class
+        if (!viewModel.onActivityResult(requestCode, resultCode, data)) {
+            super.onActivityResult(requestCode, resultCode, data)
+            return
+        }
     }
 }

app/src/main/java/org/schulcloud/mobile/controllers/base/BaseFragment.kt

@@ -1,9 +1,20 @@
 package org.schulcloud.mobile.controllers.base
 
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
 import androidx.fragment.app.Fragment
 
-abstract class BaseFragment : Fragment() {
-    val baseActivity: BaseActivity? get() = activity as? BaseActivity
 
-    suspend fun requestPermission(permission: String): Boolean = baseActivity?.requestPermission(permission) ?: false
+abstract class BaseFragment : Fragment(), ContextAware {
+    override val baseActivity: BaseActivity? get() = activity as? BaseActivity
+    override val currentContext: Context get() = context!!
+
+    override suspend fun requestPermission(permission: String): Boolean {
+        return baseActivity?.requestPermission(permission) ?: false
+    }
+
+    override suspend fun startActivityForResult(intent: Intent, options: Bundle?): StartActivityResult {
+        return baseActivity?.startActivityForResult(intent, options) ?: StartActivityResult.error()
+    }
 }

app/src/main/java/org/schulcloud/mobile/controllers/base/BaseSheet.kt

@@ -0,0 +1,24 @@
+package org.schulcloud.mobile.controllers.base
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.FragmentManager
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+
+abstract class BaseSheet : BottomSheetDialogFragment(), ContextAware {
+    override val baseActivity: BaseActivity? get() = activity as? BaseActivity
+    override val currentContext: Context get() = context!!
+
+    override suspend fun requestPermission(permission: String): Boolean {
+        return baseActivity?.requestPermission(permission) ?: false
+    }
+
+    override suspend fun startActivityForResult(intent: Intent, options: Bundle?): StartActivityResult {
+        return baseActivity?.startActivityForResult(intent, options) ?: StartActivityResult.error()
+    }
+
+
+    fun show(manager: FragmentManager?) = super.show(manager, tag)
+}

app/src/main/java/org/schulcloud/mobile/controllers/base/ContextAware.kt

@@ -0,0 +1,25 @@
+package org.schulcloud.mobile.controllers.base
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+
+interface ContextAware {
+
+    val baseActivity: BaseActivity?
+    val currentContext: Context
+
+    suspend fun requestPermission(permission: String): Boolean
+    suspend fun startActivityForResult(intent: Intent, options: Bundle? = null): StartActivityResult
+
+}
+
+data class StartActivityResult(
+    val success: Boolean,
+    val data: Intent?
+) {
+    companion object {
+        fun success(data: Intent?): StartActivityResult = StartActivityResult(true, data)
+        fun error(): StartActivityResult = StartActivityResult(false, null)
+    }
+}

app/src/main/java/org/schulcloud/mobile/controllers/course/CourseFragment.kt

@@ -24,7 +24,7 @@ import org.schulcloud.mobile.viewmodels.CourseViewModel
 import org.schulcloud.mobile.viewmodels.IdViewModelFactory
 import org.schulcloud.mobile.views.DividerItemDecoration
 
-class CourseFragment : MainFragment<CourseViewModel>() {
+class CourseFragment : MainFragment<CourseFragment, CourseViewModel>() {
     companion object {
         val TAG: String = CourseFragment::class.java.simpleName
     }
@@ -40,11 +40,11 @@ class CourseFragment : MainFragment<CourseViewModel>() {
     override var url: String? = null
         get() = "/courses/${viewModel.course.value?.id}"
 
-    override fun provideConfig() = viewModel.course.map { course ->
+    override fun provideSelfConfig() = viewModel.course.map { course ->
         MainFragmentConfig(
                 title = course?.name ?: getString(R.string.general_error_notFound),
                 toolbarColor = if (course != null) Color.parseColor(course.color) else null,
-                menuBottomRes = R.menu.fragment_course_bottom
+                menuBottomRes = listOf(R.menu.fragment_course_bottom)
         )
     }
 

app/src/main/java/org/schulcloud/mobile/controllers/course/CourseListFragment.kt

@@ -17,7 +17,8 @@ import org.schulcloud.mobile.utils.asLiveData
 import org.schulcloud.mobile.viewmodels.CourseListViewModel
 import org.schulcloud.mobile.views.ItemOffsetDecoration
 
-class CourseListFragment : MainFragment<CourseListViewModel>() {
+
+class CourseListFragment : MainFragment<CourseListFragment, CourseListViewModel>() {
     companion object {
         val TAG: String = CourseListFragment::class.java.simpleName
     }
@@ -31,7 +32,7 @@ class CourseListFragment : MainFragment<CourseListViewModel>() {
 
 
     override var url: String? = "/courses"
-    override fun provideConfig() = MainFragmentConfig(
+    override fun provideSelfConfig() = MainFragmentConfig(
             fragmentType = FragmentType.PRIMARY,
             title = getString(R.string.course_title)
     ).asLiveData()

app/src/main/java/org/schulcloud/mobile/controllers/dashboard/DashboardFragment.kt

@@ -11,7 +11,8 @@ import org.schulcloud.mobile.controllers.main.MainFragment
 import org.schulcloud.mobile.controllers.main.MainFragmentConfig
 import org.schulcloud.mobile.utils.asLiveData
 
-class DashboardFragment : MainFragment<ViewModel>() {
+
+class DashboardFragment : MainFragment<DashboardFragment, ViewModel>() {
     companion object {
         val TAG: String = DashboardFragment::class.java.simpleName
     }
@@ -20,7 +21,7 @@ class DashboardFragment : MainFragment<ViewModel>() {
 
 
     override var url: String? = "/dashboard"
-    override fun provideConfig() = MainFragmentConfig(
+    override fun provideSelfConfig() = MainFragmentConfig(
             fragmentType = FragmentType.PRIMARY,
             title = getString(R.string.dashboard_title)
     ).asLiveData()

app/src/main/java/org/schulcloud/mobile/controllers/file/BreadcrumbsView.kt

@@ -1,13 +1,13 @@
 package org.schulcloud.mobile.controllers.file
 
 import android.content.Context
+import android.graphics.Color
 import android.graphics.PorterDuff
 import android.os.Build
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.widget.TextView
 import androidx.annotation.AttrRes
-import androidx.annotation.ColorInt
 import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.content.res.getDimensionOrThrow
@@ -20,6 +20,7 @@ import org.schulcloud.mobile.utils.combinePath
 import org.schulcloud.mobile.utils.getPathParts
 import org.schulcloud.mobile.utils.limit
 import org.schulcloud.mobile.views.CompatTextView
+import kotlin.properties.Delegates
 
 open class BreadcrumbsView @JvmOverloads constructor(
     context: Context,
@@ -32,6 +33,12 @@ open class BreadcrumbsView @JvmOverloads constructor(
 
     var onPathSelected: ((String) -> Unit)? = null
 
+    var textColor: Int by Delegates.observable(Color.WHITE) { _, _, new ->
+        for (child in children)
+            (child as? TextView)?.setTextColor(new)
+        dividerDrawable.setColorFilter(new, PorterDuff.Mode.SRC_ATOP)
+    }
+
     private var textSize: Float = 0f
 
     init {
@@ -64,16 +71,11 @@ open class BreadcrumbsView @JvmOverloads constructor(
             addPartView(parts.limit(i + 1).combinePath(), parts[i])
     }
 
-    fun setTextColor(@ColorInt color: Int) {
-        for (child in children)
-            (child as? TextView)?.setTextColor(color)
-        dividerDrawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP)
-    }
-
     private fun addPartView(path: String, title: String) {
         addView(CompatTextView(context).also {
-            it.textSize = textSize
+            it.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
             it.text = title
+            it.setTextColor(textColor)
             it.setOnClickListener { onPathSelected?.invoke(path) }
 
             with(TypedValue()) {