Skip to content

Commit

Permalink
Merge branch 'master' of github.com:sujithkanna/SmileyRating
Browse files Browse the repository at this point in the history
  • Loading branch information
sujithkanna committed May 31, 2017
2 parents e0d5954 + 8df22f8 commit 9b74486
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ public class SmileRating extends BaseRating {
private int mTextNonSelectedColor = Color.parseColor("#AEB3B5");
private int mPlaceholderBackgroundColor = Color.parseColor("#e6e8ed");

private String[] mNames = new String[]{
"Terrible", "Bad", "Okay", "Good", "Great"
};
private String[] mNames = getResources().getStringArray(R.array.names);

private Face[] mFaces = new Face[SMILES_LIST.length];
private Map<Integer, Point> mTouchPoints = new HashMap<>();
Expand Down
13 changes: 13 additions & 0 deletions smilerating/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
<resources>
<string name="app_name">SmileRating</string>
<string name="smile_rating_terrible">Terrible</string>
<string name="smile_rating_bad">Bad</string>
<string name="smile_rating_okay">Okay</string>
<string name="smile_rating_good">Good</string>
<string name="smile_rating_great">Great</string>

<string-array name="names">
<item>@string/smile_rating_terrible</item>
<item>@string/smile_rating_bad</item>
<item>@string/smile_rating_okay</item>
<item>@string/smile_rating_good</item>
<item>@string/smile_rating_great</item>
</string-array>
</resources>

0 comments on commit 9b74486

Please sign in to comment.