diff --git a/app/build.gradle b/app/build.gradle index 3b43eca985..d4c47e4802 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,7 +72,7 @@ dependencies { implementation 'android.arch.work:work-runtime-ktx:1.0.1' implementation 'com.camerakit:camerakit:1.0.0-beta3.11' implementation 'com.camerakit:jpegkit:0.1.0' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.60' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2' implementation 'com.itkacher.okhttpprofiler:okhttpprofiler:1.0.5' implementation 'com.github.bumptech.glide:glide:4.10.0' diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/common/BaseActivity.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/common/BaseActivity.kt index 087a0a5466..fb9cd681f7 100644 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/common/BaseActivity.kt +++ b/app/src/main/java/com/navi/medici/androidCustomerApp/common/BaseActivity.kt @@ -7,9 +7,12 @@ package com.navi.medici.androidCustomerApp.common import androidx.appcompat.app.AppCompatActivity +import kotlinx.android.synthetic.main.toolbar.* abstract class BaseActivity : AppCompatActivity() { - protected abstract val screenName: String + protected fun setToolbarTitle(title: String = "") { + toolbar.title = title + } } \ No newline at end of file diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/common/UserDataWorker.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/common/UserDataWorker.kt deleted file mode 100644 index 95e64fba0b..0000000000 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/common/UserDataWorker.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.navi.medici.androidCustomerApp.common - -import android.Manifest -import android.content.Context -import android.database.Cursor -import android.net.Uri -import android.util.Log -import androidx.work.CoroutineWorker -import androidx.work.WorkerParameters - -class UserDataWorker(context: Context, params: WorkerParameters) : - CoroutineWorker(context, params) { - - override suspend fun doWork(): Result { - return try { - readUserDataFor(Permission.READ_SMS) - readUserDataFor(Permission.READ_CALL_LOG) - Result.success() - } catch (e: Exception) { - Result.retry() - } - } - - private fun readUserDataFor(permission: Permission) { - val cursor: Cursor? = - applicationContext.contentResolver.query( - Uri.parse(permission.uri), - null, - null, - null, - null - ) - cursor?.run { - if (!moveToFirst()) return - do { - for (i in 0 until columnCount) { - Log.i( - "${permission.qualifier}: ${getColumnName(i)}: ", - getString(i) ?: "" - ) - } - Log.i("separator", "--------------\n") - } while (moveToNext()) - } - cursor?.close() - } - - companion object { - const val WORK_NAME = "USER_DATA_WORKER" - } -} - -private enum class Permission( - val qualifier: String, - val uri: String -) { - READ_SMS(Manifest.permission.READ_SMS, "content://sms/inbox"), - READ_CALL_LOG(Manifest.permission.READ_CALL_LOG, "content://call_log/calls") -} \ No newline at end of file diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/ui/activities/BottomNavigationActivity.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/ui/activities/BottomNavigationActivity.kt index 52e3508400..57fd487355 100644 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/ui/activities/BottomNavigationActivity.kt +++ b/app/src/main/java/com/navi/medici/androidCustomerApp/ui/activities/BottomNavigationActivity.kt @@ -3,16 +3,18 @@ package com.navi.medici.androidCustomerApp.ui.activities import android.os.Bundle import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentActivity import com.navi.medici.androidCustomerApp.R +import com.navi.medici.androidCustomerApp.common.BaseActivity import com.navi.medici.androidCustomerApp.databinding.ActivityBottomNavigationBinding import com.navi.medici.androidCustomerApp.ui.fragments.MyLoansFragment import com.navi.medici.androidCustomerApp.ui.fragments.OfferAcceptFragment import com.navi.medici.androidCustomerApp.ui.fragments.PreliminaryOfferFragment -class BottomNavigationActivity : FragmentActivity() { +class BottomNavigationActivity : BaseActivity() { private lateinit var binding: ActivityBottomNavigationBinding + override val screenName: String + get() = "" override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/res/layout/activity_bottom_navigation.xml b/app/src/main/res/layout/activity_bottom_navigation.xml index 9a5d5490a4..e6ba667232 100644 --- a/app/src/main/res/layout/activity_bottom_navigation.xml +++ b/app/src/main/res/layout/activity_bottom_navigation.xml @@ -8,6 +8,10 @@ android:layout_height="match_parent" tools:context=".ui.activities.BottomNavigationActivity"> + + + app:layout_constraintTop_toBottomOf="@+id/include" /> + + + + +