Skip to content

Commit 6a7d092

Browse files
committed
Version 5.9.3
Added Mega Rayquaza
1 parent 30067ad commit 6a7d092

File tree

7 files changed

+23
-18
lines changed

7 files changed

+23
-18
lines changed

AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<manifest
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
package="aloogle.pokedex"
5-
android:versionCode="57"
6-
android:versionName="5.9.1">
5+
android:versionCode="59"
6+
android:versionName="5.9.3">
77

88
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
99
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DroiDéx é um aplicativo baseado no DéxDroid versão 3.1, ou seja, uma Pokéde
77

88
Você pode baixa-lo na [Google Play Store](http://play.google.com/store/apps/details?id=aloogle.pokedex).
99

10-
Esse é o código da versão 5.9.1
10+
Esse é o código da versão 5.9.3
1111

1212
Os Pokémons recentemente adicionados são:
1313

@@ -35,6 +35,7 @@ Os Pokémons recentemente adicionados são:
3535
* Mega Sharpedo
3636
* Mega Camerupt
3737
* Mega Gallade
38+
* Mega Rayquaza
3839

3940
Por ser baseado no DéxDroid ele possui as mesmas funções, como dados de todas as espécies de Pokémon de todos os jogos (da primeira geração a sexta geração), todos os dados de Pokémon consistem em:
4041

@@ -67,7 +68,7 @@ Agradecimentos
6768
* [Radhi Fadlillah](https://github.com/RadhiFadlillah), desenvolvedor do DéxDroid.
6869

6970
Nesse aplicativo foi usado:
70-
* [Android SQLiteAssetHelper](https://github.com/jgilfelt/android-sqlite-asset-helper) biblioteca por [Jeff Gilfelt](https://github.com/jgilfelt).
71+
* [Android SQLiteAssetHelper](https://github.com/jgilfelt/android-sqlite-asset-helper) e [SystemBarTint](https://github.com/jgilfelt/SystemBarTint) bibliotecas por [Jeff Gilfelt](https://github.com/jgilfelt).
7172
* [Android Holo Colors Plugin](https://github.com/jeromevdl/android-holo-colors-idea-plugin) por [Jérôme Van Der Linden](https://github.com/jeromevdl)
7273

7374
Licença
@@ -90,7 +91,7 @@ DroiDéx is an application based on DéxDroid version 3.1, wich is an Pokédex f
9091

9192
You can download it at [Google Play Store](http://play.google.com/store/apps/details?id=aloogle.pokedex).
9293

93-
This is the 5.9.1 version code
94+
This is the 5.9.3 version code
9495

9596
Recently added Pokémon:
9697

@@ -118,6 +119,7 @@ Recently added Pokémon:
118119
* Mega Sharpedo
119120
* Mega Camerupt
120121
* Mega Gallade
122+
* Mega Rayquaza
121123

122124
Since is based on DéxDroid, it has the same functions, as data of all Pokémon species from every series of Pokémon game (Gen I to Gen VI), every Pokémon's data is consisted by:
123125

@@ -150,7 +152,7 @@ Acknowledgements
150152
* [Radhi Fadlillah](https://github.com/RadhiFadlillah), developer of DéxDroid.
151153

152154
In this app, were used:
153-
* [Android SQLiteAssetHelper](https://github.com/jgilfelt/android-sqlite-asset-helper) library by [Jeff Gilfelt](https://github.com/jgilfelt).
155+
* [Android SQLiteAssetHelper](https://github.com/jgilfelt/android-sqlite-asset-helper) and [SystemBarTint](https://github.com/jgilfelt/SystemBarTint) libraries by [Jeff Gilfelt](https://github.com/jgilfelt).
154156
* [Android Holo Colors Plugin](https://github.com/jeromevdl/android-holo-colors-idea-plugin) by [Jérôme Van Der Linden](https://github.com/jeromevdl)
155157

156158
License

assets/databases/pokedex_data

2 KB
Binary file not shown.

src/aloogle/pokedex/activity/ActivityAboutChangelogHelp.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class ActivityAboutChangelogHelp extends Activity {
2121
"<li>And other improvements.</li>\n" +
2222
"</ul>\n" +
2323
"<p style=\"text-align: justify;\"><b>Version 5.9.1:</b> Launched September, 29, 2014 - Fixed crash on open Gastly.</p>\n" +
24+
"<p style=\"text-align: justify;\"><b>Version 5.9.3:</b> Launched October, 05, 2014 - Added Mega Rayquaza.</p>\n" +
2425
"<h3 style=\"text-align: justify;\">Version 5.7</h3>\n" +
2526
"Launched July, 15, 2014\n" +
2627
"<ul style=\"text-align: justify;\">\n" +
@@ -32,13 +33,13 @@ public class ActivityAboutChangelogHelp extends Activity {
3233
"<h3 style=\"text-align: justify;\">Version 5.5</h3>\n" +
3334
"Launched June, 23, 2014\n" +
3435
"<ul style=\"text-align: justify;\">\n" +
35-
"<li>Place widgets of ALL Pok&eacute;mom on your homescreen.</li>\n" +
36+
"<li>Place widgets of ALL Pok&eacute;mon on your homescreen.</li>\n" +
3637
"<li>DroiD&eacute;x News.</li>\n" +
3738
"<li>New app icon.</li>\n" +
38-
"<li>And some others improvements.</li>\n" +
39+
"<li>And some other improvements.</li>\n" +
3940
"</ul>\n" +
4041
"<p style=\"text-align: justify;\"><b>Version 5.5.5:</b> Launched June, 29, 2014 - Fixed widgets not loading after restarting the device, widget resizing and random Pok&eacute;mon widget, also watching Pok&eacute;mon in fullscreen on DroiD&eacute;x News.</p>\n" +
41-
"<p style=\"text-align: justify;\"><b>Version 5.5.7:</b> Launched July, 09, 2014 - Added open in Smogon option, new sidebar in smartphones for a app menu more organized, added Fancy Vivillon and fixed some bugs. Version <i>5.5.7.1</i> launched in July, 11, 2014 add Mega Metagross.</p>\n" +
42+
"<p style=\"text-align: justify;\"><b>Version 5.5.7:</b> Launched July, 09, 2014 - Added open in Smogon option, new sidebar in smartphones (for a more organized app menu), added Fancy Vivillon and fixed some bugs. Version <i>5.5.7.1</i> launched in July, 11, 2014 add Mega Metagross.</p>\n" +
4243
"<h3 style=\"text-align: justify;\">Version 5.1</h3>\n" +
4344
"Launched June, 19, 2014\n" +
4445
"<ul style=\"text-align: justify;\">\n" +
@@ -133,6 +134,7 @@ public class ActivityAboutChangelogHelp extends Activity {
133134
"<li>E muitas outras melhorias.</li>\n" +
134135
"</ul>\n" +
135136
"<p style=\"text-align: justify;\"><b>Vers&atilde;o 5.9.1:</b> Lan&ccedil;ada em 29 de setembro de 2014 - Corrige problema de o aplicativo fechar ao abrir o Gastly.</p>\n" +
137+
"<p style=\"text-align: justify;\"><b>Vers&atilde;o 5.9.3:</b> Lan&ccedil;ada em 05 de outubro de 2014 - Adicionado Mega Rayquaza.</p>\n" +
136138
"<h3 style=\"text-align: justify;\">Vers&atilde;o 5.7</h3>\n" +
137139
"Lan&ccedil;ado dia 15 de julho de 2014\n" +
138140
"<ul style=\"text-align: justify;\">\n" +
@@ -292,4 +294,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
292294
super.onOptionsItemSelected(item);
293295
}
294296
}
295-
}
297+
}

src/aloogle/pokedex/activity/ActivityWebView.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.io.File;
3434
import android.os.Environment;
3535
import aloogle.pokedex.other.Other;
36+
import android.content.pm.*;
3637

3738
public class ActivityWebView extends Activity {
3839

@@ -101,12 +102,12 @@ public void onCreate(Bundle savedInstanceState) {
101102
} catch (NameNotFoundException e) {}
102103
} else if (webViewValue == 3) {
103104
Other.ActionBarColor(this);
105+
Other.SystemBarColor(this, true);
104106
try {
105-
String version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
106-
Other.ActionBarColorIcons(this, getString(R.string.yourversion) + " " + version);
107+
PackageInfo version = getPackageManager().getPackageInfo(getPackageName(), 0);
108+
Other.ActionBarColorIcons(this, getString(R.string.yourversion) + " " + version.versionName);
109+
web.loadUrl("http://aloogle.tumblr.com/droidex/update?version=" + version.versionCode);
107110
} catch (NameNotFoundException e) {}
108-
Other.SystemBarColor(this, true);
109-
web.loadUrl("http://aloogle.tumblr.com/droidex/update");
110111
} else if (webViewValue == 4) {
111112
Other.ActionBarColor(this);
112113
Other.ActionBarColorIcons(this, getString(R.string.translate));
@@ -518,4 +519,4 @@ public void onRestoreInstanceState(Bundle savedInstanceState) {
518519
String lastUrl = preferences.getString("WebViewLastUrl", "http://aloogle.tumblr.com/droidex/news");
519520
web.loadUrl(lastUrl);
520521
}
521-
}
522+
}

src/aloogle/pokedex/other/Database.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
public class Database extends SQLiteAssetHelper {
88
private static final String DATABASE_NAME = "pokedex_data";
9-
private static final int DATABASE_VERSION = 27;
9+
private static final int DATABASE_VERSION = 29;
1010
public static final String SPLIT = "ǁ";
1111

1212
public Database(Context context) {
1313
super(context, DATABASE_NAME, null, DATABASE_VERSION);
14-
setForcedUpgrade(27);
14+
setForcedUpgrade(29);
1515
}
1616

1717
private Cursor getCursor(String query, String[] args) {

src/aloogle/pokedex/other/Other.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class Other {
4747
public static final String PokemonColorBlue = "7|8|9|29|30|31|43|44|55|60|61|62|72|73|114|116|117|130|131|134|138|139|144|147|148|158|159|160|170|171|183|184|189|194|195|202|214|230|231|245|258|259|260|276|277|283|284|294|295|298|307|319|320|321|333|334|340|358|360|363|364|365|366|367|371|373|374|375|376|378|381|382|393|394|395|403|404|405|408|409|443|444|445|447|448|453|454|456|457|458|465|471|482|489|490|501|502|503|515|516|524|525|526|527|528|535|536|537|539|564|565|580|588|603|604|605|615|633|634|635|638|642|656|657|658|686|687|692|693|698|699|712|713|716|10029|10039|10040|10041|10067|10080|10132|10136|10141|10147|10158|10159|10166|10168|10172|10178|10179|10183";
4848
public static final String PokemonColorBrown = "13|16|17|18|20|21|22|37|50|51|56|57|58|59|63|64|65|74|75|76|83|84|85|104|105|106|107|115|120|127|128|133|140|141|149|161|162|163|164|185|216|217|220|221|234|237|244|263|273|274|275|285|287|289|292|297|324|327|328|343|349|377|390|391|392|396|397|398|399|400|418|419|427|428|438|449|450|473|485|504|505|506|534|551|552|586|606|618|626|629|630|645|659|660|667|668|672|673|679|680|681|688|689|690|691|696|708|709|710|711|10070|10081|10125|10126|10127|10128|10129|10130|10131|10137|10139|10140|10180";
4949
public static final String PokemonColorGray = "66|67|68|81|82|95|111|112|200|204|208|211|223|227|232|247|261|262|290|299|304|305|306|313|339|347|348|361|362|369|379|410|411|412|413|431|432|462|464|476|493|507|508|519|520|521|529|530|532|533|544|570|571|572|573|589|597|598|599|600|601|632|639|646|677|703|707|720|10041|10042|10043|10044|10045|10046|10047|10048|10049|10050|10051|10052|10053|10054|10055|10056|10057|10085|10153";
50-
public static final String PokemonColorGreen = "1|2|3|10|11|69|70|71|123|152|153|154|167|177|178|182|186|188|246|248|251|252|253|254|269|270|271|272|286|309|315|316|329|330|331|332|346|352|357|384|387|388|389|406|407|436|437|455|469|470|492|495|496|497|511|512|541|546|547|548|549|550|556|568|569|577|578|579|610|611|622|623|640|641|650|651|652|701|718|10064|10066|10068|10071|10079|10149|10165|10133";
50+
public static final String PokemonColorGreen = "1|2|3|10|11|69|70|71|123|152|153|154|167|177|178|182|186|188|246|248|251|252|253|254|269|270|271|272|286|309|315|316|329|330|331|332|346|352|357|384|387|388|389|406|407|436|437|455|469|470|492|495|496|497|511|512|541|546|547|548|549|550|556|568|569|577|578|579|610|611|622|623|640|641|650|651|652|701|718|10064|10066|10068|10071|10079|10149|10165|10133|10186";
5151
public static final String PokemonColorPink = "35|36|39|40|79|80|102|108|113|122|137|151|173|174|180|187|199|209|222|238|241|242|293|300|350|368|370|420|421|439|440|463|481|517|518|531|594|682|683|700|719|10035|10037|10038|10170|10181|10182";
5252
public static final String PokemonColorPurple = "19|23|24|32|33|34|41|42|48|49|88|89|90|91|92|93|94|109|110|121|132|142|150|169|190|196|205|207|210|226|236|268|301|302|314|317|326|345|422|423|424|425|426|429|434|435|442|451|452|472|484|509|510|574|575|576|620|649|704|705|706|714|715|10030|10075|10076|10077|10078|10138|10142|10143|10144|10063|10064|10163|10164|10167";
5353
public static final String PokemonColorRed = "4|5|6|45|46|47|98|99|100|101|118|119|124|126|129|136|165|166|168|193|212|218|219|224|225|233|240|250|255|256|257|265|308|318|323|338|341|342|380|383|386|401|402|467|474|479|498|499|500|513|514|538|543|545|553|554|555|557|558|560|616|617|621|624|625|628|631|653|654|655|661|662|663|697|717|721|10028|10031|10032|10033|10058|10059|10060|10061|10062|10069|10072|10135|10146|10150|10154|10169|10184";

0 commit comments

Comments
 (0)