Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/sub_object
Browse files Browse the repository at this point in the history
  • Loading branch information
l3d00m committed Apr 23, 2016
2 parents 3c7ef2e + 95c64f7 commit e7ea712
Show file tree
Hide file tree
Showing 195 changed files with 10,703 additions and 4,988 deletions.
92 changes: 92 additions & 0 deletions CHANGELOG.md
@@ -1,4 +1,96 @@

5.2.2 / 2016-04-17
==================

* Fixed inbox popup with no messages
* Fixed some albums not loading and fixed album buttons being behind the drag view
* Fixed some embeds not working
* Fixed submission layout paddings

5.2.1 / 2016-04-16
==================

* Added option for per-subreddit selftext previews
* Added remove post history and remove sub history buttons to History Settings
* Added support for setting default comment sorting per subreddit
* Made image previews work for non-image types
* Made scrolling smoother with a change to the UIL config

5.2.0 / 2016-04-16
==================

* Added a light font option to comments
* Added translations for font sizes, inbox tabs, moderation tabs
* Changed 'View' on the update snackbar to 'Changelog'
* Enabled clicking links in selftext previews
* Fixed crash with a 0 length thumbnail set value
* Fixed some bugs with data saving mode
* Fixed some issues with album buttons being stuck to the top
* Restart Slide if pro or the Video plugin was installed

5.1.7 / 2016-04-15
==================

* 'Go to subreddit' now sorts by subscribed items first, then history, then suggestions
* Added download and open externally button to albums
* Added history for direct comment links
* Added mark all as read option to the inbox
* Added support for right to left languages
* Always show big previews if it's a media type link
* Better handling of image previews
* Changed TextViews to Buttons in edit comment view
* Deeper integration with the Slide video plugin (always open with that if possible, despite external settings)
* Fixed bug opening moderation before it's loaded
* Fixed crash scrolling in Shadowbox
* Fixed embedded links not loading
* Fixed filtering content in the main view not filtering all posts out
* Fixed Go to subreddit not working correctly with mixed/upper case input
* Fixed graphical issues with text selection in reply area and edit comment
* Fixed images getting out of order in comma separated Imgur album
* Fixed opening links with capitalised schemes (Https rather than https)
* Fixed some shadowbox crashes
* Fixed tab highlight color on non-submission pages, Bug fixes
* Follow Reddit's comment sorting selection order
* If a item has only been gilded once, '1' is no longer shown next to the star
* Moved Settings back to bottom in drawer
* New bottom sheet on album images for better readability and UX
* Reddit live links now open in an internal browser
* Settings that aren't applicable are now shown as disabled rather than disappear
* Sidebar buttons now use subreddit's accent
* Some shadowbox gif loading fixes
* Tag external links with the application name that opens them
* Updated translations

5.1.6 / 2016-04-12
==================

* Added a history section of the profile which has a list of all previously visited links
* Added an option for a right-handed comment menu
* Added support for a 'guest' account and reordering subreddits as a non logged-in user
* Added support for comma separated Imgur albums
* Added support for single link spoilers (without spoiler text)
* Fixed a crash getting multireddits
* Fixed any reddit links containing "t3" not opening
* Fixed negative scores when downvoting
* Fixed not loading Imgur links
* Fixed synccit posts showing as unread upon a cold boot until a refresh was performed
* Improved layout of FAB's for tablets
* Improved settings organization
* Improved the layout for replying to comments/submissions
* Made HasSeen.addSeen store the current time for an ordered History screen
* Made the subreddit list stick between a logged out state and when the user logs in for the first time
* Made the theme colors extend to popups and dialogs
* Tweaked the layout for listing accounts

5.1.5 / 2016-04-11
==================

* Added support for modmail checks
* Fixed collapsing comments becoming uncollapsed
* Fixed crashing KitKat loading in drawables by downgrading Gradle and the appcompat versions
* Hide NSFW selftext previews
* Some memory usage improvements to the MediaView

5.1.4 / 2016-04-10
==================

Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -16,7 +16,7 @@ Slide is currently available on the Play store.
</a>

There is an active community for Slide on the
[the Google+ page](https://plus.google.com/communities/100681783215868345226),
[/r/slideforreddit](https://www.reddit.com/r/slideforreddit/) subreddit,
which anybody is welcome to join.

## Contributing
Expand Down
36 changes: 17 additions & 19 deletions app/build.gradle
Expand Up @@ -20,14 +20,11 @@ android {
// Translations are crowd-sourced
disable 'MissingTranslation'
}
aaptOptions {
additionalParameters "--no-version-vectors"
}
useLibrary 'org.apache.http.legacy'
defaultConfig {
applicationId "me.ccrama.redditslide"
targetSdkVersion 23
generatedDensities = []
versionCode 165
versionCode 179
multiDexEnabled = true
versionName androidGitVersion.name()
}
Expand Down Expand Up @@ -85,49 +82,50 @@ android {
}

repositories {
maven { url "http://dl.bintray.com/dasar/maven" }
maven { url "https://jitpack.io" }
maven { url 'https://github.com/suckgamony/RapidDecoder/raw/master/repository' }
mavenCentral()
flatDir{
dirs 'src/main/assets'
}
}

dependencies {
compile 'com.github.ccrama:JRAW:f1ddd74a5f'
compile 'com.github.ccrama:JRAW:2c2afcf055'
compile('com.github.afollestad.material-dialogs:commons:0.8.5.8@aar') {
transitive = true
}
compile 'com.jakewharton:process-phoenix:1.0.2'
compile 'com.android.support:design:23.2.1'
compile 'com.android.support:design:23.3.0'
compile 'com.koushikdutta.ion:ion:2.1.6'
compile 'uz.shift:colorpicker:0.5@aar'
compile 'com.android.support:customtabs:23.2.0'
compile 'com.android.support:recyclerview-v7:23.2.0'
compile 'com.android.support:appcompat-v7:23.2.1'
compile 'com.android.support:customtabs:23.3.0'
compile 'com.android.support:recyclerview-v7:23.3.0'
compile 'com.android.support:appcompat-v7:23.3.0'
compile 'com.github.rey5137:material:1.2.1'
compile 'jp.wasabeef:recyclerview-animators:2.0.0'
withGPlayCompile 'com.google.android.gms:play-services-drive:8.4.0'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.4.1'
compile 'com.android.support:cardview-v7:23.2.0'
compile 'com.wefika:flowlayout:0.4.1'
compile 'com.android.support:cardview-v7:23.3.0'
compile 'com.cocosw:bottomsheet:1.3.0@aar'
compile 'com.lusfold.androidkeyvaluestore:library:0.1.0@aar'
compile 'org.apache.commons:commons-lang3:3.4'
compile 'com.github.johnkil.android-robototextview:robototextview:2.4.3'
compile 'com.makeramen:roundedimageview:2.2.1'
compile 'com.android.support:multidex:1.0.1'
compile 'org.jsoup:jsoup:1.8.3'
compile 'com.sothree.slidinguppanel:library:3.3.0'
compile 'com.github.suckgamony.RapidDecoder:library:7cdfca47fa'
compile 'com.github.dasar:shiftcolorpicker:v0.5'
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'org.robolectric:robolectric:3.0'
testCompile 'org.robolectric:shadows-multidex:3.0'
testCompile 'commons-io:commons-io:2.4'
testCompile 'org.hamcrest:hamcrest-all:1.3'
compile files('src/main/assets/synccit.jar')
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
compile 'rapid.decoder:library:0.3.0'
compile('com.github.ozodrukh:CircularReveal:1.3.1@aar') {
transitive = true;
}
compile 'com.github.rjeschke:txtmark:0.13'
compile 'com.google.code.gson:gson:2.2.4'
compile 'org.jetbrains:annotations-java5:15.0'

}
16 changes: 14 additions & 2 deletions app/src/main/AndroidManifest.xml
Expand Up @@ -14,8 +14,8 @@
android:fullBackupContent="true"
android:icon="@mipmap/ic_launcher"
android:largeHeap="true"
android:hardwareAccelerated="true"
android:label="@string/app_name"
android:hardwareAccelerated="true"
android:theme="@style/yellow_dark">
<activity
android:name=".Activities.Slide"
Expand All @@ -33,11 +33,23 @@
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name">
</activity>
<receiver android:name=".CheckInstall">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_INSTALL" />
<action android:name="android.intent.action.PACKAGE_ADDED" />
<data android:scheme="package"/>
</intent-filter>
</receiver>
<activity
android:name=".Activities.SettingsSynccit"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:theme="@style/swipeable"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".Activities.ManageHistory"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:theme="@style/swipeable"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".Activities.ForceTouchLink"
android:configChanges="keyboardHidden|orientation|screenSize"
Expand Down Expand Up @@ -302,6 +314,7 @@
android:resource="@dimen/app_minimumsize_w" />

<receiver android:name=".Notifications.CheckForMail"></receiver>
<receiver android:name=".Autocache.CacheAll"></receiver>

<meta-data
android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H"
Expand All @@ -310,7 +323,6 @@
android:name="com.lge.support.SPLIT_WINDOW"
android:value="true" />


</application>

</manifest>
Binary file removed app/src/main/assets/synccit.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions app/src/main/java/me/ccrama/redditslide/Activities/Album.java
Expand Up @@ -19,6 +19,7 @@
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;

import com.afollestad.materialdialogs.AlertDialogWrapper;
Expand Down Expand Up @@ -242,7 +243,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
public void onCreate(Bundle savedInstanceState) {
overrideRedditSwipeAnywhere();
super.onCreate(savedInstanceState);
getTheme().applyStyle(new ColorPreferences(this).getFontStyle().getBaseId(), true);
getTheme().applyStyle(new ColorPreferences(this).getDarkThemeSubreddit(ColorPreferences.FONT_STYLE), true);

setContentView(R.layout.album);

Expand Down Expand Up @@ -278,14 +279,14 @@ public LoadIntoRecycler(@NotNull String url, @NotNull Activity baseActivity) {

@Override
public void doWithData(final ArrayList<JsonElement> jsonElements) {
findViewById(R.id.progress).setVisibility(View.GONE);

if (LoadIntoRecycler.this.overrideAlbum) {
cancel(true);
new LoadIntoRecycler(url.replace("/gallery", "/a"), Album.this).execute();
} else {
Album.this.gallery = LoadIntoRecycler.this.gallery;
images = new ArrayList<>(jsonElements);
if (getSupportActionBar() != null)
getSupportActionBar().setSubtitle(1 + "/" + images.size());
AlbumView adapter = new AlbumView(baseActivity, images, false, findViewById(R.id.toolbar).getHeight());
recyclerView.setAdapter(adapter);

Expand Down

0 comments on commit e7ea712

Please sign in to comment.