diff --git a/app/build.gradle b/app/build.gradle
index 79a71684..99c25d80 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
applicationId "gr.thmmy.mthmmy"
minSdkVersion 19
targetSdkVersion 28
- versionCode 13
- versionName "1.4.1"
+ versionCode 14
+ versionName "1.5.0"
archivesBaseName = "mTHMMY-v$versionName"
}
@@ -48,15 +48,15 @@ tasks.whenTaskAdded { task ->
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'com.android.support:appcompat-v7:27.1.1'
- implementation 'com.android.support:design:27.1.1'
- implementation 'com.android.support:preference-v7:27.1.1'
- implementation 'com.android.support:preference-v14:27.1.1'
- implementation 'com.android.support:support-v4:27.1.1'
- implementation 'com.android.support:cardview-v7:27.1.1'
- implementation 'com.android.support:recyclerview-v7:27.1.1'
- implementation 'com.google.firebase:firebase-core:16.0.3'
- implementation 'com.google.firebase:firebase-messaging:17.3.1'
+ implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'com.android.support:design:28.0.0'
+ implementation 'com.android.support:preference-v7:28.0.0'
+ implementation 'com.android.support:preference-v14:28.0.0'
+ implementation 'com.android.support:support-v4:28.0.0'
+ implementation 'com.android.support:cardview-v7:28.0.0'
+ implementation 'com.android.support:recyclerview-v7:28.0.0'
+ implementation 'com.google.firebase:firebase-core:16.0.4'
+ implementation 'com.google.firebase:firebase-messaging:17.3.3'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'com.squareup.picasso:picasso:2.5.2'
@@ -72,7 +72,7 @@ dependencies {
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'//TODO: deprecated!
implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
- implementation 'com.jakewharton.timber:timber:4.7.0'
+ implementation 'com.jakewharton.timber:timber:4.7.1'
implementation "ru.noties:markwon:2.0.0"
implementation 'net.gotev:uploadservice:3.4.2'
implementation 'net.gotev:uploadservice-okhttp:3.4.2'
diff --git a/app/src/main/assets/apache_libraries.html b/app/src/main/assets/apache_libraries.html
index 004d8c96..abcdb7d7 100644
--- a/app/src/main/assets/apache_libraries.html
+++ b/app/src/main/assets/apache_libraries.html
@@ -60,7 +60,7 @@
- Timber v4.7.0 (Copyright ©2013 Jake Wharton)
+ Timber v4.7.1 (Copyright ©2013 Jake Wharton)
Android Upload Service v3.4.2 (Copyright ©2013-2018 Aleksandar Gotev)
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
index e67ed73a..acc8d489 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
@@ -4,13 +4,11 @@ import android.content.Intent;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.Menu;
import android.view.MenuItem;
-import android.view.View;
import android.widget.ProgressBar;
import android.widget.Toast;
@@ -55,7 +53,7 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
private MaterialProgressBar progressBar;
private RecyclerView recyclerView;
private DownloadsAdapter downloadsAdapter;
- private FloatingActionButton uploadFAB;
+ //private FloatingActionButton uploadFAB;
private ParseDownloadPageTask parseDownloadPageTask;
private int numberOfPages = -1;
@@ -121,9 +119,9 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
}
});
- uploadFAB = findViewById(R.id.download_fab);
- uploadFAB.setEnabled(false);
- uploadFAB.hide();
+// uploadFAB = findViewById(R.id.upload_fab);
+// uploadFAB.setEnabled(false);
+// uploadFAB.hide();
parseDownloadPageTask = new ParseDownloadPageTask();
parseDownloadPageTask.execute(downloadsUrl);
@@ -206,7 +204,7 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
@Override
protected void onPreExecute() {
if (!isLoadingMore) progressBar.setVisibility(ProgressBar.VISIBLE);
- if (uploadFAB.getVisibility() != View.GONE) uploadFAB.setEnabled(false);
+ //if (uploadFAB.getVisibility() != View.GONE) uploadFAB.setEnabled(false);
}
@Override
@@ -304,7 +302,7 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
toolbar.setTitle(downloadsTitle);
++pagesLoaded;
- if (uploadFAB.getVisibility() != View.GONE) uploadFAB.setEnabled(true);
+ //if (uploadFAB.getVisibility() != View.GONE) uploadFAB.setEnabled(true);
progressBar.setVisibility(ProgressBar.INVISIBLE);
downloadsAdapter.notifyDataSetChanged();
isLoadingMore = false;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
index 4ebbba5a..5a411e12 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
@@ -156,9 +156,9 @@ public class TopicParser {
ArrayList parsedPostsList = new ArrayList<>();
- Poll poll = findPoll(topic);
- if (poll != null)
- parsedPostsList.add(poll);
+// Poll poll = findPoll(topic);
+// if (poll != null)
+// parsedPostsList.add(poll);
Elements postRows;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index a8dc457e..fc492b7a 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -256,14 +256,14 @@ public abstract class BaseActivity extends AppCompatActivity {
.withName(R.string.downloads)
.withIcon(downloadsIcon)
.withSelectedIcon(downloadsIconSelected);
- uploadItem = new PrimaryDrawerItem()
- .withTextColor(primaryColor)
- .withSelectedColor(selectedPrimaryColor)
- .withSelectedTextColor(selectedSecondaryColor)
- .withIdentifier(UPLOAD_ID)
- .withName(R.string.upload)
- .withIcon(uploadIcon)
- .withSelectedIcon(uploadIconSelected);
+// uploadItem = new PrimaryDrawerItem()
+// .withTextColor(primaryColor)
+// .withSelectedColor(selectedPrimaryColor)
+// .withSelectedTextColor(selectedSecondaryColor)
+// .withIdentifier(UPLOAD_ID)
+// .withName(R.string.upload)
+// .withIcon(uploadIcon)
+// .withSelectedIcon(uploadIconSelected);
} else
loginLogoutItem = new PrimaryDrawerItem()
.withTextColor(primaryColor)
@@ -387,7 +387,7 @@ public abstract class BaseActivity extends AppCompatActivity {
});
if (sessionManager.isLoggedIn())
- drawerBuilder.addDrawerItems(homeItem, bookmarksItem, downloadsItem, uploadItem, settingsItem, loginLogoutItem, aboutItem);
+ drawerBuilder.addDrawerItems(homeItem, bookmarksItem, downloadsItem, settingsItem, loginLogoutItem, aboutItem);
else
drawerBuilder.addDrawerItems(homeItem, bookmarksItem, settingsItem, loginLogoutItem, aboutItem);
@@ -415,9 +415,9 @@ public abstract class BaseActivity extends AppCompatActivity {
if (!drawer.getDrawerItems().contains(downloadsItem)) {
drawer.addItemAtPosition(downloadsItem, 2);
}
- if (!drawer.getDrawerItems().contains(uploadItem)) {
- drawer.addItemAtPosition(uploadItem, 3);
- }
+// if (!drawer.getDrawerItems().contains(uploadItem)) {
+// drawer.addItemAtPosition(uploadItem, 3);
+// }
loginLogoutItem.withName(R.string.logout).withIcon(logoutIcon); //Swap login with logout
profileDrawerItem.withName(sessionManager.getUsername());
if (sessionManager.hasAvatar())
diff --git a/app/src/main/res/layout/activity_downloads.xml b/app/src/main/res/layout/activity_downloads.xml
index 85fbe0ea..0856b9c3 100644
--- a/app/src/main/res/layout/activity_downloads.xml
+++ b/app/src/main/res/layout/activity_downloads.xml
@@ -48,15 +48,15 @@
app:mpb_indeterminateTint="@color/accent"
app:mpb_progressStyle="horizontal"/>
-
+ app:srcCompat="@drawable/ic_file_upload_white_24dp"/>-->
diff --git a/build.gradle b/build.gradle
index 65178d9a..11cbc2e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,9 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.0'
- classpath 'com.google.gms:google-services:4.0.1'
- classpath 'io.fabric.tools:gradle:1.25.4'
+ classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath 'com.google.gms:google-services:4.1.0'
+ classpath 'io.fabric.tools:gradle:1.26.1'
}
}