Skip to content

Commit

Permalink
Add infinity and coffee break cards
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergiopatricio
sergiopatricio committed Apr 23, 2016
1 parent 0e5b759 commit fde64d5
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 16 deletions.
8 changes: 6 additions & 2 deletions app/src/main/java/pt/samp/scrumCards/Card.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ final class Card {
R.id.card20,
R.id.card40,
R.id.card100,
R.id.cardq
R.id.cardquestion,
R.id.cardinfinite,
R.id.cardcoffee
};

private static final int[] IMAGES = new int[] {
Expand All @@ -33,7 +35,9 @@ final class Card {
R.drawable.card_big_20,
R.drawable.card_big_40,
R.drawable.card_big_100,
R.drawable.card_big_question
R.drawable.card_big_question,
R.drawable.card_big_infinite,
R.drawable.card_big_coffee
};

public static ImageView createCardView(Context context, ViewGroup parent, int position) {
Expand Down
Binary file added app/src/main/res/drawable-nodpi/card_big_coffee.png
View file
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-nodpi/card_big_infinite.png
View file
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-nodpi/card_small_coffee.png
View file
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-nodpi/card_small_infinite.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 11 additions & 9 deletions app/src/main/res/layout-land/main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" style="@style/main_window">
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_0" android:id="@+id/card0" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_1_2" android:id="@+id/card1_2" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_1" android:id="@+id/card1" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_2" android:id="@+id/card2" />
</LinearLayout>
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_0" android:id="@+id/card0" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_1_2" android:id="@+id/card1_2" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_1" android:id="@+id/card1" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_2" android:id="@+id/card2" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_3" android:id="@+id/card3" />
</LinearLayout>
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_5" android:id="@+id/card5" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_8" android:id="@+id/card8" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_13" android:id="@+id/card13" />
</LinearLayout>
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_20" android:id="@+id/card20" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_40" android:id="@+id/card40" />
</LinearLayout>
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_100" android:id="@+id/card100" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_question" android:id="@+id/cardq" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_question" android:id="@+id/cardquestion" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_infinite" android:id="@+id/cardinfinite" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_coffee" android:id="@+id/cardcoffee" />
</LinearLayout>
</LinearLayout>
14 changes: 9 additions & 5 deletions app/src/main/res/layout/main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" style="@style/main_window">
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_0" android:id="@+id/card0" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_1_2" android:id="@+id/card1_2" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_1" android:id="@+id/card1" />
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_0" android:id="@+id/card0" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_1_2" android:id="@+id/card1_2" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_1" android:id="@+id/card1" />
</LinearLayout>
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_2" android:id="@+id/card2" />
Expand All @@ -18,6 +18,10 @@
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_40" android:id="@+id/card40" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_100" android:id="@+id/card100" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_question" android:id="@+id/cardq" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_question" android:id="@+id/cardquestion" />
</LinearLayout>
<LinearLayout style="@style/card_option_line">
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_infinite" android:id="@+id/cardinfinite" />
<ImageView style="@style/card_option_item" android:src="@drawable/card_small_coffee" android:id="@+id/cardcoffee" />
</LinearLayout>
</LinearLayout>

0 comments on commit fde64d5

Please sign in to comment.