From 0ca4c04c61619a4ac492f5f6705a6272e13fe257 Mon Sep 17 00:00:00 2001 From: Amine Bou Date: Wed, 11 Apr 2018 22:24:58 +0200 Subject: [PATCH] Add to sources. --- .../bou/readerforselfoss/AddSourceActivity.kt | 41 ++++++++++++++++++- .../bou/readerforselfoss/SourcesActivity.kt | 8 +++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt index 6411d34..0bd0ca8 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt @@ -1,6 +1,7 @@ package apps.amine.bou.readerforselfoss import android.content.Intent +import android.os.Build import android.os.Bundle import android.preference.PreferenceManager import android.support.constraint.ConstraintLayout @@ -25,24 +26,58 @@ import kotlinx.android.synthetic.main.activity_add_source.* import retrofit2.Call import retrofit2.Callback import retrofit2.Response +import android.graphics.PorterDuff + + class AddSourceActivity : AppCompatActivity() { private var mSpoutsValue: String? = null private lateinit var api: SelfossApi + private lateinit var appColors: AppColors + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - AppColors(this@AddSourceActivity) + appColors = AppColors(this@AddSourceActivity) setContentView(R.layout.activity_add_source) - // TODO: add buttons and inputs + // TODO: input bubble cursor Scoop.getInstance() .bind(this, Toppings.PRIMARY.value, toolbar) .bindStatusBar(this, Toppings.PRIMARY_DARK.value) + val drawable = nameInput.background + drawable.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP) + + + // TODO: clean + if(Build.VERSION.SDK_INT > 16) { + nameInput.background = drawable + } else{ + nameInput.setBackgroundDrawable(drawable) + } + + val drawable1 = sourceUri.background + drawable1.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP) + + if(Build.VERSION.SDK_INT > 16) { + sourceUri.background = drawable1 + } else{ + sourceUri.setBackgroundDrawable(drawable1) + } + + val drawable2 = tags.background + drawable2.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP) + + if(Build.VERSION.SDK_INT > 16) { + tags.background = drawable2 + } else{ + tags.setBackgroundDrawable(drawable2) + } + setSupportActionBar(toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayShowHomeEnabled(true) @@ -61,6 +96,8 @@ class AddSourceActivity : AppCompatActivity() { maybeGetDetailsFromIntentSharing(intent, sourceUri, nameInput) + saveBtn.setTextColor(appColors.colorAccent) + saveBtn.setOnClickListener { handleSaveSource(tags, nameInput.text.toString(), sourceUri.text.toString(), api!!) } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt index 5199b6e..307d009 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt @@ -1,6 +1,7 @@ package apps.amine.bou.readerforselfoss import android.content.Intent +import android.content.res.ColorStateList import android.os.Bundle import android.preference.PreferenceManager import android.support.v7.app.AppCompatActivity @@ -19,10 +20,12 @@ import retrofit2.Response class SourcesActivity : AppCompatActivity() { + private lateinit var appColors: AppColors + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - AppColors(this@SourcesActivity) + appColors = AppColors(this@SourcesActivity) setContentView(R.layout.activity_sources) @@ -33,6 +36,9 @@ class SourcesActivity : AppCompatActivity() { setSupportActionBar(toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayShowHomeEnabled(true) + + fab.rippleColor = appColors.colorAccentDark + fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent) } override fun onStop() {