diff --git a/app/build.gradle b/app/build.gradle index d120aa3..09420f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ repositories { } android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 26 + buildToolsVersion "26.0.0" defaultConfig { applicationId "apps.amine.bou.readerforselfoss" minSdkVersion 16 @@ -80,19 +80,19 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" // Android Support - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.android.support:recyclerview-v7:25.3.1' - compile 'com.android.support:support-v4:25.3.1' - compile 'com.android.support:support-vector-drawable:25.3.1' - compile 'com.android.support:customtabs:25.3.1' - compile 'com.android.support:cardview-v7:25.3.1' + compile 'com.android.support:appcompat-v7:26.0.0-beta2' + compile 'com.android.support:design:26.0.0-beta2' + compile 'com.android.support:recyclerview-v7:26.0.0-beta2' + compile 'com.android.support:support-v4:26.0.0-beta2' + compile 'com.android.support:support-vector-drawable:26.0.0-beta2' + compile 'com.android.support:customtabs:26.0.0-beta2' + compile 'com.android.support:cardview-v7:26.0.0-beta2' compile 'com.android.support.constraint:constraint-layout:1.0.2' // Firebase + crashlytics - compile 'com.google.firebase:firebase-core:10.2.6' - compile 'com.google.firebase:firebase-config:10.2.6' - compile 'com.google.firebase:firebase-invites:10.2.6' + compile 'com.google.firebase:firebase-core:11.0.1' + compile 'com.google.firebase:firebase-config:11.0.1' + compile 'com.google.firebase:firebase-invites:11.0.1' compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { transitive = true } @@ -128,10 +128,10 @@ dependencies { compile 'com.github.stkent:amplify:1.5.0' // For the article reader - compile 'com.klinkerapps:drag-dismiss-activity:1.4.0' + compile 'com.klinkerapps:drag-dismiss-activity:1.4.1' // Drawer - compile('com.mikepenz:materialdrawer:5.9.2@aar') { + compile('com.mikepenz:materialdrawer:5.9.3@aar') { transitive = true } compile 'com.anupcowkur:reservoir:3.1.0' 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 ceb3f95..4882170 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt @@ -27,13 +27,13 @@ class AddSourceActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_add_source) - val mProgress = findViewById(R.id.progress) as ProgressBar - val mForm = findViewById(R.id.formContainer) as ConstraintLayout - val mNameInput = findViewById(R.id.nameInput) as EditText - val mSourceUri = findViewById(R.id.sourceUri) as EditText - val mTags = findViewById(R.id.tags) as EditText - val mSpoutsSpinner = findViewById(R.id.spoutsSpinner) as Spinner - val mSaveBtn = findViewById(R.id.saveBtn) as Button + val mProgress: ProgressBar = findViewById(R.id.progress) + val mForm: ConstraintLayout = findViewById(R.id.formContainer) + val mNameInput: EditText = findViewById(R.id.nameInput) + val mSourceUri: EditText = findViewById(R.id.sourceUri) + val mTags: EditText = findViewById(R.id.tags) + val mSpoutsSpinner: Spinner = findViewById(R.id.spoutsSpinner) + val mSaveBtn: Button = findViewById(R.id.saveBtn) var api: SelfossApi? = null try { diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt index 74bf602..7725622 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt @@ -116,11 +116,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { super.onCreate(savedInstanceState) setContentView(R.layout.activity_home) - toolbar = findViewById(R.id.toolbar) as Toolbar + toolbar = findViewById(R.id.toolbar) setSupportActionBar(toolbar) if (savedInstanceState == null) { - val promptView = findViewById(R.id.prompt_view) as DefaultLayoutPromptView + val promptView: DefaultLayoutPromptView = findViewById(R.id.prompt_view) Amplify.getSharedInstance().promptIfReady(promptView) } @@ -132,7 +132,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { api = SelfossApi(this, this@HomeActivity) items = ArrayList() - mBottomBar = findViewById(R.id.bottomBar) as BottomBar + mBottomBar = findViewById(R.id.bottomBar) handleDrawer() @@ -153,9 +153,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { } } - mCoordinatorLayout = findViewById(R.id.coordLayout) as CoordinatorLayout - mSwipeRefreshLayout = findViewById(R.id.swipeRefreshLayout) as SwipeRefreshLayout - mRecyclerView = findViewById(R.id.my_recycler_view) as RecyclerView + mCoordinatorLayout = findViewById(R.id.coordLayout) + mSwipeRefreshLayout = findViewById(R.id.swipeRefreshLayout) + mRecyclerView = findViewById(R.id.my_recycler_view) reloadLayoutManager() diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt index 69782a3..17d8427 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt @@ -76,21 +76,21 @@ class LoginActivity : AppCompatActivity() { } mFirebaseAnalytics = FirebaseAnalytics.getInstance(this) - mUrlView = findViewById(R.id.url) as EditText - mLoginView = findViewById(R.id.login) as TextView - mHTTPLoginView = findViewById(R.id.httpLogin) as TextView - mPasswordView = findViewById(R.id.password) as EditText - mHTTPPasswordView = findViewById(R.id.httpPassword) as EditText + mUrlView = findViewById(R.id.url) + mLoginView = findViewById(R.id.login) + mHTTPLoginView = findViewById(R.id.httpLogin) + mPasswordView = findViewById(R.id.password) + mHTTPPasswordView = findViewById(R.id.httpPassword) mLoginFormView = findViewById(R.id.login_form) mProgressView = findViewById(R.id.login_progress) - val mSwitch = findViewById(R.id.withLogin) as Switch - val mHTTPSwitch = findViewById(R.id.withHttpLogin) as Switch - val mLoginLayout = findViewById(R.id.loginLayout) as TextInputLayout - val mHTTPLoginLayout = findViewById(R.id.httpLoginInput) as TextInputLayout - val mPasswordLayout = findViewById(R.id.passwordLayout) as TextInputLayout - val mHTTPPasswordLayout = findViewById(R.id.httpPasswordInput) as TextInputLayout - val mEmailSignInButton = findViewById(R.id.email_sign_in_button) as Button + val mSwitch: Switch = findViewById(R.id.withLogin) + val mHTTPSwitch: Switch = findViewById(R.id.withHttpLogin) + val mLoginLayout: TextInputLayout = findViewById(R.id.loginLayout) + val mHTTPLoginLayout: TextInputLayout = findViewById(R.id.httpLoginInput) + val mPasswordLayout: TextInputLayout = findViewById(R.id.passwordLayout) + val mHTTPPasswordLayout: TextInputLayout = findViewById(R.id.httpPasswordInput) + val mEmailSignInButton: Button = findViewById(R.id.email_sign_in_button) mPasswordView.setOnEditorActionListener(TextView.OnEditorActionListener { _, id, _ -> if (id == R.id.login || id == EditorInfo.IME_NULL) { diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt index ac11280..022440f 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt @@ -42,14 +42,14 @@ class ReaderActivity : DragDismissActivity() { val v = inflater.inflate(R.layout.activity_reader, parent, false) showProgressBar() - val image = v.findViewById(R.id.imageView) as ImageView - val source = v.findViewById(R.id.source) as TextView - val title = v.findViewById(R.id.title) as TextView - val content = v.findViewById(R.id.content) as HtmlTextView + val image: ImageView = v.findViewById(R.id.imageView) + val source: TextView = v.findViewById(R.id.source) + val title: TextView = v.findViewById(R.id.title) + val content: HtmlTextView = v.findViewById(R.id.content) val url = intent.getStringExtra("url") val parser = MercuryApi(getString(R.string.mercury)) - val browserBtn: ImageButton = v.findViewById(R.id.browserBtn) as ImageButton - val shareBtn: ImageButton = v.findViewById(R.id.shareBtn) as ImageButton + val browserBtn: ImageButton = v.findViewById(R.id.browserBtn) + val shareBtn: ImageButton = v.findViewById(R.id.shareBtn) val customTabsIntent = this@ReaderActivity.buildCustomTabsIntent() 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 0a682d5..c592998 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt @@ -27,8 +27,8 @@ class SourcesActivity : AppCompatActivity() { override fun onResume() { super.onResume() - val mFab = findViewById(R.id.fab) as FloatingActionButton - val mRecyclerView = findViewById(R.id.activity_sources) as RecyclerView + val mFab: FloatingActionButton = findViewById(R.id.fab) + val mRecyclerView: RecyclerView = findViewById(R.id.activity_sources) val mLayoutManager = LinearLayoutManager(this) val api = SelfossApi(this, this@SourcesActivity) var items: ArrayList = ArrayList() diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt index 9e04b62..11a1d07 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt @@ -113,7 +113,7 @@ class ItemCardAdapter(private val app: Activity, } val view = s.view - val tv = view.findViewById(android.support.design.R.id.snackbar_text) as TextView + val tv: TextView = view.findViewById(android.support.design.R.id.snackbar_text) tv.setTextColor(Color.WHITE) s.show() } @@ -155,13 +155,13 @@ class ItemCardAdapter(private val app: Activity, } private fun handleClickListeners() { - sourceImage = mView.findViewById(R.id.sourceImage) as ImageView - itemImage = mView.findViewById(R.id.itemImage) as ImageView - title = mView.findViewById(R.id.title) as TextView - sourceTitleAndDate = mView.findViewById(R.id.sourceTitleAndDate) as TextView - saveBtn = mView.findViewById(R.id.favButton) as LikeButton - shareBtn = mView.findViewById(R.id.shareBtn) as ImageButton - browserBtn = mView.findViewById(R.id.browserBtn) as ImageButton + sourceImage = mView.findViewById(R.id.sourceImage) + itemImage = mView.findViewById(R.id.itemImage) + title = mView.findViewById(R.id.title) + sourceTitleAndDate = mView.findViewById(R.id.sourceTitleAndDate) + saveBtn = mView.findViewById(R.id.favButton) + shareBtn = mView.findViewById(R.id.shareBtn) + browserBtn = mView.findViewById(R.id.browserBtn) if (!fullHeightCards) { itemImage.maxHeight = c.resources.getDimension(R.dimen.card_image_max_height).toInt() diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt index 62a99de..ba56a4e 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt @@ -127,7 +127,7 @@ class ItemListAdapter(private val app: Activity, } val view = s.view - val tv = view.findViewById(android.support.design.R.id.snackbar_text) as TextView + val tv: TextView = view.findViewById(android.support.design.R.id.snackbar_text) tv.setTextColor(Color.WHITE) s.show() } @@ -169,13 +169,13 @@ class ItemListAdapter(private val app: Activity, } private fun handleClickListeners() { - actionBar = mView.findViewById(R.id.actionBar) as RelativeLayout - sourceImage = mView.findViewById(R.id.itemImage) as ImageView - title = mView.findViewById(R.id.title) as TextView - sourceTitleAndDate = mView.findViewById(R.id.sourceTitleAndDate) as TextView - saveBtn = mView.findViewById(R.id.favButton) as LikeButton - shareBtn = mView.findViewById(R.id.shareBtn) as ImageButton - browserBtn = mView.findViewById(R.id.browserBtn) as ImageButton + actionBar = mView.findViewById(R.id.actionBar) + sourceImage = mView.findViewById(R.id.itemImage) + title = mView.findViewById(R.id.title) + sourceTitleAndDate = mView.findViewById(R.id.sourceTitleAndDate) + saveBtn = mView.findViewById(R.id.favButton) + shareBtn = mView.findViewById(R.id.shareBtn) + browserBtn = mView.findViewById(R.id.browserBtn) saveBtn.setOnLikeListener(object : OnLikeListener { diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt index 62f20d5..e3c0efb 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt @@ -69,10 +69,10 @@ class SourcesListAdapter(private val app: Activity, } private fun handleClickListeners() { - sourceImage = mView.findViewById(R.id.itemImage) as ImageView - sourceTitle = mView.findViewById(R.id.sourceTitle) as TextView + sourceImage = mView.findViewById(R.id.itemImage) + sourceTitle = mView.findViewById(R.id.sourceTitle) - val deleteBtn = mView.findViewById(R.id.deleteBtn) as Button + val deleteBtn: Button = mView.findViewById(R.id.deleteBtn) deleteBtn.setOnClickListener { val (id) = items[adapterPosition] diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt index fc1c12f..f0c6c46 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt @@ -11,7 +11,7 @@ import apps.amine.bou.readerforselfoss.R open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) { - var icon: ImageView = view.findViewById(R.id.material_drawer_icon) as ImageView - var name: TextView = view.findViewById(R.id.material_drawer_name) as TextView - var description: TextView = view.findViewById(R.id.material_drawer_description) as TextView + var icon: ImageView = view.findViewById(R.id.material_drawer_icon) + var name: TextView = view.findViewById(R.id.material_drawer_name) + var description: TextView = view.findViewById(R.id.material_drawer_description) } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt index b1584ca..0c615aa 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt @@ -88,7 +88,7 @@ class CustomUrlPrimaryDrawerItem : CustomUrlBasePrimaryDrawerItem