Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed hardcoded strings and improved code readability, indentation etc #221

Merged
merged 1 commit into from
Jun 12, 2017
Merged

Removed hardcoded strings and improved code readability, indentation etc #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/amahi/anywhere/activity/NavigationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,17 +384,17 @@ public void passShare(List<ServerShare> serverShares) {

if(serverApps!=null){
ArrayList<ServerApp> serverAppsArrayList = new ArrayList<>(serverApps);
tvIntent.putParcelableArrayListExtra("INTENT_APPS",serverAppsArrayList);
tvIntent.putParcelableArrayListExtra(getString(R.string.intent_apps),serverAppsArrayList);
}

if(serverShares!=null) {
ArrayList<ServerShare> serverShareArrayList = new ArrayList<>(serverShares);
tvIntent.putParcelableArrayListExtra("INTENT_SHARES",serverShareArrayList);
tvIntent.putParcelableArrayListExtra(getString(R.string.intent_shares),serverShareArrayList);
}

if(servers!=null){
ArrayList<Server> serverArrayList = new ArrayList<>(servers);
tvIntent.putParcelableArrayListExtra("INTENT_SERVERS",serverArrayList);
tvIntent.putParcelableArrayListExtra(getString(R.string.intent_servers),serverArrayList);
}
startActivity(tvIntent);
}
Expand Down
66 changes: 49 additions & 17 deletions src/main/java/org/amahi/anywhere/fragment/IntroFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.graphics.drawable.ColorDrawable;
import android.support.annotation.Nullable;
import android.support.v17.leanback.app.OnboardingFragment;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
Expand Down Expand Up @@ -45,27 +46,37 @@ public class IntroFragment extends OnboardingFragment {
@Override
public void onAttach(Context context) {
super.onAttach(context);

mTitles = new ArrayList<>();
mDescriptions = new ArrayList<>();


mColors = new ArrayList<>();
mColors.add(Color.parseColor("#0277bd"));
mColors.add(Color.parseColor("#3949ab"));
mColors.add(ContextCompat.getColor(context, R.color.intro_1));
mColors.add(ContextCompat.getColor(context, R.color.intro_2));
mColors.add(Color.DKGRAY);
mColors.add(Color.parseColor("#26a69a"));
mColors.add(Color.parseColor("#FBC02D"));
mColors.add(Color.parseColor("#303f9f"));
mTitles.add("Amahi TV");
mDescriptions.add("Presenting the all new Amahi TV.");
mTitles.add("Access your HDA");
mDescriptions.add("Amahi TV lets you access your HDA. Play your Videos, Listen to your music and yes! View your photos");
mTitles.add("Watch your photos.");
mDescriptions.add("View all your photos backed in your HDA directly in your Android TV.");
mTitles.add("Listen to your music");
mDescriptions.add("Listen to all of your songs backed in your HDA directly in your Android TV.");
mTitles.add("Play your videos.");
mDescriptions.add("Play Videos directly on your Android TV.");
mTitles.add("Ready");
mDescriptions.add("You're all set to go. Thanks for using Amahi.");
mColors.add(ContextCompat.getColor(context, R.color.intro_4));
mColors.add(ContextCompat.getColor(context, R.color.intro_5));
mColors.add(ContextCompat.getColor(context, R.color.intro_6));

mTitles.add(getString(R.string.app_title));
mDescriptions.add(getString(R.string.intro_desc_1));

mTitles.add(getString(R.string.intro_title_2));
mDescriptions.add(getString(R.string.intro_desc_2));

mTitles.add(getString(R.string.intro_title_3));
mDescriptions.add(getString(R.string.intro_desc_3));

mTitles.add(getString(R.string.intro_title_4));
mDescriptions.add(getString(R.string.intro_desc_4));

mTitles.add(getString(R.string.intro_title_5));
mDescriptions.add(getString(R.string.intro_desc_5));

mTitles.add(getString(R.string.intro_title_6));
mDescriptions.add(getString(R.string.intro_desc_6));

setLogoResourceId(R.drawable.ic_app_logo);
}

Expand Down Expand Up @@ -96,9 +107,13 @@ protected View onCreateBackgroundView(LayoutInflater inflater, ViewGroup contain
protected View onCreateContentView(LayoutInflater inflater, ViewGroup container) {
mContentView = (ImageView) inflater.inflate(R.layout.onboarding_image, container,
false);

ViewGroup.MarginLayoutParams layoutParams = ((ViewGroup.MarginLayoutParams) mContentView.getLayoutParams());

layoutParams.topMargin = 30;

layoutParams.bottomMargin = 60;

return mContentView;
}

Expand All @@ -110,13 +125,21 @@ protected View onCreateForegroundView(LayoutInflater inflater, ViewGroup contain
@Override
protected Animator onCreateEnterAnimation() {
ArrayList<Animator> animators = new ArrayList<>();

animators.add(createFadeInAnimator(mBackgroundView));

mContentView.setImageResource(CONTENT_IMAGES[0]);

mContentAnimator = createFadeInAnimator(mContentView);

animators.add(mContentAnimator);

AnimatorSet set = new AnimatorSet();

set.playTogether(animators);

mBackgroundView.setBackground(new ColorDrawable(mColors.get(0)));

return set;
}

Expand All @@ -125,8 +148,11 @@ protected void onPageChanged(final int newPage, int previousPage) {
if (mContentAnimator != null) {
mContentAnimator.end();
}

ArrayList<Animator> animators = new ArrayList<>();

Animator fadeOut = createFadeOutAnimator(mContentView);

fadeOut.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
Expand Down Expand Up @@ -154,11 +180,17 @@ public void onAnimationEnd(Animator animation) {
}
}
});

animators.add(fadeOut);

animators.add(createFadeInAnimator(mContentView));

AnimatorSet set = new AnimatorSet();

set.playSequentially(animators);

set.start();

mContentAnimator = set;
}

Expand Down
72 changes: 34 additions & 38 deletions src/main/java/org/amahi/anywhere/fragment/MainTVFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@
import android.support.v17.leanback.widget.HeaderItem;
import android.support.v17.leanback.widget.ListRow;
import android.support.v17.leanback.widget.ListRowPresenter;
import android.support.v17.leanback.widget.OnItemViewClickedListener;
import android.support.v17.leanback.widget.Presenter;
import android.support.v17.leanback.widget.Row;
import android.support.v17.leanback.widget.RowPresenter;

import org.amahi.anywhere.R;
import org.amahi.anywhere.presenter.CardPresenter;
import org.amahi.anywhere.presenter.GridItemPresenter;
import org.amahi.anywhere.presenter.SettingsItemPresenter;
Expand All @@ -22,85 +19,84 @@
import java.util.ArrayList;

public class MainTVFragment extends BrowseFragment {
private static final String TAG = MainTVFragment.class.getSimpleName();

private ArrayObjectAdapter mRowsAdapter;
private ArrayList<ServerApp> serverAppArrayList;
private ArrayList<ServerShare> serverShareArrayList;
private ArrayList<Server> serverArrayList;

@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
serverAppArrayList = getActivity().getIntent().getParcelableArrayListExtra("INTENT_APPS");
serverShareArrayList = getActivity().getIntent().getParcelableArrayListExtra("INTENT_SHARES");
serverArrayList = getActivity().getIntent().getParcelableArrayListExtra("INTENT_SERVERS");

serverAppArrayList = getActivity().getIntent().getParcelableArrayListExtra(getString(R.string.intent_apps));

serverShareArrayList = getActivity().getIntent().getParcelableArrayListExtra(getString(R.string.intent_shares));

serverArrayList = getActivity().getIntent().getParcelableArrayListExtra(getString(R.string.intent_servers));

setupUIElements();

loadRows(0);
}

private void setupUIElements() {
// setBadgeDrawable(getActivity().getResources().getDrawable(R.drawable.videos_by_google_banner));
setTitle("Amahi TV"); // Badge, when set, takes precedent
//getTitleView().setBackgroundColor(getResources().getColor(R.color.intro1));
// over title
setTitle(getString(R.string.app_title));

setHeadersState(HEADERS_ENABLED);
setHeadersTransitionOnBackEnabled(true);

//getView().setBackgroundColor(Color.parseColor("#FFF"));
setHeadersTransitionOnBackEnabled(true);

// set fastLane (or headers) background color
setBrandColor(Color.parseColor("#0277bd"));
// set search icon color

setSearchAffordanceColor(Color.GREEN);
}

private void loadRows(int index) {
mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
/* GridItemPresenter */
HeaderItem server = new HeaderItem(index, "Server");
HeaderItem shares = new HeaderItem(index, "Shares");
HeaderItem apps = new HeaderItem(index, "Apps");
HeaderItem settings = new HeaderItem(index,"Preferences");
ArrayObjectAdapter mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());

HeaderItem server = new HeaderItem(index, getString(R.string.row_servers));

HeaderItem shares = new HeaderItem(index, getString(R.string.row_shares));

HeaderItem apps = new HeaderItem(index, getString(R.string.row_apps));

HeaderItem settings = new HeaderItem(index,getString(R.string.row_preferences));

GridItemPresenter mGridPresenter = new GridItemPresenter();

ArrayObjectAdapter gridRowAdapter = new ArrayObjectAdapter(mGridPresenter);

if(serverArrayList!=null)
for(int i=0;i<serverArrayList.size();i++) gridRowAdapter.add(serverArrayList.get(i).getName());
else gridRowAdapter.add(0,"No servers available");

mRowsAdapter.add(new ListRow(server, gridRowAdapter));

setAdapter(mRowsAdapter);

gridRowAdapter = new ArrayObjectAdapter(mGridPresenter);

if(serverShareArrayList!=null)
for(int i=0;i<serverShareArrayList.size();i++) gridRowAdapter.add(i,serverShareArrayList.get(i).getName());
else gridRowAdapter.add(0,"No shares present");

mRowsAdapter.add(new ListRow(shares, gridRowAdapter));

gridRowAdapter = new ArrayObjectAdapter(new CardPresenter());

if(serverAppArrayList!=null)
for(int i=0;i<serverAppArrayList.size();i++) gridRowAdapter.add(i,serverAppArrayList.get(i));
else gridRowAdapter.add(0,"No Apps present");

mRowsAdapter.add(new ListRow(apps,gridRowAdapter));

SettingsItemPresenter settingsItemPresenter = new SettingsItemPresenter();

gridRowAdapter = new ArrayObjectAdapter(settingsItemPresenter);
gridRowAdapter.add("Sign out");
gridRowAdapter.add("Connection");
gridRowAdapter.add("Select Theme");
mRowsAdapter.add(new ListRow(settings,gridRowAdapter));
}

public final class ItemViewClickedListener implements OnItemViewClickedListener {
@Override
public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item, RowPresenter.ViewHolder rowViewHolder, Row row) {
if(item=="Sign out"){
//startActivity(new Intent(getActivity(),SignOutStepActivity.class));
}
}
gridRowAdapter.add(getString(R.string.pref_title_sign_out));

gridRowAdapter.add(getString(R.string.pref_title_connection));

gridRowAdapter.add(getString(R.string.pref_title_select_theme));

mRowsAdapter.add(new ListRow(settings,gridRowAdapter));
}
}
6 changes: 5 additions & 1 deletion src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,11 @@ private State() {
}

public interface passServerEvent{
public void passServer(List<Server> serverList);
void passServer(List<Server> serverList);
}

private passServerEvent passServerEventListener;

@Inject
AmahiClient amahiClient;

Expand Down Expand Up @@ -295,7 +296,10 @@ public void onAttach(Context context) {
@Subscribe
public void onServersLoaded(ServersLoadedEvent event) {
setUpServersContent(event.getServers());

//FRAGMENT CALLBACK
passServerEventListener.passServer(event.getServers());

setUpNavigation();
showContent();
}
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/amahi/anywhere/fragment/ServerAppsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private State() {
}

public interface passAppsEvent{
public void passApps(List<ServerApp> serverApps);
void passApps(List<ServerApp> serverApps);
}

private ServerAppsAdapter mServerAppsAdapter;
Expand Down Expand Up @@ -162,6 +162,7 @@ private void setUpAppsContent() {
serverClient.getApps();
}
}

@Override
public void onAttach(Context context) {
super.onAttach(context);
Expand All @@ -180,7 +181,10 @@ public void onServerConnectionChanged(ServerConnectionChangedEvent event) {
@Subscribe
public void onAppsLoaded(ServerAppsLoadedEvent event) {
setUpAppsContent(event.getServerApps());

//FRAGMENT CALLBACK
passAppsEventListener.passApps(event.getServerApps());

showAppsContent();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/amahi/anywhere/fragment/ServerSharesFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
public class ServerSharesFragment extends Fragment
{
public interface passShareEvent{
public void passShare(List<ServerShare> serverShares);
void passShare(List<ServerShare> serverShares);
}

private static final class State
Expand Down
Loading