aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2017-11-08 22:43:32 +0900
committerKazuki Yamaguchi <k@rhe.jp>2017-11-08 22:43:51 +0900
commit3ab566676c63724edd225affaa34f35ac140afc0 (patch)
treec03a268402d37a8818ba1231b758a454278de36f
parentf2278ab05c948a8ffcef3e6aca365b0dbc30b1e8 (diff)
downloadSmileEssence-3ab566676c63724edd225affaa34f35ac140afc0.tar.gz
get rid of twitter-text
-rw-r--r--app/build.gradle3
-rw-r--r--app/licenses.yml6
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt7
3 files changed, 1 insertions, 15 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 2e3ad315..ea433789 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,9 +78,6 @@ dependencies {
// RecyclerView-FastScroll; the default FastScroller in support v26 becomes too small to use
implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.16'
- // twitter-text
- implementation 'com.twitter:twitter-text:1.14.7'
-
// twitter4j
implementation 'org.twitter4j:twitter4j-core:4.0.6'
implementation 'org.twitter4j:twitter4j-media-support:4.0.6'
diff --git a/app/licenses.yml b/app/licenses.yml
index 44b77ada..69400d4b 100644
--- a/app/licenses.yml
+++ b/app/licenses.yml
@@ -42,12 +42,6 @@
license: Simplified BSD License
licenseUrl: http://www.opensource.org/licenses/bsd-license
url: https://github.com/bumptech/glide
-- artifact: com.twitter:twitter-text:+
- name: twitter-text
- copyrightHolder: Twitter, Inc.
- license: The Apache Software License, Version 2.0
- licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
- url: https://github.com/twitter/twitter-text
- artifact: com.github.omadahealth:swipy:+
name: SwipyRefreshLayout Library
copyrightHolder: OrangeGangsters
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt
index 9eb11156..1fd4e09c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt
@@ -17,7 +17,6 @@ import android.text.method.ArrowKeyMovementMethod
import android.view.*
import android.widget.TextView
import com.bumptech.glide.Glide
-import com.twitter.Validator
import kotlinx.android.parcel.Parcelize
import kotlinx.android.synthetic.main.item_compose_media.view.*
import kotlinx.android.synthetic.main.page_fragment_compose.*
@@ -110,11 +109,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche
override fun afterTextChanged(s: Editable) {}
private fun updateTextCount(s: CharSequence) {
- val validator = Validator()
- var length = validator.getTweetLength(s.toString())
- if (postState.media.isNotEmpty())
- length += validator.shortUrlLength
-
+ val length = s.length
post_text_count.text = length.toString()
button_post_tweet.isEnabled = length != 0
if (length == 0 || length >= 140) {