Skip to content

update project gradle dependencies #4

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

Open
CarlosMiguelCuevas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update project gradle dependencies #4

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
1 change: 0 additions & 1 deletion .idea/.name
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 1 addition & 14 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
apply from: "${project.rootDir}/QA/quality.gradle"

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 26
buildToolsVersion '26.0.1'

defaultConfig {
applicationId "com.kodelabs.mycosts"
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 26
versionCode 1
versionName "1.0"
}
Expand All @@ -28,33 +27,34 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

// general
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:design:23.1.1'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.android.support:appcompat-v7:26.0.0'
compile 'com.android.support:design:26.0.0'
compile 'com.jakewharton:butterknife:8.8.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.0'
compile 'com.jakewharton.timber:timber:4.1.0'

// inspection
compile 'com.facebook.stetho:stetho:1.3.0'
compile 'com.facebook.stetho:stetho-okhttp3:1.3.0'

// network
compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
compile 'com.squareup.retrofit2:converter-gson:+'
compile 'com.squareup.okhttp3:logging-interceptor:3.0.1'
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'

// database
apt "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}"
annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}"
compile "com.github.Raizlabs.DBFlow:dbflow-core:${dbflow_version}"
compile "com.github.Raizlabs.DBFlow:dbflow:${dbflow_version}"

// material design
compile 'com.android.support:cardview-v7:23.1.1'
compile 'com.android.support:recyclerview-v7:23.1.1'
compile 'com.android.support:cardview-v7:26.0.0'
compile 'com.android.support:recyclerview-v7:26.0.0'
compile('com.github.ozodrukh:CircularReveal:1.1.1@aar') {
transitive = true;
}

// tests
testCompile 'junit:junit:4.12'
testCompile "org.mockito:mockito-core:1.+"
testCompile "org.mockito:mockito-core:1.10.19"
}
28 changes: 11 additions & 17 deletions app/src/main/java/com/kodelabs/mycosts/presentation/ui/activities/AbstractCostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.util.Date;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.codetail.widget.RevealFrameLayout;
Expand All @@ -30,29 +30,23 @@ public abstract class AbstractCostActivity extends AppCompatActivity
implements DatePickerDialog.OnDateSetListener {


@Bind(R.id.reveal_layout)
protected Date mSelectedDate;
protected String mDescription;
protected String mCategory;
protected double mAmount;
@BindView(R.id.reveal_layout)
RevealFrameLayout mRevealLayout;

@Bind(R.id.toolbar)
@BindView(R.id.toolbar)
Toolbar mToolbar;

@Bind(R.id.input_date)
@BindView(R.id.input_date)
TextView mDateTextView;

@Bind(R.id.input_amount)
@BindView(R.id.input_amount)
EditText mAmountEditText;

@Bind(R.id.input_description)
@BindView(R.id.input_description)
EditText mDescriptionEditText;

@Bind(R.id.input_cost_category)
@BindView(R.id.input_cost_category)
Spinner mCategorySpinner;

protected Date mSelectedDate;
protected String mDescription;
protected String mCategory;
protected double mAmount;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/kodelabs/mycosts/presentation/ui/activities/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import java.util.List;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.codetail.widget.RevealFrameLayout;
import timber.log.Timber;
Expand All @@ -38,10 +38,10 @@ public class MainActivity extends AppCompatActivity implements MainPresenter.Vie

public static final int EDIT_COST_REQUEST = 0;

@Bind(R.id.expenses_list)
@BindView(R.id.expenses_list)
RecyclerView mRecyclerView;

@Bind(R.id.reveal_layout)
@BindView(R.id.reveal_layout)
RevealFrameLayout mRevealLayout;

private MainPresenter mMainPresenter;
Expand Down
152 changes: 75 additions & 77 deletions app/src/main/java/com/kodelabs/mycosts/presentation/ui/adapters/CostItemAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.List;
import java.util.Set;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

/**
Expand All @@ -30,86 +30,12 @@
public class CostItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements RecyclerViewClickListener {


private enum ViewType {
CONTRACTED_CARD, EXPANDED_CARD
}

public final MainPresenter.View mView;
private List<DailyTotalCost> mCostList;
private Context mContext;
private Context mContext;

private Set<Integer> mSelectedItems;

public final MainPresenter.View mView;

public static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {

@Bind(R.id.cost_item_title)
public TextView mTitle;

@Bind(R.id.cost_item_total_value)
public TextView mTotalCost;

private RecyclerViewClickListener mListener;

public void setup(DailyTotalCost dailyTotalCost) {
Context context = mTitle.getContext();

final String dateText = DateUtils.dateToText(context, dailyTotalCost.getDate());
final String title = String.format(context.getString(R.string.total_expenses), dateText);
mTitle.setText(title);
mTotalCost.setText(String.valueOf(dailyTotalCost.getTotalCost()) + "$");
}

@Override
public void onClick(View v) {
mListener.onClickView(getAdapterPosition());
}

public ViewHolder(View v, final RecyclerViewClickListener listener) {
super(v);
ButterKnife.bind(this, v);
v.setOnClickListener(this);
mListener = listener;
}
}

public static class ExpandedViewHolder extends RecyclerView.ViewHolder
implements View.OnClickListener, IndividualCostViewClickListener {

@Bind(R.id.card_expanded_costview)
public ExpandedCostView mExpandedCostView;

private RecyclerViewClickListener mListener;

@Override
public void onClickDelete(long costId) {
mListener.onClickDelete(getAdapterPosition(), costId);
}

@Override
public void onClickEdit(long costId) {
mListener.onClickEdit(getAdapterPosition(), costId);
}

@Override
public void onClick(View v) {
mListener.onClickView(getAdapterPosition());
}

public ExpandedViewHolder(View v, final RecyclerViewClickListener listener) {
super(v);
ButterKnife.bind(this, v);
v.setOnClickListener(this);

// this listener is our adapter
mListener = listener;

// set a listener for edit, delete calls
mExpandedCostView.setIndividualCostViewClickListener(this);
}
}


public CostItemAdapter(MainPresenter.View view, Context context) {
mCostList = new ArrayList<>();
mView = view;
Expand Down Expand Up @@ -198,4 +124,76 @@ public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) {
public int getItemCount() {
return mCostList.size();
}

private enum ViewType {
CONTRACTED_CARD, EXPANDED_CARD
}

public static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {

@BindView(R.id.cost_item_title)
public TextView mTitle;

@BindView(R.id.cost_item_total_value)
public TextView mTotalCost;

private RecyclerViewClickListener mListener;

public ViewHolder(View v, final RecyclerViewClickListener listener) {
super(v);
ButterKnife.bind(this, v);
v.setOnClickListener(this);
mListener = listener;
}

public void setup(DailyTotalCost dailyTotalCost) {
Context context = mTitle.getContext();

final String dateText = DateUtils.dateToText(context, dailyTotalCost.getDate());
final String title = String.format(context.getString(R.string.total_expenses), dateText);
mTitle.setText(title);
mTotalCost.setText(String.valueOf(dailyTotalCost.getTotalCost()) + "$");
}

@Override
public void onClick(View v) {
mListener.onClickView(getAdapterPosition());
}
}

public static class ExpandedViewHolder extends RecyclerView.ViewHolder
implements View.OnClickListener, IndividualCostViewClickListener {

@BindView(R.id.card_expanded_costview)
public ExpandedCostView mExpandedCostView;

private RecyclerViewClickListener mListener;

public ExpandedViewHolder(View v, final RecyclerViewClickListener listener) {
super(v);
ButterKnife.bind(this, v);
v.setOnClickListener(this);

// this listener is our adapter
mListener = listener;

// set a listener for edit, delete calls
mExpandedCostView.setIndividualCostViewClickListener(this);
}

@Override
public void onClickDelete(long costId) {
mListener.onClickDelete(getAdapterPosition(), costId);
}

@Override
public void onClickEdit(long costId) {
mListener.onClickEdit(getAdapterPosition(), costId);
}

@Override
public void onClick(View v) {
mListener.onClickView(getAdapterPosition());
}
}
}
10 changes: 5 additions & 5 deletions app/src/main/java/com/kodelabs/mycosts/presentation/ui/customviews/CostItemView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.kodelabs.mycosts.domain.model.Cost;
import com.kodelabs.mycosts.presentation.ui.listeners.IndividualCostViewClickListener;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;

Expand All @@ -23,16 +23,16 @@
*/
public class CostItemView extends RelativeLayout implements OnMenuItemClickListener {

@Bind(R.id.cost_item_title)
@BindView(R.id.cost_item_title)
TextView mCategoryView;

@Bind(R.id.cost_item_total_value)
@BindView(R.id.cost_item_total_value)
TextView mValueView;

@Bind(R.id.cost_item_description)
@BindView(R.id.cost_item_description)
TextView mDescriptionView;

@Bind(R.id.button_menu)
@BindView(R.id.button_menu)
ImageButton mMenuButton;

private IndividualCostViewClickListener mCostViewClickListener;
Expand Down
Loading