tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed the way to check if a view is empty, fixed some strings, fixed fastscroller alignment.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-06-10 15:27:45 +02:00
commit 8ba0c72037
43 changed files with 185 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -9,6 +9,8 @@ import android.os.Bundle;
import android.os.Handler;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.AppBarLayout.OnOffsetChangedListener;
import android.support.design.widget.NavigationView;
import android.support.design.widget.TabLayout;
import android.support.v4.util.Pair;
@ -67,6 +69,7 @@ public class MainActivity extends AbsFabActivity
private DrawerLayout drawerLayout;
private ActionBarDrawerToggle drawerToggle;
private AppBarLayout appBar;
private Toolbar toolbar;
private PagerAdapter pagerAdapter;
private ViewPager viewPager;
@ -83,7 +86,7 @@ public class MainActivity extends AbsFabActivity
initViews();
setUpDrawerLayout();
setUpToolBar();
setUpToolbar();
setUpViewPager();
if (PreferenceUtils.getInstance(this).coloredNavigationBarOtherScreensEnabled())
@ -135,20 +138,19 @@ public class MainActivity extends AbsFabActivity
tabLayout = (TabLayout) findViewById(R.id.tabs);
drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
navigationView = (NavigationView) findViewById(R.id.nav_view);
toolbar = (Toolbar) findViewById(R.id.toolbar);
appBar = (AppBarLayout) findViewById(R.id.appbar);
}
private void setUpToolBar() {
private void setUpToolbar() {
setTitle(getResources().getString(R.string.app_name));
toolbar = (Toolbar) findViewById(R.id.toolbar);
setToolBarColor();
setAppBarColor();
setSupportActionBar(toolbar);
setUpDrawerToggle();
}
private void setToolBarColor() {
final int colorPrimary = getThemeColorPrimary();
toolbar.setBackgroundColor(colorPrimary);
tabLayout.setBackgroundColor(colorPrimary);
private void setAppBarColor() {
appBar.setBackgroundColor(getThemeColorPrimary());
}
private void setUpNavigationView() {
@ -597,4 +599,16 @@ public class MainActivity extends AbsFabActivity
}));
}
}
public void addOnAppBarOffsetChangedListener(OnOffsetChangedListener onOffsetChangedListener) {
appBar.addOnOffsetChangedListener(onOffsetChangedListener);
}
public void removeOnAppBArOffsetChangedListener(OnOffsetChangedListener onOffsetChangedListener) {
appBar.removeOnOffsetChangedListener(onOffsetChangedListener);
}
public int getTotalAppBarScrollingRange() {
return appBar.getTotalScrollRange();
}
}

6
app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
View file

@ -29,6 +29,7 @@ public class SearchActivity extends AbsBaseActivity {
private RecyclerView recyclerView;
private SearchView searchView;
private SearchAdapter searchAdapter;
private View noResults;
@SuppressLint("NewApi")
@Override
@ -37,6 +38,7 @@ public class SearchActivity extends AbsBaseActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search);
noResults = findViewById(android.R.id.empty);
recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
searchAdapter = new SearchAdapter(this);
@ -132,7 +134,9 @@ public class SearchActivity extends AbsBaseActivity {
}
private void search(String query) {
if (searchAdapter != null)
if (searchAdapter != null) {
searchAdapter.search(query);
noResults.setVisibility(searchAdapter.getItemCount() < 1 ? View.VISIBLE : View.GONE);
}
}
}

49
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java
View file

@ -2,26 +2,29 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments;
import android.os.Bundle;
import android.support.annotation.StringRes;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.AppBarLayout.OnOffsetChangedListener;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.interfaces.OnUpdatedListener;
import com.kabouzeid.gramophone.interfaces.SelfUpdating;
import com.kabouzeid.gramophone.views.FastScroller;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class AbsMainActivityRecyclerViewFragment extends AbsMainActivityFragment implements OnUpdatedListener {
public abstract class AbsMainActivityRecyclerViewFragment extends AbsMainActivityFragment implements OnOffsetChangedListener {
public static final String TAG = AbsMainActivityRecyclerViewFragment.class.getSimpleName();
private RecyclerView recyclerView;
private RecyclerView.Adapter mAdapter;
private FastScroller fastScroller;
private TextView empty;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -33,25 +36,34 @@ public abstract class AbsMainActivityRecyclerViewFragment extends AbsMainActivit
super.onViewCreated(view, savedInstanceState);
recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
fastScroller = (FastScroller) view.findViewById(R.id.fast_scroller);
empty = (TextView) view.findViewById(android.R.id.empty);
final FastScroller fastScroller = (FastScroller) view.findViewById(R.id.fast_scroller);
fastScroller.setRecyclerView(recyclerView);
fastScroller.setPressedHandleColor(getMainActivity().getThemeColorPrimary());
fastScroller.setOnHandleTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
return false;
}
});
fastScroller.setPressedHandleColor(getMainActivity().getThemeColorPrimary());
getMainActivity().addOnAppBarOffsetChangedListener(this);
setUpRecyclerView();
checkAndProcessAdapterSize();
showEmptyMessageIfEmpty();
}
private void setUpRecyclerView() {
mAdapter = createAdapter();
if (mAdapter instanceof SelfUpdating) ((SelfUpdating) mAdapter).setOnUpdatedListener(this);
mAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
@Override
public void onChanged() {
super.onChanged();
showEmptyMessageIfEmpty();
}
});
recyclerView.setLayoutManager(createLayoutManager());
recyclerView.setAdapter(mAdapter);
@ -61,6 +73,13 @@ public abstract class AbsMainActivityRecyclerViewFragment extends AbsMainActivit
return mAdapter;
}
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int i) {
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) fastScroller.getLayoutParams();
params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, getMainActivity().getTotalAppBarScrollingRange() + i);
fastScroller.setLayoutParams(params);
}
@Override
public void enableViews() {
super.enableViews();
@ -73,14 +92,11 @@ public abstract class AbsMainActivityRecyclerViewFragment extends AbsMainActivit
recyclerView.setEnabled(false);
}
private void checkAndProcessAdapterSize() {
final View v = getView();
private void showEmptyMessageIfEmpty() {
RecyclerView.Adapter adapter = getAdapter();
if (adapter != null && v != null) {
final TextView emptyTextView = (TextView) v.findViewById(android.R.id.empty);
emptyTextView.setText(getEmptyMessage());
emptyTextView.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
if (adapter != null) {
empty.setText(getEmptyMessage());
empty.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
}
}
@ -92,9 +108,4 @@ public abstract class AbsMainActivityRecyclerViewFragment extends AbsMainActivit
protected abstract RecyclerView.LayoutManager createLayoutManager();
protected abstract RecyclerView.Adapter createAdapter();
@Override
public void onUpdated(SelfUpdating selfUpdating) {
checkAndProcessAdapterSize();
}
}