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

Commit

Permalink
UI touch feedback, Long press info on some views, Bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@SlideCI
SlideCI committed Oct 12, 2015
1 parent 85fb67c commit 0f227ac
Show file tree
Hide file tree
Showing 61 changed files with 2,669 additions and 150 deletions.
4 changes: 3 additions & 1 deletion app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.johnkil.android-robototextview/robototextview/2.4.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.ozodrukh/RippleDrawable/2.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.rey5137/material/1.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.traex.expandablelayout/library/1.3/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.wefika/flowlayout/0.4.1/jars" />
Expand All @@ -103,19 +104,20 @@
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
<orderEntry type="library" exported="" name="material-1.1.1" level="project" />
<orderEntry type="library" exported="" name="commons-0.8.2.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="jackson-annotations-2.5.0" level="project" />
<orderEntry type="library" exported="" name="library-1.0.2" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="glide-3.6.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
<orderEntry type="library" exported="" name="library-1.0.0" level="project" />
<orderEntry type="library" exported="" name="guava-18.0" level="project" />
<orderEntry type="library" exported="" name="RippleDrawable-2.0.0" level="project" />
<orderEntry type="library" exported="" name="gson-2.3" level="project" />
<orderEntry type="library" exported="" name="core-0.8.2.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.0.1" level="project" />
Expand Down
6 changes: 4 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
minSdkVersion 16
targetSdkVersion 23
versionCode 61
versionName "4.0"
versionName "4.0.5"
}
buildTypes {
release {
Expand Down Expand Up @@ -42,14 +42,16 @@ dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.koushikdutta.ion:ion:2.+'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.github.bumptech.glide:glide:3.6.1'
compile 'com.github.traex.expandablelayout:library:1.3'
compile('com.afollestad.material-dialogs:core:0.8.2.0@aar') {
transitive = true
}
compile('com.afollestad.material-dialogs:commons:0.8.2.0@aar') {
transitive = true
}
compile 'com.github.ozodrukh:RippleDrawable:2.0.0'

compile 'uz.shift:colorpicker:0.5@aar'
compile 'com.android.support:customtabs:+'
compile 'com.github.johnkil.android-robototextview:robototextview:2.4.2'
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/me/ccrama/redditslide/Activities/CommentSearch.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package me.ccrama.redditslide.Activities;

import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.Editable;
import android.text.TextWatcher;
Expand All @@ -15,6 +14,7 @@
import me.ccrama.redditslide.ColorPreferences;
import me.ccrama.redditslide.DataShare;
import me.ccrama.redditslide.R;
import me.ccrama.redditslide.Views.PreCachingLayoutManager;
import me.ccrama.redditslide.Visuals.FontPreferences;

/**
Expand All @@ -35,8 +35,8 @@ public void onCreate(Bundle savedInstance) {
final EditText search = (EditText) findViewById(R.id.search);

RecyclerView rv = (RecyclerView) findViewById(R.id.vertical_content);
final LinearLayoutManager mLayoutManager;
mLayoutManager = new LinearLayoutManager(this);
final PreCachingLayoutManager mLayoutManager;
mLayoutManager = new PreCachingLayoutManager(this);
rv.setLayoutManager(mLayoutManager);
final CommentAdapterSearch adapter = new CommentAdapterSearch(this, comments, rv);
rv.setAdapter(adapter);
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/me/ccrama/redditslide/Activities/SingleView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.os.Build;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;
import android.support.v7.widget.Toolbar;
Expand All @@ -20,6 +19,7 @@
import me.ccrama.redditslide.ColorPreferences;
import me.ccrama.redditslide.R;
import me.ccrama.redditslide.Reddit;
import me.ccrama.redditslide.Views.PreCachingLayoutManager;
import me.ccrama.redditslide.Visuals.FontPreferences;
import me.ccrama.redditslide.Visuals.Pallete;

Expand Down Expand Up @@ -54,8 +54,8 @@ public void onCreate(Bundle savedInstanceState) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rv = ((RecyclerView) findViewById(R.id.vertical_content));
if (getResources().getConfiguration().orientation != Configuration.ORIENTATION_LANDSCAPE || ! Reddit.tabletUI) {
final LinearLayoutManager mLayoutManager;
mLayoutManager = new LinearLayoutManager(this);
final PreCachingLayoutManager mLayoutManager;
mLayoutManager = new PreCachingLayoutManager(this);
rv.setLayoutManager(mLayoutManager);
} else {
final StaggeredGridLayoutManager mLayoutManager;
Expand Down
44 changes: 38 additions & 6 deletions app/src/main/java/me/ccrama/redditslide/Activities/SubredditOverview.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import me.ccrama.redditslide.SubredditStorageNoContext;
import me.ccrama.redditslide.TimeUtils;
import me.ccrama.redditslide.Views.MakeTextviewClickable;
import me.ccrama.redditslide.Views.ToastHelpCreation;
import me.ccrama.redditslide.Visuals.FontPreferences;
import me.ccrama.redditslide.Visuals.Pallete;
import uz.shift.colorpicker.LineColorPicker;
Expand Down Expand Up @@ -184,7 +185,13 @@ public void onClick(View v) {

setDataSet(SubredditStorage.subredditsForHome);
doSidebar();

findViewById(R.id.menu).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
ToastHelpCreation.makeToast(v, "Global App Settings", SubredditOverview.this);
return false;
}
});
findViewById(R.id.menu).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down Expand Up @@ -475,12 +482,26 @@ public void onClick(View v) {
}
}
});
findViewById(R.id.sorting).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
ToastHelpCreation.makeToast(v, "Change Post Sorting", SubredditOverview.this);
return false;
}
});
findViewById(R.id.grid).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
ToastHelpCreation.makeToast(v, "Enable Shadowbox Mode", SubredditOverview.this);
return false;
}
});
findViewById(R.id.grid).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
{

if(Reddit.tabletUI) {
if (Reddit.tabletUI) {
DataShare.sharedSubreddit = ((SubmissionsView) adapter.getCurrentFragment()).posts.posts;
Intent i = new Intent(SubredditOverview.this, PhotoSubredditView.class);
i.putExtra("position", pager.getCurrentItem());
Expand Down Expand Up @@ -509,6 +530,14 @@ public void onClick(DialogInterface dialog, int whichButton) {
}
}
});

findViewById(R.id.info).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
ToastHelpCreation.makeToast(v, "Open Subreddit Settings", SubredditOverview.this);
return false;
}
});
findViewById(R.id.info).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down Expand Up @@ -1549,8 +1578,6 @@ public CharSequence getPageTitle(int position) {
public void doSidebar() {
ListView l = (ListView) findViewById(R.id.drawerlistview);
LayoutInflater inflater = getLayoutInflater();
ViewGroup footer = (ViewGroup) inflater.inflate(R.layout.drawerbottom, l, false);
l.addFooterView(footer, null, false);
View header;

if (Authentication.isLoggedIn) {
Expand Down Expand Up @@ -1578,6 +1605,7 @@ public void onClick(View view) {
SubredditOverview.this.startActivity(inte);
}
});

header.findViewById(R.id.logout).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Expand All @@ -1602,13 +1630,15 @@ public void onClick(View view) {
Overview.this.startActivity(inte);
}
});*/

header.findViewById(R.id.inbox).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent inte = new Intent(SubredditOverview.this, Inbox.class);
SubredditOverview.this.startActivity(inte);
}
});

header.findViewById(R.id.submit).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Expand All @@ -1631,14 +1661,16 @@ public void onClick(View view) {
}
});
}
footer.findViewById(R.id.support).setOnClickListener(new View.OnClickListener() {

header.findViewById(R.id.support).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent inte = new Intent(SubredditOverview.this, DonateView.class);

SubredditOverview.this.startActivity(inte);
}
});

final EditText e = ((EditText) header.findViewById(R.id.sort));
e.setOnEditorActionListener(new TextView.OnEditorActionListener() {

Expand Down Expand Up @@ -1677,7 +1709,7 @@ public void onClick(DialogInterface dialog, int whichButton) {

}
});
footer.findViewById(R.id.tablet).setOnClickListener(new View.OnClickListener() {
header.findViewById(R.id.tablet).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
/* Intent inte = new Intent(Overview.this, Overview.class);
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AlertDialog;
import android.support.v7.internal.view.ContextThemeWrapper;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;
import android.support.v7.widget.Toolbar;
Expand Down Expand Up @@ -46,6 +45,7 @@
import me.ccrama.redditslide.Reddit;
import me.ccrama.redditslide.SubredditStorage;
import me.ccrama.redditslide.Views.MakeTextviewClickable;
import me.ccrama.redditslide.Views.PreCachingLayoutManager;
import me.ccrama.redditslide.Visuals.FontPreferences;
import me.ccrama.redditslide.Visuals.Pallete;
import uz.shift.colorpicker.LineColorPicker;
Expand Down Expand Up @@ -122,8 +122,8 @@ public void onCreate(Bundle savedInstanceState) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rv = ((RecyclerView) findViewById(R.id.vertical_content));
if (getResources().getConfiguration().orientation != Configuration.ORIENTATION_LANDSCAPE || ! Reddit.tabletUI) {
final LinearLayoutManager mLayoutManager;
mLayoutManager = new LinearLayoutManager(this);
final PreCachingLayoutManager mLayoutManager;
mLayoutManager = new PreCachingLayoutManager(this);
rv.setLayoutManager(mLayoutManager);
} else {
final StaggeredGridLayoutManager mLayoutManager;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/me/ccrama/redditslide/Adapters/AlbumView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.bumptech.glide.Glide;
import com.google.gson.JsonElement;
import com.squareup.picasso.Picasso;

import java.util.ArrayList;

Expand Down Expand Up @@ -58,7 +58,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {
iv.setMinimumHeight(height);
}

Picasso.with(getContext()).load(url).into(iv);
Glide.with(getContext()).load(url).crossFade().into(iv);
{
TextView tv = (TextView) convertView.findViewById(R.id.imagetitle);
tv.setText(user.getAsJsonObject().getAsJsonObject("image").get("title").getAsString());
Expand Down

0 comments on commit 0f227ac

Please sign in to comment.