Skip to content

Commit

Permalink
Merge pull request #39 from ZafraniTechLLC/final-changes
Browse files Browse the repository at this point in the history
Final changes
  • Loading branch information
zafrani authored May 20, 2017
2 parents 2bc8522 + 153f734 commit 4b2197d
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:icon="@drawable/logo"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,33 @@
import android.content.Intent;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.Toast;

import tech.zafrani.pubgapp.activities.ItemDetailActivity;
import tech.zafrani.pubgapp.models.Item;


public class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener{
public class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
public final static String ARG_RAW = "?raw=true";
public final static String EMPTY_FIELD = " - ";
public final static String ARG_ITEM = ItemViewHolder.class.getSimpleName() + ".ARG_ITEM";
public Item item;

public ItemViewHolder(View itemView) {
super(itemView);
itemView.setOnClickListener(this);
}

public void bind(final Item item){};
public void bind(final Item item) {
}


@Override
public void onClick(View view) {
Intent intent = new Intent(view.getContext(), ItemDetailActivity.class);
intent.putExtra(ARG_ITEM, item);
view.getContext().startActivity(intent);
// Intent intent = new Intent(view.getContext(), ItemDetailActivity.class);
// intent.putExtra(ARG_ITEM, item);
//view.getContext().startActivity(intent);
Toast.makeText(view.getContext(), "Coming soon!", Toast.LENGTH_SHORT).show();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ private void toggleRunDistance() {
return;
}
this.mapController.toggleRunDistance();
if (this.mapController.isShowingDistance()) {
showToastIfNeeded(); //todo make a tutorial and remove
}
updateUi();
}

Expand All @@ -158,7 +161,6 @@ private void updateUi() {
boatIcon.setColorFilter(ContextCompat.getColor(getActivity(), R.color.white));
}
if (this.mapController.isShowingDistance()) {
showToastIfNeeded(); //todo make a tutorial and remove
runDistanceIcon.setColorFilter(ContextCompat.getColor(getActivity(), R.color.colorAccent));
} else {
runDistanceIcon.setColorFilter(ContextCompat.getColor(getActivity(), R.color.white));
Expand Down
Binary file added app/src/main/res/drawable-hdpi/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxhdpi/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxxhdpi/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4b2197d

Please sign in to comment.