From 41dfdb5736639c55efaf690eb3687228c0d53cab Mon Sep 17 00:00:00 2001 From: david andres ramirez Date: Sun, 5 May 2019 18:07:13 -0500 Subject: [PATCH 1/3] improve connectivity issues --- .../materialistic/BaseListActivity.java | 17 ++++++++++++ .../hidroh/materialistic/ItemActivity.java | 26 ++++++++++++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java b/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java index ea46cb0ef..bc5aeb219 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java @@ -30,6 +30,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; import com.google.android.material.tabs.TabLayout; + +import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.core.content.ContextCompat; @@ -73,6 +75,7 @@ public abstract class BaseListActivity extends DrawerActivity implements MultiPa @Inject SessionManager mSessionManager; @Inject CustomTabsDelegate mCustomTabsDelegate; @Inject KeyDelegate mKeyDelegate; + @Synthetic CoordinatorLayout mCoordinatorLayout; private AppBarLayout mAppBar; private TabLayout mTabLayout; private FloatingActionButton mReplyButton; @@ -148,8 +151,22 @@ protected void onCreate(Bundle savedInstanceState) { R.string.pref_external, R.string.pref_story_display, R.string.pref_multi_window); + + mCoordinatorLayout = findViewById(R.id.content_frame); } + @Override + protected void onResume(){ + super.onResume(); + if (!AppUtils.hasConnection(this)) { + Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }).show(); + } + } @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); diff --git a/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java b/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java index 3c87b9e91..0fa851c2c 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java @@ -183,7 +183,12 @@ protected void onCreate(Bundle savedInstanceState) { new ItemResponseListener(this)); } if (!AppUtils.hasConnection(this)) { - Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_LONG).show(); + Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }).show(); } } @@ -220,9 +225,22 @@ public boolean onOptionsItemSelected(MenuItem item) { return true; } if (item.getItemId() == R.id.menu_share) { - View anchor = findViewById(R.id.menu_share); - AppUtils.share(this, mPopupMenu, anchor == null ? - findViewById(R.id.toolbar) : anchor, mItem); + + if (!AppUtils.hasConnection(this)) { + Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }).show(); + } + else + { + View anchor = findViewById(R.id.menu_share); + AppUtils.share(this, mPopupMenu, anchor == null ? + findViewById(R.id.toolbar) : anchor, mItem); + } + return true; } return super.onOptionsItemSelected(item); From a9c012506c4e755e36844d53dc389ddf227440bd Mon Sep 17 00:00:00 2001 From: david andres ramirez Date: Thu, 9 May 2019 19:58:08 -0500 Subject: [PATCH 2/3] memory changes --- .../materialistic/BaseListActivity.java | 23 +++------------- .../hidroh/materialistic/DrawerActivity.java | 10 ++++--- .../hidroh/materialistic/ItemActivity.java | 26 +++---------------- .../materialistic/LauncherActivity.java | 5 ++-- .../materialistic/SettingsActivity.java | 26 ++++++++++--------- .../hidroh/materialistic/SubmitActivity.java | 8 +++--- .../widget/FavoriteRecyclerViewAdapter.java | 4 +-- .../widget/ItemRecyclerViewAdapter.java | 4 +-- .../MultiPageItemRecyclerViewAdapter.java | 5 ++-- .../widget/StoryRecyclerViewAdapter.java | 8 +++--- .../widget/SubmissionRecyclerViewAdapter.java | 10 ++++--- .../ThreadPreviewRecyclerViewAdapter.java | 5 ++-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- 14 files changed, 58 insertions(+), 82 deletions(-) diff --git a/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java b/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java index bc5aeb219..d5906a12e 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java @@ -30,8 +30,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; import com.google.android.material.tabs.TabLayout; - -import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.core.content.ContextCompat; @@ -45,6 +43,8 @@ import android.view.MenuItem; import android.view.View; +import java.lang.ref.WeakReference; + import javax.inject.Inject; import io.github.hidroh.materialistic.annotation.Synthetic; @@ -75,7 +75,6 @@ public abstract class BaseListActivity extends DrawerActivity implements MultiPa @Inject SessionManager mSessionManager; @Inject CustomTabsDelegate mCustomTabsDelegate; @Inject KeyDelegate mKeyDelegate; - @Synthetic CoordinatorLayout mCoordinatorLayout; private AppBarLayout mAppBar; private TabLayout mTabLayout; private FloatingActionButton mReplyButton; @@ -151,22 +150,8 @@ protected void onCreate(Bundle savedInstanceState) { R.string.pref_external, R.string.pref_story_display, R.string.pref_multi_window); - - mCoordinatorLayout = findViewById(R.id.content_frame); } - @Override - protected void onResume(){ - super.onResume(); - if (!AppUtils.hasConnection(this)) { - Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { - @Override - public void onClick(View v) { - - } - }).show(); - } - } @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); @@ -392,9 +377,9 @@ private void openSinglePaneItem() { if (mExternalBrowser && mStoryViewMode != Preferences.StoryViewMode.Comment) { AppUtils.openWebUrlExternal(this, mSelectedItem, mSelectedItem.getUrl(), mCustomTabsDelegate.getSession()); } else { - Intent intent = new Intent(this, ItemActivity.class) + Intent intent = new WeakReference<>(new Intent(this, ItemActivity.class) .putExtra(ItemActivity.EXTRA_CACHE_MODE, getItemCacheMode()) - .putExtra(ItemActivity.EXTRA_ITEM, mSelectedItem); + .putExtra(ItemActivity.EXTRA_ITEM, mSelectedItem)).get(); startActivity(mMultiWindowEnabled ? AppUtils.multiWindowIntent(this, intent) : intent); } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java b/app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java index a48858b02..554bdbb51 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java @@ -35,6 +35,8 @@ import android.view.ViewGroup; import android.widget.TextView; +import java.lang.ref.WeakReference; + import javax.inject.Inject; import io.github.hidroh.materialistic.annotation.Synthetic; @@ -72,14 +74,14 @@ protected void onCreate(Bundle savedInstanceState) { public void onDrawerClosed(View drawerView) { super.onDrawerClosed(drawerView); if (drawerView.equals(mDrawer) && mPendingNavigation != null) { - final Intent intent = new Intent(DrawerActivity.this, mPendingNavigation); + WeakReference intent = new WeakReference<>(new Intent(DrawerActivity.this, mPendingNavigation)); if (mPendingNavigationExtras != null) { - intent.putExtras(mPendingNavigationExtras); + intent.get().putExtras(mPendingNavigationExtras); mPendingNavigationExtras = null; } // TODO M bug https://code.google.com/p/android/issues/detail?id=193822 - intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - startActivity(intent); + intent.get().setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + startActivity(intent.get()); mPendingNavigation = null; } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java b/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java index 0fa851c2c..3c87b9e91 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java @@ -183,12 +183,7 @@ protected void onCreate(Bundle savedInstanceState) { new ItemResponseListener(this)); } if (!AppUtils.hasConnection(this)) { - Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { - @Override - public void onClick(View v) { - - } - }).show(); + Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_LONG).show(); } } @@ -225,22 +220,9 @@ public boolean onOptionsItemSelected(MenuItem item) { return true; } if (item.getItemId() == R.id.menu_share) { - - if (!AppUtils.hasConnection(this)) { - Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { - @Override - public void onClick(View v) { - - } - }).show(); - } - else - { - View anchor = findViewById(R.id.menu_share); - AppUtils.share(this, mPopupMenu, anchor == null ? - findViewById(R.id.toolbar) : anchor, mItem); - } - + View anchor = findViewById(R.id.menu_share); + AppUtils.share(this, mPopupMenu, anchor == null ? + findViewById(R.id.toolbar) : anchor, mItem); return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java b/app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java index bb07b364e..32f15d523 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java @@ -20,6 +20,7 @@ import android.content.Intent; import android.os.Bundle; +import java.lang.ref.WeakReference; import java.util.HashMap; public class LauncherActivity extends Activity { @@ -36,8 +37,8 @@ protected void onCreate(Bundle savedInstanceState) { map.put(getString(R.string.pref_launch_screen_value_jobs), JobsActivity.class); map.put(getString(R.string.pref_launch_screen_value_saved), FavoriteActivity.class); String launchScreen = Preferences.getLaunchScreen(this); - startActivity(new Intent(this, map.containsKey(launchScreen) ? - map.get(launchScreen) : ListActivity.class)); + startActivity(new WeakReference<>(new Intent(this, map.containsKey(launchScreen) ? + map.get(launchScreen) : ListActivity.class)).get()); finish(); } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java b/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java index aa814f859..266a1e330 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java @@ -24,6 +24,8 @@ import android.view.Menu; import android.view.MenuItem; +import java.lang.ref.WeakReference; + import javax.inject.Inject; import io.github.hidroh.materialistic.data.SearchRecentSuggestionsProvider; @@ -40,29 +42,29 @@ protected void onCreate(Bundle savedInstanceState) { getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE); findViewById(R.id.drawer_display).setOnClickListener(v -> - startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.display) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_display))); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_display)).get())); findViewById(R.id.drawer_offline).setOnClickListener(v -> - startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.offline) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_offline))); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_offline)).get())); findViewById(R.id.menu_list).setOnClickListener(v -> - startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.list_display_options) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_list))); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_list)).get())); findViewById(R.id.menu_comments).setOnClickListener(v -> - startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.comments) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_comments))); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_comments)).get())); findViewById(R.id.menu_readability).setOnClickListener(v -> - startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.readability) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_readability))); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_readability)).get())); findViewById(R.id.drawer_about).setOnClickListener(v -> - startActivity(new Intent(SettingsActivity.this, AboutActivity.class))); + startActivity(new WeakReference<>(new Intent(SettingsActivity.this, AboutActivity.class)).get())); findViewById(R.id.drawer_release).setOnClickListener(v -> - startActivity(new Intent(SettingsActivity.this, ReleaseNotesActivity.class))); + startActivity(new WeakReference<>(new Intent(SettingsActivity.this, ReleaseNotesActivity.class)).get())); } @Override diff --git a/app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java b/app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java index 48af18790..2723ddc4a 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java @@ -188,10 +188,10 @@ void onSubmitted(Boolean successful) { } else if (successful) { Toast.makeText(this, R.string.submit_successful, Toast.LENGTH_SHORT).show(); if (!isFinishing()) { - Intent intent = new Intent(this, NewActivity.class); - intent.putExtra(NewActivity.EXTRA_REFRESH, true); - intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - startActivity(intent); // TODO should go to profile instead? + WeakReference intent = new WeakReference<> (new Intent(this, NewActivity.class)); + intent.get().putExtra(NewActivity.EXTRA_REFRESH, true); + intent.get().setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + startActivity(intent.get()); // TODO should go to profile instead? finish(); } } else if (!isFinishing()) { diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java index 9d3f4f2ae..e6ccae9b4 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java @@ -278,9 +278,9 @@ private void showMoreOptions(View v, final Favorite item) { return true; } if (menuItem.getItemId() == R.id.menu_contextual_comment) { - mContext.startActivity(new Intent(mContext, ComposeActivity.class) + mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class) .putExtra(ComposeActivity.EXTRA_PARENT_ID, item.getId()) - .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getDisplayedTitle())); + .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getDisplayedTitle())).get()); return true; } if (menuItem.getItemId() == R.id.menu_contextual_share) { diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java index 08f9231ba..f31a22629 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java @@ -239,9 +239,9 @@ private void bindActions(final VH holder, final Item item) { return true; } if (menuItem.getItemId() == R.id.menu_contextual_comment) { - mContext.startActivity(new Intent(mContext, ComposeActivity.class) + mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class) .putExtra(ComposeActivity.EXTRA_PARENT_ID, item.getId()) - .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getText())); + .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getText())).get()); return true; } if (menuItem.getItemId() == R.id.menu_contextual_share) { diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java index 90818325a..dfed3f022 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java @@ -20,6 +20,7 @@ import android.view.View; import android.view.ViewGroup; +import java.lang.ref.WeakReference; import java.util.Arrays; import io.github.hidroh.materialistic.ItemActivity; @@ -88,8 +89,8 @@ public int getItemCount() { } private void openItem(Item item) { - mContext.startActivity(new Intent(mContext, ItemActivity.class) + mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class) .putExtra(ItemActivity.EXTRA_ITEM, item) - .putExtra(ItemActivity.EXTRA_OPEN_COMMENTS, true)); + .putExtra(ItemActivity.EXTRA_OPEN_COMMENTS, true)).get()); } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java index 3db6e995f..b819be3b0 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java @@ -460,15 +460,15 @@ void showMoreOptions(View v, final Item story, final ItemViewHolder holder) { return true; } if (item.getItemId() == R.id.menu_contextual_comment) { - mContext.startActivity(new Intent(mContext, ComposeActivity.class) + mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class) .putExtra(ComposeActivity.EXTRA_PARENT_ID, story.getId()) .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, - story.getDisplayedTitle())); + story.getDisplayedTitle())).get()); return true; } if (item.getItemId() == R.id.menu_contextual_profile) { - mContext.startActivity(new Intent(mContext, UserActivity.class) - .putExtra(UserActivity.EXTRA_USERNAME, story.getBy())); + mContext.startActivity(new WeakReference<> (new Intent(mContext, UserActivity.class) + .putExtra(UserActivity.EXTRA_USERNAME, story.getBy())).get()); return true; } if (item.getItemId() == R.id.menu_contextual_share) { diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java index 0229e950c..ed5bbeb89 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java @@ -23,6 +23,8 @@ import android.view.View; import android.view.ViewGroup; +import java.lang.ref.WeakReference; + import io.github.hidroh.materialistic.ItemActivity; import io.github.hidroh.materialistic.R; import io.github.hidroh.materialistic.ThreadPreviewActivity; @@ -98,12 +100,12 @@ protected void bind(final SubmissionViewHolder holder, final Item item) { } private void openItem(Item item) { - mContext.startActivity(new Intent(mContext, ItemActivity.class) - .putExtra(ItemActivity.EXTRA_ITEM, item)); + mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class) + .putExtra(ItemActivity.EXTRA_ITEM, item)).get()); } private void openPreview(Item item) { - mContext.startActivity(new Intent(mContext, ThreadPreviewActivity.class) - .putExtra(ThreadPreviewActivity.EXTRA_ITEM, item)); + mContext.startActivity(new WeakReference<>(new Intent(mContext, ThreadPreviewActivity.class) + .putExtra(ThreadPreviewActivity.EXTRA_ITEM, item)).get()); } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java index 6e21d8cc9..e7b07fbcf 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java @@ -23,6 +23,7 @@ import android.view.View; import android.view.ViewGroup; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -115,7 +116,7 @@ protected Item getItem(int position) { } private void openItem(Item item) { - mContext.startActivity(new Intent(mContext, ItemActivity.class) - .putExtra(ItemActivity.EXTRA_ITEM, item)); + mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class) + .putExtra(ItemActivity.EXTRA_ITEM, item)).get()); } } diff --git a/build.gradle b/build.gradle index edc3f0577..e317506e2 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.0' classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d82e0b13..73652b2a7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 18 12:33:25 EST 2019 +#Wed May 08 19:58:00 COT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip From 1861a460927a37115826427470063721bf7655fc Mon Sep 17 00:00:00 2001 From: david andres ramirez Date: Thu, 9 May 2019 20:14:31 -0500 Subject: [PATCH 3/3] first change --- .../materialistic/BaseListActivity.java | 23 +++++++++++++--- .../hidroh/materialistic/DrawerActivity.java | 10 +++---- .../hidroh/materialistic/ItemActivity.java | 26 ++++++++++++++++--- .../materialistic/LauncherActivity.java | 5 ++-- .../materialistic/SettingsActivity.java | 26 +++++++++---------- .../hidroh/materialistic/SubmitActivity.java | 8 +++--- .../widget/FavoriteRecyclerViewAdapter.java | 4 +-- .../widget/ItemRecyclerViewAdapter.java | 4 +-- .../MultiPageItemRecyclerViewAdapter.java | 5 ++-- .../widget/StoryRecyclerViewAdapter.java | 8 +++--- .../widget/SubmissionRecyclerViewAdapter.java | 10 +++---- .../ThreadPreviewRecyclerViewAdapter.java | 5 ++-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- 14 files changed, 82 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java b/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java index d5906a12e..bc5aeb219 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/BaseListActivity.java @@ -30,6 +30,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; import com.google.android.material.tabs.TabLayout; + +import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.core.content.ContextCompat; @@ -43,8 +45,6 @@ import android.view.MenuItem; import android.view.View; -import java.lang.ref.WeakReference; - import javax.inject.Inject; import io.github.hidroh.materialistic.annotation.Synthetic; @@ -75,6 +75,7 @@ public abstract class BaseListActivity extends DrawerActivity implements MultiPa @Inject SessionManager mSessionManager; @Inject CustomTabsDelegate mCustomTabsDelegate; @Inject KeyDelegate mKeyDelegate; + @Synthetic CoordinatorLayout mCoordinatorLayout; private AppBarLayout mAppBar; private TabLayout mTabLayout; private FloatingActionButton mReplyButton; @@ -150,8 +151,22 @@ protected void onCreate(Bundle savedInstanceState) { R.string.pref_external, R.string.pref_story_display, R.string.pref_multi_window); + + mCoordinatorLayout = findViewById(R.id.content_frame); } + @Override + protected void onResume(){ + super.onResume(); + if (!AppUtils.hasConnection(this)) { + Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }).show(); + } + } @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); @@ -377,9 +392,9 @@ private void openSinglePaneItem() { if (mExternalBrowser && mStoryViewMode != Preferences.StoryViewMode.Comment) { AppUtils.openWebUrlExternal(this, mSelectedItem, mSelectedItem.getUrl(), mCustomTabsDelegate.getSession()); } else { - Intent intent = new WeakReference<>(new Intent(this, ItemActivity.class) + Intent intent = new Intent(this, ItemActivity.class) .putExtra(ItemActivity.EXTRA_CACHE_MODE, getItemCacheMode()) - .putExtra(ItemActivity.EXTRA_ITEM, mSelectedItem)).get(); + .putExtra(ItemActivity.EXTRA_ITEM, mSelectedItem); startActivity(mMultiWindowEnabled ? AppUtils.multiWindowIntent(this, intent) : intent); } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java b/app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java index 554bdbb51..a48858b02 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/DrawerActivity.java @@ -35,8 +35,6 @@ import android.view.ViewGroup; import android.widget.TextView; -import java.lang.ref.WeakReference; - import javax.inject.Inject; import io.github.hidroh.materialistic.annotation.Synthetic; @@ -74,14 +72,14 @@ protected void onCreate(Bundle savedInstanceState) { public void onDrawerClosed(View drawerView) { super.onDrawerClosed(drawerView); if (drawerView.equals(mDrawer) && mPendingNavigation != null) { - WeakReference intent = new WeakReference<>(new Intent(DrawerActivity.this, mPendingNavigation)); + final Intent intent = new Intent(DrawerActivity.this, mPendingNavigation); if (mPendingNavigationExtras != null) { - intent.get().putExtras(mPendingNavigationExtras); + intent.putExtras(mPendingNavigationExtras); mPendingNavigationExtras = null; } // TODO M bug https://code.google.com/p/android/issues/detail?id=193822 - intent.get().setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - startActivity(intent.get()); + intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + startActivity(intent); mPendingNavigation = null; } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java b/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java index 3c87b9e91..0fa851c2c 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/ItemActivity.java @@ -183,7 +183,12 @@ protected void onCreate(Bundle savedInstanceState) { new ItemResponseListener(this)); } if (!AppUtils.hasConnection(this)) { - Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_LONG).show(); + Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }).show(); } } @@ -220,9 +225,22 @@ public boolean onOptionsItemSelected(MenuItem item) { return true; } if (item.getItemId() == R.id.menu_share) { - View anchor = findViewById(R.id.menu_share); - AppUtils.share(this, mPopupMenu, anchor == null ? - findViewById(R.id.toolbar) : anchor, mItem); + + if (!AppUtils.hasConnection(this)) { + Snackbar.make(mCoordinatorLayout, R.string.offline_notice, Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }).show(); + } + else + { + View anchor = findViewById(R.id.menu_share); + AppUtils.share(this, mPopupMenu, anchor == null ? + findViewById(R.id.toolbar) : anchor, mItem); + } + return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java b/app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java index 32f15d523..bb07b364e 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/LauncherActivity.java @@ -20,7 +20,6 @@ import android.content.Intent; import android.os.Bundle; -import java.lang.ref.WeakReference; import java.util.HashMap; public class LauncherActivity extends Activity { @@ -37,8 +36,8 @@ protected void onCreate(Bundle savedInstanceState) { map.put(getString(R.string.pref_launch_screen_value_jobs), JobsActivity.class); map.put(getString(R.string.pref_launch_screen_value_saved), FavoriteActivity.class); String launchScreen = Preferences.getLaunchScreen(this); - startActivity(new WeakReference<>(new Intent(this, map.containsKey(launchScreen) ? - map.get(launchScreen) : ListActivity.class)).get()); + startActivity(new Intent(this, map.containsKey(launchScreen) ? + map.get(launchScreen) : ListActivity.class)); finish(); } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java b/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java index 266a1e330..aa814f859 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java @@ -24,8 +24,6 @@ import android.view.Menu; import android.view.MenuItem; -import java.lang.ref.WeakReference; - import javax.inject.Inject; import io.github.hidroh.materialistic.data.SearchRecentSuggestionsProvider; @@ -42,29 +40,29 @@ protected void onCreate(Bundle savedInstanceState) { getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE); findViewById(R.id.drawer_display).setOnClickListener(v -> - startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.display) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_display)).get())); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_display))); findViewById(R.id.drawer_offline).setOnClickListener(v -> - startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.offline) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_offline)).get())); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_offline))); findViewById(R.id.menu_list).setOnClickListener(v -> - startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.list_display_options) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_list)).get())); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_list))); findViewById(R.id.menu_comments).setOnClickListener(v -> - startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.comments) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_comments)).get())); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_comments))); findViewById(R.id.menu_readability).setOnClickListener(v -> - startActivity(new WeakReference<>(new Intent(SettingsActivity.this, PreferencesActivity.class) + startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class) .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.readability) - .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_readability)).get())); + .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_readability))); findViewById(R.id.drawer_about).setOnClickListener(v -> - startActivity(new WeakReference<>(new Intent(SettingsActivity.this, AboutActivity.class)).get())); + startActivity(new Intent(SettingsActivity.this, AboutActivity.class))); findViewById(R.id.drawer_release).setOnClickListener(v -> - startActivity(new WeakReference<>(new Intent(SettingsActivity.this, ReleaseNotesActivity.class)).get())); + startActivity(new Intent(SettingsActivity.this, ReleaseNotesActivity.class))); } @Override diff --git a/app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java b/app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java index 2723ddc4a..48af18790 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java +++ b/app/src/main/java/io/github/hidroh/materialistic/SubmitActivity.java @@ -188,10 +188,10 @@ void onSubmitted(Boolean successful) { } else if (successful) { Toast.makeText(this, R.string.submit_successful, Toast.LENGTH_SHORT).show(); if (!isFinishing()) { - WeakReference intent = new WeakReference<> (new Intent(this, NewActivity.class)); - intent.get().putExtra(NewActivity.EXTRA_REFRESH, true); - intent.get().setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - startActivity(intent.get()); // TODO should go to profile instead? + Intent intent = new Intent(this, NewActivity.class); + intent.putExtra(NewActivity.EXTRA_REFRESH, true); + intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + startActivity(intent); // TODO should go to profile instead? finish(); } } else if (!isFinishing()) { diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java index e6ccae9b4..9d3f4f2ae 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/FavoriteRecyclerViewAdapter.java @@ -278,9 +278,9 @@ private void showMoreOptions(View v, final Favorite item) { return true; } if (menuItem.getItemId() == R.id.menu_contextual_comment) { - mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class) + mContext.startActivity(new Intent(mContext, ComposeActivity.class) .putExtra(ComposeActivity.EXTRA_PARENT_ID, item.getId()) - .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getDisplayedTitle())).get()); + .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getDisplayedTitle())); return true; } if (menuItem.getItemId() == R.id.menu_contextual_share) { diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java index f31a22629..08f9231ba 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/ItemRecyclerViewAdapter.java @@ -239,9 +239,9 @@ private void bindActions(final VH holder, final Item item) { return true; } if (menuItem.getItemId() == R.id.menu_contextual_comment) { - mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class) + mContext.startActivity(new Intent(mContext, ComposeActivity.class) .putExtra(ComposeActivity.EXTRA_PARENT_ID, item.getId()) - .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getText())).get()); + .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, item.getText())); return true; } if (menuItem.getItemId() == R.id.menu_contextual_share) { diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java index dfed3f022..90818325a 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/MultiPageItemRecyclerViewAdapter.java @@ -20,7 +20,6 @@ import android.view.View; import android.view.ViewGroup; -import java.lang.ref.WeakReference; import java.util.Arrays; import io.github.hidroh.materialistic.ItemActivity; @@ -89,8 +88,8 @@ public int getItemCount() { } private void openItem(Item item) { - mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class) + mContext.startActivity(new Intent(mContext, ItemActivity.class) .putExtra(ItemActivity.EXTRA_ITEM, item) - .putExtra(ItemActivity.EXTRA_OPEN_COMMENTS, true)).get()); + .putExtra(ItemActivity.EXTRA_OPEN_COMMENTS, true)); } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java index b819be3b0..3db6e995f 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/StoryRecyclerViewAdapter.java @@ -460,15 +460,15 @@ void showMoreOptions(View v, final Item story, final ItemViewHolder holder) { return true; } if (item.getItemId() == R.id.menu_contextual_comment) { - mContext.startActivity(new WeakReference<> (new Intent(mContext, ComposeActivity.class) + mContext.startActivity(new Intent(mContext, ComposeActivity.class) .putExtra(ComposeActivity.EXTRA_PARENT_ID, story.getId()) .putExtra(ComposeActivity.EXTRA_PARENT_TEXT, - story.getDisplayedTitle())).get()); + story.getDisplayedTitle())); return true; } if (item.getItemId() == R.id.menu_contextual_profile) { - mContext.startActivity(new WeakReference<> (new Intent(mContext, UserActivity.class) - .putExtra(UserActivity.EXTRA_USERNAME, story.getBy())).get()); + mContext.startActivity(new Intent(mContext, UserActivity.class) + .putExtra(UserActivity.EXTRA_USERNAME, story.getBy())); return true; } if (item.getItemId() == R.id.menu_contextual_share) { diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java index ed5bbeb89..0229e950c 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/SubmissionRecyclerViewAdapter.java @@ -23,8 +23,6 @@ import android.view.View; import android.view.ViewGroup; -import java.lang.ref.WeakReference; - import io.github.hidroh.materialistic.ItemActivity; import io.github.hidroh.materialistic.R; import io.github.hidroh.materialistic.ThreadPreviewActivity; @@ -100,12 +98,12 @@ protected void bind(final SubmissionViewHolder holder, final Item item) { } private void openItem(Item item) { - mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class) - .putExtra(ItemActivity.EXTRA_ITEM, item)).get()); + mContext.startActivity(new Intent(mContext, ItemActivity.class) + .putExtra(ItemActivity.EXTRA_ITEM, item)); } private void openPreview(Item item) { - mContext.startActivity(new WeakReference<>(new Intent(mContext, ThreadPreviewActivity.class) - .putExtra(ThreadPreviewActivity.EXTRA_ITEM, item)).get()); + mContext.startActivity(new Intent(mContext, ThreadPreviewActivity.class) + .putExtra(ThreadPreviewActivity.EXTRA_ITEM, item)); } } diff --git a/app/src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java b/app/src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java index e7b07fbcf..6e21d8cc9 100644 --- a/app/src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java +++ b/app/src/main/java/io/github/hidroh/materialistic/widget/ThreadPreviewRecyclerViewAdapter.java @@ -23,7 +23,6 @@ import android.view.View; import android.view.ViewGroup; -import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -116,7 +115,7 @@ protected Item getItem(int position) { } private void openItem(Item item) { - mContext.startActivity(new WeakReference<>(new Intent(mContext, ItemActivity.class) - .putExtra(ItemActivity.EXTRA_ITEM, item)).get()); + mContext.startActivity(new Intent(mContext, ItemActivity.class) + .putExtra(ItemActivity.EXTRA_ITEM, item)); } } diff --git a/build.gradle b/build.gradle index e317506e2..edc3f0577 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.3.2' classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 73652b2a7..0d82e0b13 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed May 08 19:58:00 COT 2019 +#Mon Feb 18 12:33:25 EST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip