r/emotionhero
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fancy achievementopmerking in review

Browse source
This commit is contained in:
Ruben 2016-09-12 00:08:37 +01:00
parent ddd0764e19
commit b6d9c30560
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml
View file

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

3
app/build.gradle
View file

@ -10,7 +10,7 @@ android {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 23
versionCode 1 versionCode 1
versionName '0.1' versionName '0.2'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
renderscriptTargetApi 16 renderscriptTargetApi 16
@ -40,5 +40,4 @@ dependencies {
compile 'org.ocpsoft.prettytime:prettytime:4.0.1.Final' compile 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
compile 'io.github.silvaren:easyrs:0.5.3' compile 'io.github.silvaren:easyrs:0.5.3'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

4
app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java
View file

@ -86,7 +86,9 @@ public class ReviewActivity extends AppCompatActivity {
position.getInt("position"); position.getInt("position");
scoreProgressBar.setVisibility(View.GONE); scoreProgressBar.setVisibility(View.GONE);
// TODO: pass the game to checkAchievements() to avoid crash on null error
// means we have to load Player.getInstance form here and load the game
// from given id to be save.
checkAchievements(); checkAchievements();
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();

6
app/src/main/res/layout/activity_review.xml
View file

@ -144,7 +144,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorPrimaryDark" android:background="@color/emotion_joy"
android:padding="@dimen/fab_margin" android:padding="@dimen/fab_margin"
android:layout_below="@+id/achievementTitle" android:layout_below="@+id/achievementTitle"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
@ -159,7 +159,7 @@
android:id="@+id/achievementText" android:id="@+id/achievementText"
android:layout_toLeftOf="@+id/achievementArrow" android:layout_toLeftOf="@+id/achievementArrow"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:textColor="@color/textHighlight" android:textColor="@color/textPrimary"
tools:text="No achievements." /> tools:text="No achievements." />
@ -170,7 +170,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:id="@+id/achievementArrow" android:id="@+id/achievementArrow"
android:textColor="@color/textHighlight" android:textColor="@color/textPrimary"
android:textSize="36sp" android:textSize="36sp"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
</RelativeLayout> </RelativeLayout>