Permalink
Browse files

Sejuani banner and email feature

  • Loading branch information...
1 parent 509935d commit 50d3385cec30f0e854402902ce0f7c6af29c79b5 @NeonXero committed Jan 18, 2012
View
6 AndroidManifest.xml
@@ -2,8 +2,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.neonlotus.lolandroidapp"
android:installLocation="auto"
- android:versionCode="1"
- android:versionName="1.0">
+ android:versionCode="3"
+ android:versionName="1.06">
+ <!-- New champ = .01 New feature = .05 New huge = .1-->
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7"/>
@@ -19,7 +20,6 @@
<activity android:name=".Lore"></activity>
<activity android:name=".Info"></activity>
<activity android:name=".Champion"></activity>
- <activity android:name=".Champion"></activity>
</application>
<!--
<uses-permission android:name="android.permission.INTERNET" />
View
19 Just a note
@@ -0,0 +1,19 @@
+NEW CHAMP
+
+1. Name
+strings.xml line 4
+
+2. Tagline
+strings.xml line ~2778
+
+3. Attributes
+strings.xml line ~2497
+
+4. Banner
+strings.xml line ~2872
+
+5. Story
+strings.xml line ~236
+
+6. Icon
+Info.java ~105
View
BIN res/drawable-hdpi/sej.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable/sej_ban.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
11 res/layout/right_page.xml
@@ -12,7 +12,9 @@
<ScrollView
android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="50dp"
+ >
<LinearLayout
android:layout_height="wrap_content"
@@ -97,7 +99,14 @@
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="Item 12"/>
+
</LinearLayout>
</LinearLayout>
</ScrollView>
+ <Button
+ android:id="@+id/emailButton"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_marginTop="-50dp"
+ android:text="Email this build" />
</LinearLayout>
View
13 res/values/strings.xml
@@ -61,6 +61,7 @@
<item>Riven</item>
<item>Rumble</item>
<item>Ryze</item>
+ <item>Sejuani</item>
<item>Shaco</item>
<item>Shen</item>
<item>Shyvana</item>
@@ -1760,6 +1761,15 @@
-High Councilor Heywan Relivash
</item>
<!--ryze_story-->
+ <!--Sejuani-->
+ <item>
+ When Sejuani was born, the mystics of her tribe foretold that she would be the one to unite and lead the divided territories of Freljord. Her people had suffered for centuries, as a losing war on the frozen tundra pushed them farther and farther from Freljord\'s limited food supplies. Sejuani grew up surrounded by this misery, and it fueled her desire to fulfill her destiny. She pushed herself to extremes, walking out into blizzards without food or furs and training while frigid winds raked her flesh. She sparred with the strongest warriors of her tribe, one after another, until her legs would give out beneath her. She sustained injuries that would have killed any other member of the tribe, but she would only rise again, driven by sheer force of will and what her tribe took to calling her \'heart of the blizzard.\'\n\n
+
+ On her twentieth birthday, Sejuani declared that she would lead her people out of their remote isolation to conquer the lands of their enemies. She had completed her training and she was ready to face the leaders of the opposing tribes. Her feats had already become legend and soldiers in her company were inspired to new heights of strength and resolve. However, before she struck out on her campaign, Ashe began campaigning for peace in Freljord, joining the League of Legends to demonstrate how the people could be spared violence. To Sejuani, this was a violation of tradition - a coward\'s ruse to hoard Freljord\'s precious few resources. She saw the confidence of her people wane as it seemed they would never be delivered from their plight. She decided that to truly prove herself as the rightful ruler of Freljord, she must defeat Ashe completely and unquestionably on the world\'s stage in the League of Legends.\n\n
+
+ \'Freljord provides for the few. For the others, \'peace\' means only death.\'
+ -Sejuani
+ </item>
<item>Most would say that death isn\'t funny. It isn\'t, unless you\'re Shaco - then it\'s hysterical. He is
Valoran\'s first fully functioning homicidal comic; he jests until someone dies, and then he laughs. The
figure that has come to be known as the Demon Jester is an enigma. No one fully agrees from whence he came,
@@ -2544,6 +2554,7 @@
<item>Fighter, melee</item>
<item>Mage, melee, pusher</item>
<item>Mage, ranged, recommended</item>
+ <!--Sej--><item>Tank, jungler, melee</item>
<item>Assassin, stealth, melee</item>
<item>Tank, support, melee</item>
<item>Fighter, melee</item>
@@ -2835,6 +2846,7 @@
<item>the exile, riven</item>
<item>the mechanized menace, rumble</item>
<item>the rogue mage, ryze</item>
+ <!--Sej--><item>the winter\'s wrath, sejuani</item>
<item>the demon jester, shaco</item>
<item>eye of twilight, shen</item>
<item>the half-dragon, shyvana</item>
@@ -2928,6 +2940,7 @@
<item>@drawable/riven_ban</item>
<item>@drawable/rumble_ban</item>
<item>@drawable/ryze_ban</item>
+ <!--sej--><item>@drawable/sej_ban</item>
<item>@drawable/shaco_ban</item>
<item>@drawable/shen_ban</item>
<item>@drawable/shyv_ban</item>
View
25 src/net/neonlotus/lolandroidapp/Champion.java
@@ -4,6 +4,7 @@
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.content.res.TypedArray;
@@ -27,7 +28,7 @@
private ChampObj mChampData;
private String mPrefPrefix;
- Button b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12;
+ Button b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, bEmail;
private SharedPreferences mPrefs;
//Saved stuff
@@ -175,15 +176,16 @@ public Object instantiateItem(View collection, final int position) {
b10 = ((Button) view.findViewById(R.id.itemButton10));
b11 = ((Button) view.findViewById(R.id.itemButton11));
b12 = ((Button) view.findViewById(R.id.itemButton12));
+ bEmail=((Button)findViewById(R.id.emailButton));
LoadPreferences();
- ((Button) view.findViewById(R.id.itemButton1)).setOnClickListener(new View.OnClickListener() {
+ b1.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
showOptionsMenu(0);
}
});
- ((Button) view.findViewById(R.id.itemButton2)).setOnClickListener(new View.OnClickListener() {
+ b2.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
showOptionsMenu(1);
}
@@ -238,6 +240,23 @@ public void onClick(View view) {
showOptionsMenu(11);
}
});
+ ((Button) view.findViewById(R.id.emailButton)).setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND);
+
+ emailIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, "League Lore Build for " + mChampData.getChampName());
+ String sendThis = "1. " + b1.getText()+"\n2. "+b2.getText()+"\n3. "+b3.getText()+"\n4. "+b4.getText()
+ +"\n5. "+b5.getText()+"\n6. "+b6.getText()+"\n7. "+b7.getText()+"\n8. "+b8.getText()
+ +"\n9. "+b9.getText()+"\n10. "+b10.getText()+"\n11. "+b11.getText()+"\n12. "+b12.getText();
+ emailIntent.putExtra(android.content.Intent.EXTRA_TEXT, sendThis);
+
+ emailIntent.setType("text/plain");
+
+ startActivity(Intent.createChooser(emailIntent, "Send mail..."));
+
+ finish();
+ }
+ });
break;
}
View
2 src/net/neonlotus/lolandroidapp/Info.java
@@ -119,7 +119,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
R.drawable.nidalee, R.drawable.noct, R.drawable.nunu, R.drawable.olaf, R.drawable.orian,
R.drawable.panth,
R.drawable.poppy, R.drawable.rammus, R.drawable.rene, R.drawable.riven, R.drawable.rumb,
- R.drawable.ryze,
+ R.drawable.ryze,R.drawable.sej,
R.drawable.shaco, R.drawable.shen, R.drawable.shyv, R.drawable.singed, R.drawable.sion,
R.drawable.sivir,
R.drawable.skarn, R.drawable.sona, R.drawable.soraka, R.drawable.swain, R.drawable.talon,

0 comments on commit 50d3385

Please sign in to comment.