Skip to content
This repository has been archived by the owner on Jun 1, 2024. It is now read-only.

Commit

Permalink
Sidebar fixes, Comment crash fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@SlideCI
SlideCI committed Oct 15, 2015
1 parent d3b8d72 commit a5f55db
Show file tree
Hide file tree
Showing 16 changed files with 2,592 additions and 292 deletions.
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<activity android:name=".Activities.DonateView"/>
<activity android:name=".Activities.Shadowbox"/>
<activity android:name=".Activities.Crash"/>
<activity android:name=".Activities.SubredditOverviewSingle"/>

<activity android:name=".Activities.CommentsScreenPopup"
android:theme="@style/Theme.AppCompat.Dialog.Alert"/>
Expand Down
17 changes: 17 additions & 0 deletions app/src/main/java/me/ccrama/redditslide/Activities/OverviewBase.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package me.ccrama.redditslide.Activities;

import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarActivity;

import java.util.List;

/**
* Created by carlo_000 on 10/14/2015.
*/
public class OverviewBase extends ActionBarActivity {
public ViewPager pager;
public List<String> usedArray;

public DrawerLayout drawerLayout;
}
564 changes: 303 additions & 261 deletions app/src/main/java/me/ccrama/redditslide/Activities/SubredditOverview.java
View file

Large diffs are not rendered by default.

1,911 changes: 1,911 additions & 0 deletions app/src/main/java/me/ccrama/redditslide/Activities/SubredditOverviewSingle.java
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,10 @@ public int unhideNumber(CommentNode n, int i) {
if (hiddenPersons.contains(name)) {
hiddenPersons.remove(name);
}
if(hidden.contains(name)) {
hidden.remove(name);
i++;
}
i += unhideNumber(ignored, 0);
}
}
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.ArrayList;
import java.util.List;

import me.ccrama.redditslide.Activities.OverviewBase;
import me.ccrama.redditslide.Activities.SubredditOverview;
import me.ccrama.redditslide.Activities.SubredditView;
import me.ccrama.redditslide.R;
Expand Down Expand Up @@ -112,8 +113,8 @@ public void onClick(View view) {
inte.putExtra("subreddit", subreddit);
getContext().startActivity(inte);
} else {
((SubredditOverview) getContext()).pager.setCurrentItem(((SubredditOverview) getContext()).usedArray.indexOf(fitems.get(position)));
((SubredditOverview) getContext()).drawerLayout.closeDrawers();
((OverviewBase) getContext()).pager.setCurrentItem(((OverviewBase) getContext()).usedArray.indexOf(fitems.get(position)));
((OverviewBase) getContext()).drawerLayout.closeDrawers();
InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
Expand Down
60 changes: 36 additions & 24 deletions app/src/main/java/me/ccrama/redditslide/Reddit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,20 @@
import me.ccrama.redditslide.Activities.LoadingData;
import me.ccrama.redditslide.Activities.Login;
import me.ccrama.redditslide.Activities.SubredditOverview;
import me.ccrama.redditslide.Activities.SubredditOverviewSingle;
import me.ccrama.redditslide.Notifications.NotificationJobScheduler;
import me.ccrama.redditslide.util.IabHelper;
import me.ccrama.redditslide.util.IabResult;

/**
* Created by ccrama on 9/17/2015.
*/
public class Reddit extends Application implements Application.ActivityLifecycleCallbacks {
public class Reddit extends Application implements Application.ActivityLifecycleCallbacks {
public static IabHelper mHelper;
public static boolean single;

boolean closed = false;

@Override
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
}
Expand All @@ -54,10 +57,10 @@ public void onActivityPaused(Activity activity) {
@Override
public void onActivityResumed(Activity activity) {

if(closed && ! (activity instanceof Login) && !isRestarting) {
if (closed && !(activity instanceof Login) && !isRestarting) {

new Authentication.UpdateToken().execute();
closed = false;
new Authentication.UpdateToken().execute();
closed = false;

}
}
Expand Down Expand Up @@ -100,7 +103,8 @@ public void onNavigationEvent(int navigationEvent, Bundle extras) {
}

public boolean isRestarting;
public class SetupIAB extends AsyncTask<Void, Void, Void>{

public class SetupIAB extends AsyncTask<Void, Void, Void> {

@Override
protected Void doInBackground(Void... params) {
Expand All @@ -114,7 +118,7 @@ public void onIabSetupFinished(IabResult result) {

}
});
} catch(Exception e){
} catch (Exception e) {

}
return null;
Expand All @@ -140,7 +144,7 @@ public void onCreate() {
seen = getSharedPreferences("SEEN", 0);
hidden = getSharedPreferences("HIDDEN", 0);

//new SetupIAB().execute();
//new SetupIAB().execute();

//START code adapted from https://github.com/QuantumBadger/RedReader/
final Thread.UncaughtExceptionHandler androidHandler = Thread.getDefaultUncaughtExceptionHandler();
Expand All @@ -161,14 +165,15 @@ public void uncaughtException(Thread thread, Throwable t) {
i.putExtra("stacktrace", s);

startActivity(i);
} catch(Throwable t1) {}
} catch (Throwable t1) {
}

androidHandler.uncaughtException(thread, t);
}
});
//END adaptation

if(!seen.contains("RESET")){
if (!seen.contains("RESET")) {
colors.edit().clear().apply();
seen.edit().clear().apply();
hidden.edit().clear().apply();
Expand All @@ -187,48 +192,55 @@ public void uncaughtException(Thread thread, Throwable t) {

}

single = colors.getBoolean("Single", false);
int height = this.getResources().getConfiguration().screenWidthDp;

int width = this.getResources().getConfiguration().screenHeightDp;

int fina;
if(height > width){
if (height > width) {
fina = height;
} else {
fina = width;
}
fina = ((fina + 99) / 100 ) * 100;
fina = ((fina + 99) / 100) * 100;
themeBack = new ColorPreferences(this).getFontStyle().getThemeType();

if(seen.contains("tabletOVERRIDE")){
if (seen.contains("tabletOVERRIDE")) {
dpWidth = seen.getInt("tabletOVERRIDE", fina / 300);
} else {
dpWidth = fina / 300;
}
if(seen.contains("notificationOverride")){
if (seen.contains("notificationOverride")) {
notificationTime = seen.getInt("notificationOverride", 15);
} else {
notificationTime = 15;
}
defaultDPWidth = fina/300;
defaultDPWidth = fina / 300;
new Authentication(this);

if(notificationTime != -1){
if (notificationTime != -1) {
notifications = new NotificationJobScheduler(this);

}
tabletUI = isPackageInstalled(this, "me.ccrama.slideforreddittabletuiunlock");
}

public static int defaultDPWidth;
public void startMain(){
if(active) {
Intent i = new Intent(this, SubredditOverview.class);

public void startMain() {
if (active) {
Intent i = null;
if (single) {
i = new Intent(this, SubredditOverviewSingle.class);
} else {
i = new Intent(this, SubredditOverview.class);
}
Log.v("Slide", "starting new");
i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

startActivity(i);
if(loader != null){
if (loader != null) {
loader.finish();
}
}
Expand All @@ -242,24 +254,24 @@ public void startMain(){
public LoadingData loader;
public static SharedPreferences hidden;

public static boolean isPackageInstalled (final Context ctx, final String packageName) {
public static boolean isPackageInstalled(final Context ctx, final String packageName) {
boolean result = false;
try {
final PackageManager pm = ctx.getPackageManager();
final PackageInfo pi = pm.getPackageInfo(packageName, 0);
if (pi != null && pi.applicationInfo.enabled)
result = true;
}
catch (final Throwable e) {
} catch (final Throwable e) {
}

return result;
}
public void restart(){

public void restart() {
isRestarting = true;

Intent mStartActivity = new Intent(this, LoadingData.class);
mStartActivity.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP| Intent.FLAG_ACTIVITY_NEW_TASK);
mStartActivity.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);

mStartActivity.putExtra("EXIT", true);
this.startActivity(mStartActivity);
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/me/ccrama/redditslide/SubredditStorage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ public static void addPin(String name) {

ArrayList<String> newstrings = new ArrayList<>();
for (String s : pins.split(",")) {
if(!newstrings.contains(s))
newstrings.add(s);
}
newstrings.add(name.toLowerCase());
Expand Down
29 changes: 29 additions & 0 deletions app/src/main/java/me/ccrama/redditslide/Views/NoSwipingViewPager.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package me.ccrama.redditslide.Views;

import android.content.Context;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;

public class NoSwipingViewPager extends ViewPager {

public NoSwipingViewPager(Context context) {
super(context);
}

public NoSwipingViewPager(Context context, AttributeSet attrs) {
super(context, attrs);
}

@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
// Never allow swiping to switch between pages
return false;
}

@Override
public boolean onTouchEvent(MotionEvent event) {
// Never allow swiping to switch between pages
return false;
}
}
10 changes: 5 additions & 5 deletions app/src/main/java/me/ccrama/redditslide/Views/PopulateSubmissionViewHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ public void onClick(View view) {
if (type == ContentType.ImageType.IMAGE) {
url = ContentType.getFixedUrl(submission.getUrl());
if (big || fullscreen) {
Glide.with(mContext).load(url).crossFade().into(holder.leadImage);
Glide.with(mContext).load(url).into(holder.leadImage);
holder.imageArea.setVisibility(View.VISIBLE);
holder.previewContent.setVisibility(View.GONE);
bigAtEnd = true;
} else {
Glide.with(mContext).load(url).crossFade().into(holder.thumbImage);
Glide.with(mContext).load(url).into(holder.thumbImage);

holder.imageArea.setVisibility(View.GONE);
holder.previewContent.setVisibility(View.VISIBLE);
Expand All @@ -123,13 +123,13 @@ public void onClick(View view) {
holder.leadImage.setMinimumHeight(submission.getDataNode().get("preview").get("images").get(0).get("source").get("height").asInt());
url = submission.getDataNode().get("preview").get("images").get(0).get("source").get("url").asText();
if ((big || fullscreen) && !blurry) {
Glide.with(mContext).load(url).crossFade().into(holder.leadImage);
Glide.with(mContext).load(url).into(holder.leadImage);

holder.imageArea.setVisibility(View.VISIBLE);
holder.previewContent.setVisibility(View.GONE);
bigAtEnd = true;
} else {
Glide.with(mContext).load(url).crossFade().into(holder.thumbImage);
Glide.with(mContext).load(url).into(holder.thumbImage);

holder.imageArea.setVisibility(View.GONE);
holder.previewContent.setVisibility(View.VISIBLE);
Expand All @@ -140,7 +140,7 @@ public void onClick(View view) {

if ((SettingValues.NSFWPreviews && submission.getThumbnailType() == Submission.ThumbnailType.NSFW) || submission.getThumbnailType() == Submission.ThumbnailType.URL) {
bigAtEnd = false;
Glide.with(mContext).load(submission.getThumbnail()).crossFade().into(holder.thumbImage);
Glide.with(mContext).load(submission.getThumbnail()).into(holder.thumbImage);

holder.imageArea.setVisibility(View.GONE);
holder.previewContent.setVisibility(View.VISIBLE);
Expand Down

0 comments on commit a5f55db

Please sign in to comment.