From 7e036eba87cca5052185d8b2a37f88fbc2bc16f3 Mon Sep 17 00:00:00 2001 From: DJ_Kovrik Date: Wed, 7 Mar 2018 21:19:25 +0300 Subject: [PATCH 1/6] Revert selectable text tweak --- .../features/topic/adapter/ChosenTopicDelegateAdapter.kt | 6 ------ app/src/main/res/layout/fragment_incubator_item.xml | 1 - app/src/main/res/layout/fragment_news_item.xml | 1 - 3 files changed, 8 deletions(-) diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/adapter/ChosenTopicDelegateAdapter.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/adapter/ChosenTopicDelegateAdapter.kt index 2308bf17..acdc4b29 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/adapter/ChosenTopicDelegateAdapter.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/adapter/ChosenTopicDelegateAdapter.kt @@ -103,7 +103,6 @@ class ChosenTopicDelegateAdapter( quoteAuthor.textSize = normalFontSize quoteAuthor.setTextColor(primaryTextColor) quoteAuthor.text = contentItem.text - quoteAuthor.setTextIsSelectable(true) if (currentNestingLevel > INITIAL_NESTING_LEVEL) { quoteAuthor.setPadding(textPadding * currentNestingLevel, 0, 0, 0) } @@ -117,7 +116,6 @@ class ChosenTopicDelegateAdapter( quoteText.textFromHtmlWithEmoji(contentItem.text) quoteText.setBackgroundColor(quoteBackgroundColor) quoteText.setPadding(textPadding * currentNestingLevel, 0, 0, 0) - quoteText.setTextIsSelectable(true) itemView.post_content_text_container.addView(quoteText) } is PostTextModel -> { @@ -127,7 +125,6 @@ class ChosenTopicDelegateAdapter( postText.textSize = normalFontSize postText.setTextColor(primaryTextColor) postText.textFromHtmlWithEmoji(contentItem.text) - postText.setTextIsSelectable(true) if (currentNestingLevel > INITIAL_NESTING_LEVEL) { postText.setBackgroundColor(quoteBackgroundColor) postText.setPadding(textPadding * currentNestingLevel, 0, 0, 0) @@ -139,7 +136,6 @@ class ChosenTopicDelegateAdapter( hiddenText.textSize = smallFontSize hiddenText.setTextColor(primaryTextColor) hiddenText.textFromHtmlWithEmoji(contentItem.text) - hiddenText.setTextIsSelectable(true) itemView.post_content_text_container.addView(hiddenText) } is PostScriptModel -> { @@ -148,7 +144,6 @@ class ChosenTopicDelegateAdapter( postScriptText.textSize = smallFontSize postScriptText.setTextColor(secondaryTextColor) postScriptText.text = contentItem.text - postScriptText.setTextIsSelectable(true) itemView.post_content_text_container.addView(postScriptText) } is PostWarningModel -> { @@ -163,7 +158,6 @@ class ChosenTopicDelegateAdapter( warningText.textSize = smallFontSize warningText.setTextColor(secondaryTextColor) warningText.text = warning.text - warningText.setTextIsSelectable(true) itemView.post_content_text_container.addView(warningText) } } diff --git a/app/src/main/res/layout/fragment_incubator_item.xml b/app/src/main/res/layout/fragment_incubator_item.xml index 56df367c..b9661233 100644 --- a/app/src/main/res/layout/fragment_incubator_item.xml +++ b/app/src/main/res/layout/fragment_incubator_item.xml @@ -71,7 +71,6 @@ android:paddingBottom="@dimen/material_card_title_block_small_padding_vertical" android:paddingEnd="@dimen/material_card_title_block_padding_horizontal" android:paddingStart="@dimen/material_card_title_block_padding_horizontal" - android:textIsSelectable="true" tools:text="Here is a long news text, here is a long news text here" /> Date: Wed, 7 Mar 2018 22:10:12 +0300 Subject: [PATCH 2/6] Sharing intent fix --- .../sedsoftware/yaptalker/device/sharing/ShareTarget.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/device/src/main/java/com/sedsoftware/yaptalker/device/sharing/ShareTarget.kt b/device/src/main/java/com/sedsoftware/yaptalker/device/sharing/ShareTarget.kt index f7796446..55c2434b 100644 --- a/device/src/main/java/com/sedsoftware/yaptalker/device/sharing/ShareTarget.kt +++ b/device/src/main/java/com/sedsoftware/yaptalker/device/sharing/ShareTarget.kt @@ -37,9 +37,14 @@ class ShareTarget @Inject constructor(val context: Context) : ImageTarget { .subscribe({ uri -> // onSuccess val intent = Intent(Intent.ACTION_SEND) - intent.type = "image/png" + intent.type = "image/*" intent.putExtra(Intent.EXTRA_STREAM, uri) - context.startActivity(Intent.createChooser(intent, context.resources.getString(R.string.title_share_image))) + context.startActivity( + Intent.createChooser( + intent, + context.getString(R.string.title_share_image) + ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + ) }, { throwable -> // onError Timber.e("Image sharing error: ${throwable.message}") From 45cc6a81f5df2d4ced9a8188687baed644c9dce2 Mon Sep 17 00:00:00 2001 From: DJ_Kovrik Date: Wed, 7 Mar 2018 22:10:25 +0300 Subject: [PATCH 3/6] Crashlytics bugfixes --- .../features/gallery/adapter/TopicGalleryAdapter.kt | 8 +++++--- .../presentation/features/settings/SettingsFragment.kt | 2 +- .../features/topic/adapter/ChosenTopicDelegateAdapter.kt | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gallery/adapter/TopicGalleryAdapter.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gallery/adapter/TopicGalleryAdapter.kt index 2bb4c9e9..45252e82 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gallery/adapter/TopicGalleryAdapter.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gallery/adapter/TopicGalleryAdapter.kt @@ -56,9 +56,11 @@ class TopicGalleryAdapter @Inject constructor( private fun showLastLoadingIndicator() { clearLoadingIndicators() - val newLast = SinglePostGalleryImageModel(url = items.last().url, showLoadMore = true) - items.removeAt(items.lastIndex) - items.add(newLast) + if (items.isNotEmpty()) { + val newLast = SinglePostGalleryImageModel(url = items.last().url, showLoadMore = true) + items.removeAt(items.lastIndex) + items.add(newLast) + } } inner class ImageViewHolder(parent: ViewGroup) : diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/settings/SettingsFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/settings/SettingsFragment.kt index ae120814..aac37906 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/settings/SettingsFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/settings/SettingsFragment.kt @@ -45,7 +45,7 @@ class SettingsFragment : PreferenceFragment(), SharedPreferences.OnSharedPrefere override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { val preference = findPreference(key) - setListPreferenceSummary(sharedPreferences, preference) + preference?.let { setListPreferenceSummary(sharedPreferences, preference) } } private fun setListPreferenceSummary(sharedPreferences: SharedPreferences, pref: Preference) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/adapter/ChosenTopicDelegateAdapter.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/adapter/ChosenTopicDelegateAdapter.kt index acdc4b29..67e20d88 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/adapter/ChosenTopicDelegateAdapter.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/adapter/ChosenTopicDelegateAdapter.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup.LayoutParams import android.widget.FrameLayout import android.widget.ImageView import android.widget.ImageView.ScaleType -import android.widget.LinearLayout import android.widget.TextView import com.sedsoftware.yaptalker.R import com.sedsoftware.yaptalker.domain.device.Settings @@ -36,7 +35,6 @@ import com.sedsoftware.yaptalker.presentation.model.base.SinglePostParsedModel import kotlinx.android.synthetic.main.fragment_chosen_topic_item.view.* import java.util.ArrayList - class ChosenTopicDelegateAdapter( private val clickListener: ChosenTopicElementsClickListener, private val thumbnailLoader: ThumbnailsLoader, @@ -207,7 +205,7 @@ class ChosenTopicDelegateAdapter( // Overlay val overlay = ImageView(itemView.context) - val layoutParams = LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) + val layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) overlay.layoutParams = layoutParams overlay.scaleType = ScaleType.CENTER From b39a2368da42076652934c7a602b5e1b7f7bdca5 Mon Sep 17 00:00:00 2001 From: DJ_Kovrik Date: Sun, 11 Mar 2018 10:58:32 +0300 Subject: [PATCH 4/6] Replace Toasty with snackbars --- app/build.gradle | 2 +- .../com/sedsoftware/yaptalker/YapTalkerApp.kt | 12 ------ .../extensions/AppCompatActivityExt.kt | 33 +++++++++++----- .../presentation/extensions/FragmentExt.kt | 35 ++++++++++++----- .../activetopics/ActiveTopicsFragment.kt | 8 ++-- .../authorization/AuthorizationFragment.kt | 10 ++--- .../features/bookmarks/BookmarksFragment.kt | 8 ++-- .../features/forum/ChosenForumFragment.kt | 8 ++-- .../features/forumslist/ForumsFragment.kt | 4 +- .../features/gallery/TopicGalleryActivity.kt | 14 +++---- .../features/gifdisplay/GifDisplayActivity.kt | 4 +- .../imagedisplay/ImageDisplayActivity.kt | 14 +++---- .../features/incubator/IncubatorFragment.kt | 4 +- .../features/navigation/MainActivity.kt | 8 ++-- .../features/news/NewsFragment.kt | 4 +- .../features/posting/AddMessageFragment.kt | 4 +- .../features/search/SearchFormFragment.kt | 4 +- .../features/search/SearchResultsFragment.kt | 4 +- .../features/topic/ChosenTopicFragment.kt | 39 ++++++------------- .../userprofile/UserProfileFragment.kt | 4 +- .../videodisplay/VideoDisplayActivity.kt | 4 +- .../main/res/layout/include_main_content.xml | 15 ++++--- app/src/main/res/values/colors.xml | 11 +++--- buildsystem/dependencies.gradle | 4 +- 24 files changed, 132 insertions(+), 125 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2c9e62eb..ab8bd32f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -123,8 +123,8 @@ dependencies { implementation presentationDependencies.materialTypeface implementation presentationDependencies.materialDialogs implementation presentationDependencies.materialDialogsCommons - implementation presentationDependencies.toasty implementation presentationDependencies.photoView + implementation presentationDependencies.tsnackbar kapt presentationDependencies.daggerCompiler kapt presentationDependencies.daggerAndroidCompiler diff --git a/app/src/main/java/com/sedsoftware/yaptalker/YapTalkerApp.kt b/app/src/main/java/com/sedsoftware/yaptalker/YapTalkerApp.kt index 7557335a..387fb678 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/YapTalkerApp.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/YapTalkerApp.kt @@ -12,13 +12,11 @@ import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader import com.mikepenz.materialdrawer.util.DrawerImageLoader import com.sedsoftware.yaptalker.commons.CrashReportingTree import com.sedsoftware.yaptalker.di.DaggerAppComponent -import com.sedsoftware.yaptalker.presentation.extensions.color import com.squareup.leakcanary.LeakCanary import com.squareup.picasso.Picasso import dagger.android.AndroidInjector import dagger.android.DispatchingAndroidInjector import dagger.android.HasActivityInjector -import es.dmoral.toasty.Toasty import timber.log.Timber import javax.inject.Inject @@ -43,7 +41,6 @@ class YapTalkerApp : Application(), HasActivityInjector { DaggerAppComponent.builder().create(this).inject(this) initTimber() - initToasty() initMaterialDrawerImageLoader() } @@ -60,15 +57,6 @@ class YapTalkerApp : Application(), HasActivityInjector { } } - private fun initToasty() { - Toasty.Config.getInstance() - .setErrorColor(color(R.color.toastyColorError)) - .setInfoColor(color(R.color.toastyColorInfo)) - .setSuccessColor(color(R.color.toastyColorSuccess)) - .setWarningColor(color(R.color.toastyColorWarning)) - .apply() - } - private fun initMaterialDrawerImageLoader() { DrawerImageLoader.init(object : AbstractDrawerImageLoader() { override fun set(imageView: ImageView?, uri: Uri?, placeholder: Drawable?, tag: String?) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/extensions/AppCompatActivityExt.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/extensions/AppCompatActivityExt.kt index 2af6c691..7dfc91a5 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/extensions/AppCompatActivityExt.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/extensions/AppCompatActivityExt.kt @@ -1,21 +1,34 @@ package com.sedsoftware.yaptalker.presentation.extensions +import android.support.annotation.ColorRes import android.support.v7.app.AppCompatActivity -import android.widget.Toast -import es.dmoral.toasty.Toasty +import android.widget.TextView +import com.androidadvance.topsnackbar.TSnackbar +import com.sedsoftware.yaptalker.R -fun AppCompatActivity.toastError(message: String) { - Toasty.error(this, message, Toast.LENGTH_SHORT, true).show() +fun AppCompatActivity.snackError(message: String) { + showTopSnackbar(message, R.color.snackColorError, R.color.snackColorText) } -fun AppCompatActivity.toastSuccess(message: String) { - Toasty.success(this, message, Toast.LENGTH_SHORT, true).show() +fun AppCompatActivity.snackSuccess(message: String) { + showTopSnackbar(message, R.color.snackColorSuccess, R.color.snackColorText) } -fun AppCompatActivity.toastInfo(message: String) { - Toasty.info(this, message, Toast.LENGTH_SHORT, true).show() +fun AppCompatActivity.snackInfo(message: String) { + showTopSnackbar(message, R.color.snackColorInfo, R.color.snackColorText) } -fun AppCompatActivity.toastWarning(message: String) { - Toasty.warning(this, message, Toast.LENGTH_SHORT, true).show() +fun AppCompatActivity.snackWarning(message: String) { + showTopSnackbar(message, R.color.snackColorWarning, R.color.snackColorText) } + +fun AppCompatActivity.showTopSnackbar(message: String, @ColorRes bgColor: Int, @ColorRes textColor: Int) { + TSnackbar + .make(findViewById(R.id.content_container), message, TSnackbar.LENGTH_SHORT) + .also { snackbar -> snackbar.view.setBackgroundColor(color(bgColor)) } + .also { snackbar -> + (snackbar.view.findViewById(com.androidadvance.topsnackbar.R.id.snackbar_text) as? TextView) + ?.setTextColor(color(textColor)) + } + .show() +} \ No newline at end of file diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/extensions/FragmentExt.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/extensions/FragmentExt.kt index 024cefbc..a2edeb5f 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/extensions/FragmentExt.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/extensions/FragmentExt.kt @@ -1,21 +1,36 @@ package com.sedsoftware.yaptalker.presentation.extensions +import android.support.annotation.ColorRes import android.support.v4.app.Fragment -import android.widget.Toast -import es.dmoral.toasty.Toasty +import android.widget.TextView +import com.androidadvance.topsnackbar.TSnackbar +import com.sedsoftware.yaptalker.R -fun Fragment.toastError(message: String) { - context?.let { Toasty.error(it, message, Toast.LENGTH_SHORT, true).show() } +fun Fragment.snackError(message: String) { + showTopSnackbar(message, R.color.snackColorError, R.color.snackColorText) } -fun Fragment.toastSuccess(message: String) { - context?.let { Toasty.success(it, message, Toast.LENGTH_SHORT, true).show() } +fun Fragment.snackSuccess(message: String) { + showTopSnackbar(message, R.color.snackColorSuccess, R.color.snackColorText) } -fun Fragment.toastInfo(message: String) { - context?.let { Toasty.info(it, message, Toast.LENGTH_SHORT, true).show() } +fun Fragment.snackInfo(message: String) { + showTopSnackbar(message, R.color.snackColorInfo, R.color.snackColorText) } -fun Fragment.toastWarning(message: String) { - context?.let { Toasty.warning(it, message, Toast.LENGTH_SHORT, true).show() } +fun Fragment.snackWarning(message: String) { + showTopSnackbar(message, R.color.snackColorWarning, R.color.snackColorText) } + +fun Fragment.showTopSnackbar(message: String, @ColorRes bgColor: Int, @ColorRes textColor: Int) { + activity?.let { activity -> + TSnackbar + .make(activity.findViewById(R.id.content_container), message, TSnackbar.LENGTH_SHORT) + .also { snackbar -> snackbar.view.setBackgroundColor(activity.color(bgColor)) } + .also { snackbar -> + (snackbar.view.findViewById(com.androidadvance.topsnackbar.R.id.snackbar_text) as? TextView) + ?.setTextColor(activity.color(textColor)) + } + .show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/activetopics/ActiveTopicsFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/activetopics/ActiveTopicsFragment.kt index bddcdf9e..7aa3b151 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/activetopics/ActiveTopicsFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/activetopics/ActiveTopicsFragment.kt @@ -16,9 +16,9 @@ import com.sedsoftware.yaptalker.presentation.base.enums.lifecycle.FragmentLifec import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection import com.sedsoftware.yaptalker.presentation.base.navigation.NavigationPanelClickListener import com.sedsoftware.yaptalker.presentation.extensions.setIndicatorColorScheme +import com.sedsoftware.yaptalker.presentation.extensions.snackError +import com.sedsoftware.yaptalker.presentation.extensions.snackWarning import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError -import com.sedsoftware.yaptalker.presentation.extensions.toastWarning import com.sedsoftware.yaptalker.presentation.features.activetopics.adapters.ActiveTopicsAdapter import com.sedsoftware.yaptalker.presentation.features.activetopics.adapters.ActiveTopicsItemClickListener import com.sedsoftware.yaptalker.presentation.model.YapEntity @@ -71,7 +71,7 @@ class ActiveTopicsFragment : BaseFragment(), ActiveTopicsView, ActiveTopicsItemC } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun appendActiveTopicItem(topic: YapEntity) { @@ -93,7 +93,7 @@ class ActiveTopicsFragment : BaseFragment(), ActiveTopicsView, ActiveTopicsItemC override fun showCantLoadPageMessage(page: Int) { context?.stringRes(R.string.navigation_page_not_available)?.let { template -> - toastWarning(String.format(Locale.getDefault(), template, page)) + snackWarning(String.format(Locale.getDefault(), template, page)) } } diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/authorization/AuthorizationFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/authorization/AuthorizationFragment.kt index 9749c13b..28d54491 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/authorization/AuthorizationFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/authorization/AuthorizationFragment.kt @@ -13,9 +13,9 @@ import com.sedsoftware.yaptalker.commons.annotation.LayoutResource import com.sedsoftware.yaptalker.presentation.base.BaseFragment import com.sedsoftware.yaptalker.presentation.base.enums.lifecycle.FragmentLifecycle import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection +import com.sedsoftware.yaptalker.presentation.extensions.snackError +import com.sedsoftware.yaptalker.presentation.extensions.snackSuccess import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError -import com.sedsoftware.yaptalker.presentation.extensions.toastSuccess import com.uber.autodispose.kotlin.autoDisposable import io.reactivex.Observable import io.reactivex.functions.BiFunction @@ -48,15 +48,15 @@ class AuthorizationFragment : BaseFragment(), AuthorizationView { } override fun loginSuccessMessage() { - context?.stringRes(R.string.msg_login_success)?.let { toastSuccess(it) } + context?.stringRes(R.string.msg_login_success)?.let { snackSuccess(it) } } override fun loginErrorMessage() { - context?.stringRes(R.string.msg_login_error)?.let { toastError(it) } + context?.stringRes(R.string.msg_login_error)?.let { snackError(it) } } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun setSignInButtonState(isEnabled: Boolean) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/bookmarks/BookmarksFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/bookmarks/BookmarksFragment.kt index 143b253e..870fae99 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/bookmarks/BookmarksFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/bookmarks/BookmarksFragment.kt @@ -15,9 +15,9 @@ import com.sedsoftware.yaptalker.presentation.base.enums.lifecycle.FragmentLifec import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection import com.sedsoftware.yaptalker.presentation.extensions.extractYapIds import com.sedsoftware.yaptalker.presentation.extensions.setIndicatorColorScheme +import com.sedsoftware.yaptalker.presentation.extensions.snackError +import com.sedsoftware.yaptalker.presentation.extensions.snackInfo import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError -import com.sedsoftware.yaptalker.presentation.extensions.toastInfo import com.sedsoftware.yaptalker.presentation.features.bookmarks.adapters.BookmarksAdapter import com.sedsoftware.yaptalker.presentation.features.bookmarks.adapters.BookmarksElementsClickListener import com.sedsoftware.yaptalker.presentation.model.YapEntity @@ -67,7 +67,7 @@ class BookmarksFragment : BaseFragment(), BookmarksView, BookmarksElementsClickL } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun appendBookmarkItem(bookmark: YapEntity) { @@ -95,7 +95,7 @@ class BookmarksFragment : BaseFragment(), BookmarksView, BookmarksElementsClickL } override fun showBookmarkDeletedMessage() { - toastInfo(getString(R.string.msg_bookmark_topic_deleted)) + snackInfo(getString(R.string.msg_bookmark_topic_deleted)) } override fun onTopicItemClick(link: String) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/forum/ChosenForumFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/forum/ChosenForumFragment.kt index 91efdf35..c7fb7f41 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/forum/ChosenForumFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/forum/ChosenForumFragment.kt @@ -16,9 +16,9 @@ import com.sedsoftware.yaptalker.presentation.base.enums.lifecycle.FragmentLifec import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection import com.sedsoftware.yaptalker.presentation.base.navigation.NavigationPanelClickListener import com.sedsoftware.yaptalker.presentation.extensions.setIndicatorColorScheme +import com.sedsoftware.yaptalker.presentation.extensions.snackError +import com.sedsoftware.yaptalker.presentation.extensions.snackWarning import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError -import com.sedsoftware.yaptalker.presentation.extensions.toastWarning import com.sedsoftware.yaptalker.presentation.features.forum.adapter.ChosenForumAdapter import com.sedsoftware.yaptalker.presentation.features.forum.adapter.ChosenForumItemClickListener import com.sedsoftware.yaptalker.presentation.model.YapEntity @@ -82,7 +82,7 @@ class ChosenForumFragment : BaseFragment(), ChosenForumView, ChosenForumItemClic } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun addTopicItem(entity: YapEntity) { @@ -108,7 +108,7 @@ class ChosenForumFragment : BaseFragment(), ChosenForumView, ChosenForumItemClic override fun showCantLoadPageMessage(page: Int) { context?.stringRes(R.string.navigation_page_not_available)?.let { template -> - toastWarning(String.format(Locale.getDefault(), template, page)) + snackWarning(String.format(Locale.getDefault(), template, page)) } } diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/forumslist/ForumsFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/forumslist/ForumsFragment.kt index bbe7297c..b83f50c6 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/forumslist/ForumsFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/forumslist/ForumsFragment.kt @@ -13,8 +13,8 @@ import com.sedsoftware.yaptalker.presentation.base.BaseFragment import com.sedsoftware.yaptalker.presentation.base.enums.lifecycle.FragmentLifecycle import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection import com.sedsoftware.yaptalker.presentation.extensions.setIndicatorColorScheme +import com.sedsoftware.yaptalker.presentation.extensions.snackError import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError import com.sedsoftware.yaptalker.presentation.features.forumslist.adapter.ForumsAdapter import com.sedsoftware.yaptalker.presentation.features.forumslist.adapter.ForumsItemClickListener import com.sedsoftware.yaptalker.presentation.model.YapEntity @@ -64,7 +64,7 @@ class ForumsFragment : BaseFragment(), ForumsView, ForumsItemClickListener { } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun appendForumItem(item: YapEntity) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gallery/TopicGalleryActivity.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gallery/TopicGalleryActivity.kt index dfe0aa60..ffdf4b99 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gallery/TopicGalleryActivity.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gallery/TopicGalleryActivity.kt @@ -16,16 +16,16 @@ import com.arellomobile.mvp.presenter.ProvidePresenter import com.sedsoftware.yaptalker.R import com.sedsoftware.yaptalker.commons.annotation.LayoutResource import com.sedsoftware.yaptalker.presentation.base.BaseActivity +import com.sedsoftware.yaptalker.presentation.extensions.snackError +import com.sedsoftware.yaptalker.presentation.extensions.snackSuccess import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError -import com.sedsoftware.yaptalker.presentation.extensions.toastSuccess import com.sedsoftware.yaptalker.presentation.extensions.visibleItemPosition import com.sedsoftware.yaptalker.presentation.features.gallery.adapter.TopicGalleryAdapter import com.sedsoftware.yaptalker.presentation.features.gallery.adapter.TopicGalleryLoadMoreClickListener import com.sedsoftware.yaptalker.presentation.model.YapEntity import com.sedsoftware.yaptalker.presentation.model.base.SinglePostGalleryImageModel -import kotlinx.android.synthetic.main.activity_topic_gallery.topic_gallery -import kotlinx.android.synthetic.main.include_main_appbar_transparent.toolbar +import kotlinx.android.synthetic.main.activity_topic_gallery.* +import kotlinx.android.synthetic.main.include_main_appbar_transparent.* import java.util.Locale import javax.inject.Inject @@ -122,7 +122,7 @@ class TopicGalleryActivity : BaseActivity(), TopicGalleryView, TopicGalleryLoadM } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun appendImages(images: List) { @@ -143,12 +143,12 @@ class TopicGalleryActivity : BaseActivity(), TopicGalleryView, TopicGalleryLoadM override fun fileSavedMessage(filepath: String) { String.format(Locale.getDefault(), stringRes(R.string.msg_file_saved), filepath).apply { - toastSuccess(this) + snackSuccess(this) } } override fun fileNotSavedMessage() { - toastError(stringRes(R.string.msg_file_not_saved)) + snackError(stringRes(R.string.msg_file_not_saved)) } override fun onLoadMoreClicked() { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gifdisplay/GifDisplayActivity.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gifdisplay/GifDisplayActivity.kt index 5d919005..ce972246 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gifdisplay/GifDisplayActivity.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/gifdisplay/GifDisplayActivity.kt @@ -11,7 +11,7 @@ import com.arellomobile.mvp.presenter.ProvidePresenter import com.sedsoftware.yaptalker.R import com.sedsoftware.yaptalker.commons.annotation.LayoutResource import com.sedsoftware.yaptalker.presentation.base.BaseActivity -import com.sedsoftware.yaptalker.presentation.extensions.toastError +import com.sedsoftware.yaptalker.presentation.extensions.snackError import kotlinx.android.synthetic.main.activity_gif_display.* import kotlinx.android.synthetic.main.include_main_appbar.* import timber.log.Timber @@ -63,7 +63,7 @@ class GifDisplayActivity : BaseActivity(), GifDisplayView { } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } @SuppressLint("SetJavaScriptEnabled") diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/imagedisplay/ImageDisplayActivity.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/imagedisplay/ImageDisplayActivity.kt index 10ebf695..c0bcc102 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/imagedisplay/ImageDisplayActivity.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/imagedisplay/ImageDisplayActivity.kt @@ -15,11 +15,11 @@ import com.sedsoftware.yaptalker.R import com.sedsoftware.yaptalker.commons.annotation.LayoutResource import com.sedsoftware.yaptalker.presentation.base.BaseActivity import com.sedsoftware.yaptalker.presentation.extensions.loadFromUrl +import com.sedsoftware.yaptalker.presentation.extensions.snackError +import com.sedsoftware.yaptalker.presentation.extensions.snackSuccess import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError -import com.sedsoftware.yaptalker.presentation.extensions.toastSuccess -import kotlinx.android.synthetic.main.activity_image_display.photo_view -import kotlinx.android.synthetic.main.include_main_appbar_transparent.toolbar +import kotlinx.android.synthetic.main.activity_image_display.* +import kotlinx.android.synthetic.main.include_main_appbar_transparent.* import java.util.Locale import javax.inject.Inject @@ -79,17 +79,17 @@ class ImageDisplayActivity : BaseActivity(), ImageDisplayView { } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun fileSavedMessage(filepath: String) { String.format(Locale.getDefault(), stringRes(R.string.msg_file_saved), filepath).apply { - toastSuccess(this) + snackSuccess(this) } } override fun fileNotSavedMessage() { - toastError(stringRes(R.string.msg_file_not_saved)) + snackError(stringRes(R.string.msg_file_not_saved)) } override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/incubator/IncubatorFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/incubator/IncubatorFragment.kt index 4ae948d4..c8c2a80b 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/incubator/IncubatorFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/incubator/IncubatorFragment.kt @@ -20,8 +20,8 @@ import com.sedsoftware.yaptalker.presentation.extensions.extractYoutubeVideoId import com.sedsoftware.yaptalker.presentation.extensions.loadFromUrl import com.sedsoftware.yaptalker.presentation.extensions.moveWithAnimationAxisY import com.sedsoftware.yaptalker.presentation.extensions.setIndicatorColorScheme +import com.sedsoftware.yaptalker.presentation.extensions.snackError import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError import com.sedsoftware.yaptalker.presentation.features.incubator.adapter.IncubatorAdapter import com.sedsoftware.yaptalker.presentation.features.incubator.adapter.IncubatorElementsClickListener import com.sedsoftware.yaptalker.presentation.model.YapEntity @@ -72,7 +72,7 @@ class IncubatorFragment : BaseFragment(), IncubatorView, ThumbnailsLoader, Incub } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun appendIncubatorItem(entity: YapEntity) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/navigation/MainActivity.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/navigation/MainActivity.kt index 091005b1..b782a12b 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/navigation/MainActivity.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/navigation/MainActivity.kt @@ -25,9 +25,9 @@ import com.sedsoftware.yaptalker.presentation.base.BaseActivity import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection import com.sedsoftware.yaptalker.presentation.extensions.color import com.sedsoftware.yaptalker.presentation.extensions.extractYapIds +import com.sedsoftware.yaptalker.presentation.extensions.snackError +import com.sedsoftware.yaptalker.presentation.extensions.snackInfo import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError -import com.sedsoftware.yaptalker.presentation.extensions.toastInfo import com.sedsoftware.yaptalker.presentation.extensions.validateUrl import com.sedsoftware.yaptalker.presentation.model.base.LoginSessionInfoModel import kotlinx.android.synthetic.main.activity_main_tablets.* @@ -120,7 +120,7 @@ class MainActivity : BaseActivity(), MainActivityView, NavigationView { } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun setAppbarTitle(title: String) { @@ -165,7 +165,7 @@ class MainActivity : BaseActivity(), MainActivityView, NavigationView { } override fun showSignOutMessage() { - toastInfo(stringRes(R.string.msg_sign_out)) + snackInfo(stringRes(R.string.msg_sign_out)) } override fun closeNavigationDrawer() { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/news/NewsFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/news/NewsFragment.kt index 84ecd5cc..5eca0f0a 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/news/NewsFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/news/NewsFragment.kt @@ -20,8 +20,8 @@ import com.sedsoftware.yaptalker.presentation.extensions.extractYoutubeVideoId import com.sedsoftware.yaptalker.presentation.extensions.loadFromUrl import com.sedsoftware.yaptalker.presentation.extensions.moveWithAnimationAxisY import com.sedsoftware.yaptalker.presentation.extensions.setIndicatorColorScheme +import com.sedsoftware.yaptalker.presentation.extensions.snackError import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError import com.sedsoftware.yaptalker.presentation.features.news.adapter.NewsAdapter import com.sedsoftware.yaptalker.presentation.features.news.adapter.NewsItemElementsClickListener import com.sedsoftware.yaptalker.presentation.model.YapEntity @@ -72,7 +72,7 @@ class NewsFragment : BaseFragment(), NewsView, NewsItemElementsClickListener, Th } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun appendNewsItem(entity: YapEntity) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/posting/AddMessageFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/posting/AddMessageFragment.kt index 27ef7db3..a9ea5ffe 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/posting/AddMessageFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/posting/AddMessageFragment.kt @@ -26,7 +26,7 @@ import com.sedsoftware.yaptalker.presentation.base.enums.lifecycle.FragmentLifec import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection import com.sedsoftware.yaptalker.presentation.extensions.hideView import com.sedsoftware.yaptalker.presentation.extensions.showView -import com.sedsoftware.yaptalker.presentation.extensions.toastError +import com.sedsoftware.yaptalker.presentation.extensions.snackError import com.sedsoftware.yaptalker.presentation.features.posting.adapter.EmojiAdapter import com.sedsoftware.yaptalker.presentation.features.posting.adapter.EmojiClickListener import com.sedsoftware.yaptalker.presentation.features.posting.tags.MessageTagCodes @@ -172,7 +172,7 @@ class AddMessageFragment : BaseFragment(), AddMessageView, EmojiClickListener { } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun showLinkParametersDialogs() { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/search/SearchFormFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/search/SearchFormFragment.kt index 77c5ad8d..b516859f 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/search/SearchFormFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/search/SearchFormFragment.kt @@ -12,8 +12,8 @@ import com.sedsoftware.yaptalker.commons.annotation.LayoutResource import com.sedsoftware.yaptalker.presentation.base.BaseFragment import com.sedsoftware.yaptalker.presentation.base.enums.lifecycle.FragmentLifecycle import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection +import com.sedsoftware.yaptalker.presentation.extensions.snackError import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError import com.sedsoftware.yaptalker.presentation.features.search.options.SearchConditions import com.sedsoftware.yaptalker.presentation.features.search.options.SortingMode import com.sedsoftware.yaptalker.presentation.features.search.options.TargetPeriod @@ -95,7 +95,7 @@ class SearchFormFragment : BaseFragment(), SearchFormView { } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun updateCurrentUiState() { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/search/SearchResultsFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/search/SearchResultsFragment.kt index 651cc459..dee19515 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/search/SearchResultsFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/search/SearchResultsFragment.kt @@ -12,7 +12,7 @@ import com.sedsoftware.yaptalker.presentation.base.BaseFragment import com.sedsoftware.yaptalker.presentation.base.enums.lifecycle.FragmentLifecycle import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection import com.sedsoftware.yaptalker.presentation.extensions.setIndicatorColorScheme -import com.sedsoftware.yaptalker.presentation.extensions.toastError +import com.sedsoftware.yaptalker.presentation.extensions.snackError import com.sedsoftware.yaptalker.presentation.features.search.adapters.SearchResultsAdapter import com.sedsoftware.yaptalker.presentation.features.search.adapters.SearchResultsItemClickListener import com.sedsoftware.yaptalker.presentation.model.YapEntity @@ -88,7 +88,7 @@ class SearchResultsFragment : BaseFragment(), SearchResultsView, SearchResultsIt } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun appendSearchResultsTopicItem(topic: YapEntity) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/ChosenTopicFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/ChosenTopicFragment.kt index 42ff5e62..82d51c68 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/ChosenTopicFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/topic/ChosenTopicFragment.kt @@ -26,11 +26,11 @@ import com.sedsoftware.yaptalker.presentation.extensions.extractYoutubeVideoId import com.sedsoftware.yaptalker.presentation.extensions.loadFromUrl import com.sedsoftware.yaptalker.presentation.extensions.moveWithAnimationAxisY import com.sedsoftware.yaptalker.presentation.extensions.setIndicatorColorScheme +import com.sedsoftware.yaptalker.presentation.extensions.snackError +import com.sedsoftware.yaptalker.presentation.extensions.snackInfo +import com.sedsoftware.yaptalker.presentation.extensions.snackSuccess +import com.sedsoftware.yaptalker.presentation.extensions.snackWarning import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError -import com.sedsoftware.yaptalker.presentation.extensions.toastInfo -import com.sedsoftware.yaptalker.presentation.extensions.toastSuccess -import com.sedsoftware.yaptalker.presentation.extensions.toastWarning import com.sedsoftware.yaptalker.presentation.features.topic.adapter.ChosenTopicAdapter import com.sedsoftware.yaptalker.presentation.features.topic.adapter.ChosenTopicElementsClickListener import com.sedsoftware.yaptalker.presentation.features.topic.fabmenu.FabMenu @@ -41,23 +41,8 @@ import com.sedsoftware.yaptalker.presentation.model.YapEntity import com.uber.autodispose.kotlin.autoDisposable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers -import kotlinx.android.synthetic.main.fragment_chosen_topic.topic_posts_list -import kotlinx.android.synthetic.main.fragment_chosen_topic.topic_refresh_layout -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_bookmark -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_bookmark_block -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_gallery -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_gallery_block -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_karma -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_karma_block -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_main_button_block -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_menu -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_new_message -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_new_message_label -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_overlay -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_refresh -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_refresh_block -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_share -import kotlinx.android.synthetic.main.include_topic_fab_menu.fab_share_block +import kotlinx.android.synthetic.main.fragment_chosen_topic.* +import kotlinx.android.synthetic.main.include_topic_fab_menu.* import org.jetbrains.anko.browse import org.jetbrains.anko.share import timber.log.Timber @@ -143,7 +128,7 @@ class ChosenTopicFragment : BaseFragment(), ChosenTopicView, ChosenTopicElements } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun showLoadingIndicator() { @@ -243,13 +228,13 @@ class ChosenTopicFragment : BaseFragment(), ChosenTopicView, ChosenTopicElements override fun showCantLoadPageMessage(page: Int) { context?.stringRes(R.string.navigation_page_not_available)?.let { template -> - toastWarning(String.format(Locale.getDefault(), template, page)) + snackWarning(String.format(Locale.getDefault(), template, page)) } } override fun showBookmarkAddedMessage() { context?.stringRes(R.string.msg_bookmark_topic_added)?.let { message -> - toastSuccess(message) + snackSuccess(message) } } @@ -258,7 +243,7 @@ class ChosenTopicFragment : BaseFragment(), ChosenTopicView, ChosenTopicElements else context?.stringRes(R.string.msg_karma_changed_post) message?.let { text -> - toastSuccess(text) + snackSuccess(text) } } @@ -267,13 +252,13 @@ class ChosenTopicFragment : BaseFragment(), ChosenTopicView, ChosenTopicElements else context?.stringRes(R.string.msg_karma_already_rated_post) message?.let { text -> - toastInfo(text) + snackInfo(text) } } override fun showUnknownErrorMessage() { context?.stringRes(R.string.msg_unknown_error)?.let { message -> - toastError(message) + snackError(message) } } diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/userprofile/UserProfileFragment.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/userprofile/UserProfileFragment.kt index 76601bcf..eb68570e 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/userprofile/UserProfileFragment.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/userprofile/UserProfileFragment.kt @@ -11,8 +11,8 @@ import com.sedsoftware.yaptalker.presentation.base.BaseFragment import com.sedsoftware.yaptalker.presentation.base.enums.navigation.NavigationSection import com.sedsoftware.yaptalker.presentation.extensions.hideView import com.sedsoftware.yaptalker.presentation.extensions.loadFromUrl +import com.sedsoftware.yaptalker.presentation.extensions.snackError import com.sedsoftware.yaptalker.presentation.extensions.stringRes -import com.sedsoftware.yaptalker.presentation.extensions.toastError import com.sedsoftware.yaptalker.presentation.model.base.UserProfileModel import kotlinx.android.synthetic.main.fragment_user_profile.* import java.util.Locale @@ -51,7 +51,7 @@ class UserProfileFragment : BaseFragment(), UserProfileView { } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } override fun displayProfile(profile: UserProfileModel) { diff --git a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/videodisplay/VideoDisplayActivity.kt b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/videodisplay/VideoDisplayActivity.kt index 4eaecd9a..3ab71098 100644 --- a/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/videodisplay/VideoDisplayActivity.kt +++ b/app/src/main/java/com/sedsoftware/yaptalker/presentation/features/videodisplay/VideoDisplayActivity.kt @@ -11,7 +11,7 @@ import com.arellomobile.mvp.presenter.ProvidePresenter import com.sedsoftware.yaptalker.R import com.sedsoftware.yaptalker.commons.annotation.LayoutResource import com.sedsoftware.yaptalker.presentation.base.BaseActivity -import com.sedsoftware.yaptalker.presentation.extensions.toastError +import com.sedsoftware.yaptalker.presentation.extensions.snackError import com.sedsoftware.yaptalker.presentation.features.videodisplay.client.VideoWebChromeClient import com.sedsoftware.yaptalker.presentation.features.videodisplay.client.VideoWebChromeClient.FullscreenCallback import kotlinx.android.synthetic.main.activity_video_display.* @@ -87,7 +87,7 @@ class VideoDisplayActivity : BaseActivity(), VideoDisplayView { } override fun showErrorMessage(message: String) { - toastError(message) + snackError(message) } @SuppressLint("SetJavaScriptEnabled") diff --git a/app/src/main/res/layout/include_main_content.xml b/app/src/main/res/layout/include_main_content.xml index e8952d73..f336f93a 100644 --- a/app/src/main/res/layout/include_main_content.xml +++ b/app/src/main/res/layout/include_main_content.xml @@ -1,7 +1,12 @@ - \ No newline at end of file + android:layout_height="match_parent"> + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f08b4018..dbc0bbe5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -44,11 +44,12 @@ @color/material_color_green_500 @color/material_color_red_500 @color/material_color_grey_400 - - @color/material_color_red_500 - @color/material_color_blue_500 - @color/material_color_green_500 - @color/material_color_teal_500 + + @color/material_color_red_500 + @color/material_color_blue_500 + @color/material_color_green_500 + @color/material_color_teal_500 + @color/material_color_white #7dffffff diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 9a4a92ca..24d58c58 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -37,8 +37,8 @@ ext { final ICONICS_VERSION = "3.0.3@aar" final COMMUNITY_MATERIAL_ICONS_VERSION = "2.0.46.1@aar" final MATERIAL_DIALOGUES_VERSION = "0.9.6.0" - final TOASTY_VERSION = "1.2.8" final PHOTOVIEW_VERSION = "2.1.3" + final TOP_SNACKBAR_VERSION = "1.1.1" // Testing final ESPRESSO_VERSION = "3.0.2-alpha1" @@ -154,8 +154,8 @@ ext { materialTypeface : "com.mikepenz:community-material-typeface:$COMMUNITY_MATERIAL_ICONS_VERSION", materialDialogs : "com.afollestad.material-dialogs:core:$MATERIAL_DIALOGUES_VERSION", materialDialogsCommons : "com.afollestad.material-dialogs:commons:$MATERIAL_DIALOGUES_VERSION", - toasty : "com.github.grenderg:toasty:$TOASTY_VERSION", photoView : "com.github.chrisbanes:PhotoView:$PHOTOVIEW_VERSION", + tsnackbar : "com.androidadvance:topsnackbar:$TOP_SNACKBAR_VERSION", ] presentationTestDependencies = [ From 716a105ddec731b1fe38b4663c6c4b16563871e9 Mon Sep 17 00:00:00 2001 From: DJ_Kovrik Date: Sun, 11 Mar 2018 19:00:07 +0300 Subject: [PATCH 5/6] Fix snackbars crash --- app/src/main/res/layout/activity_gif_display.xml | 13 ++++++++++--- app/src/main/res/layout/activity_image_display.xml | 1 + app/src/main/res/layout/activity_video_display.xml | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_gif_display.xml b/app/src/main/res/layout/activity_gif_display.xml index 955f77ae..f0d778c6 100644 --- a/app/src/main/res/layout/activity_gif_display.xml +++ b/app/src/main/res/layout/activity_gif_display.xml @@ -9,9 +9,16 @@ - + android:layout_height="match_parent"> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_image_display.xml b/app/src/main/res/layout/activity_image_display.xml index 2829d9d3..710ceca8 100644 --- a/app/src/main/res/layout/activity_image_display.xml +++ b/app/src/main/res/layout/activity_image_display.xml @@ -1,6 +1,7 @@ diff --git a/app/src/main/res/layout/activity_video_display.xml b/app/src/main/res/layout/activity_video_display.xml index a0bd8b0c..6e26ef3b 100644 --- a/app/src/main/res/layout/activity_video_display.xml +++ b/app/src/main/res/layout/activity_video_display.xml @@ -1,4 +1,5 @@ From 0ad9ada8a4ff938df6a90abf9977574b3d32411a Mon Sep 17 00:00:00 2001 From: DJ_Kovrik Date: Sun, 11 Mar 2018 19:10:34 +0300 Subject: [PATCH 6/6] Prepare version 0.9.2 --- build.gradle | 4 ++-- docs/CHANGELOG.md | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5f4865a3..000cc83e 100644 --- a/build.gradle +++ b/build.gradle @@ -24,10 +24,10 @@ apply from: 'buildsystem/dependencies.gradle' // Versioning convention from ribot: // Major -> Millions, Minor -> Thousands, Bugfix -> Hundreds. E.g 1.3.72 == 1,003,072 -// Current: 0.9.1 (000,009,001) +// Current: 0.9.2 (000,009,002) def versionMajor = 0 def versionMinor = 9 -def versionPatch = 1 +def versionPatch = 2 allprojects { ext { diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index a644a36f..8085ead7 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,13 @@ ### Current version: 0.9.1 # Changelog +## [0.9.1] - 2018-03-11 +## Changed +- Notifications displaying +- Reverted: Selectable text for messages + +## Fixed +- Share image crash on Android 5.0 and 6.0 + ## [0.9.1] - 2018-03-05 ## Added - Selectable text for messages