diff --git a/app/build.gradle b/app/build.gradle index d562fc81..945cd283 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,11 +10,12 @@ android { targetSdkVersion 28 versionCode 1 versionName '1.4.2' - vectorDrawables.useSupportLibrary = true + vectorDrawables.useSupportLibrary true } buildTypes { all { + multiDexEnabled true buildConfigField "String", "API_KEY_1", TWITTER_CONSUMER_KEY buildConfigField "String", "API_KEY_2", TWITTER_CONSUMER_SECRET } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java index f26919cd..11ac4cbd 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -83,7 +83,7 @@ public class StatusLoader extends AsyncTask { } tweet = mTwitter.getStatus(TWEETID); publishProgress(); - if (!updateStatus) + if (updateStatus) db.updateStatus(tweet); break; diff --git a/app/src/main/res/layout/item_trend.xml b/app/src/main/res/layout/item_trend.xml index 40e6c92d..5ddf6b4d 100644 --- a/app/src/main/res/layout/item_trend.xml +++ b/app/src/main/res/layout/item_trend.xml @@ -4,7 +4,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + android:textSize="14sp" /> diff --git a/app/src/main/res/layout/page_main.xml b/app/src/main/res/layout/page_main.xml index 6a54f482..94f2751e 100644 --- a/app/src/main/res/layout/page_main.xml +++ b/app/src/main/res/layout/page_main.xml @@ -1,6 +1,5 @@ + android:layout_height="wrap_content" /> @@ -203,10 +204,11 @@ @@ -222,9 +224,9 @@ diff --git a/app/src/main/res/layout/page_userlist.xml b/app/src/main/res/layout/page_userlist.xml index a777fba8..9e2820f7 100644 --- a/app/src/main/res/layout/page_userlist.xml +++ b/app/src/main/res/layout/page_userlist.xml @@ -15,5 +15,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 9bf50195..af6c2d29 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -4,7 +4,7 @@ 64dp 40dp - 32dp + 36dp 14dp @@ -50,9 +50,10 @@ 5dp - 100dp + 80dp 10 5 + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cba65b37..b8676d42 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -52,8 +52,4 @@ RobotoTextView - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index f2a40556..8f34a820 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.4.0' } }