v1.1.2 Adding generation 3's Pokemon

README.md

@@ -6,6 +6,9 @@ In order to protect the website, the security part is not included in this proje
 
 <img src="https://raw.githubusercontent.com/kaiyan910/PGO-WeCatch-Android/master/screenshot_1.png" width="200"> <img src="https://raw.githubusercontent.com/kaiyan910/PGO-WeCatch-Android/master/screenshot_2.png" width="200"> <img src="https://raw.githubusercontent.com/kaiyan910/PGO-WeCatch-Android/master/screenshot_3.png" width="200"> <img src="https://raw.githubusercontent.com/kaiyan910/PGO-WeCatch-Android/master/screenshot_4.png" width="200">
 
+## v1.1.2
+- Adding Generation 3's Pokemons
+
 ## v1.1.1
 - OSM is added as another map provider
 

app/build.gradle

@@ -25,13 +25,13 @@ androidExtensions {
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    buildToolsVersion "26.0.2"
     defaultConfig {
         applicationId "com.kennah.wecatch"
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 1
-        versionName "1.1.1"
+        versionName "1.1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         externalNativeBuild {

app/src/main/java/com/kennah/wecatch/local/Constant.kt

@@ -19,18 +19,22 @@ object Constant {
     val MAP_PROVIDER_OSM = "OSM"
 
     @JvmField
-    val POKEMON_GENERATION = 2
+    val POKEMON_GENERATION = 3
 
     @JvmField
-    val MAX_POKEMON = 251
+    val MAX_POKEMON = 386
     @JvmField
     val GYM = (0..5)
     @JvmField
     val GEN_1 = (1..151)
     @JvmField
     val GEN_2 = (152..251)
     @JvmField
-    val GENERATION = listOf(GEN_1, GEN_2)
+    val GEN_3 = (252..386)
+    @JvmField
+    val GENERATION = listOf(GEN_1, GEN_2, GEN_3)
+    @JvmField
+    val MOVE_SET = 281
 
     @JvmField
     val REQ_FILTER = 10001

app/src/main/java/com/kennah/wecatch/module/main/ui/view/MapPokemonWindow.kt

@@ -13,6 +13,7 @@ import com.kennah.wecatch.R
 import com.kennah.wecatch.core.utils.ResourceUtils
 import com.kennah.wecatch.core.utils.TimeUtils
 import com.kennah.wecatch.core.withDelay
+import com.kennah.wecatch.local.Constant
 import com.kennah.wecatch.local.model.Pokemon
 import com.kennah.wecatch.local.utils.ColorUtils
 import org.jetbrains.anko.textColor
@@ -72,8 +73,17 @@ class MapPokemonWindow(context: Context) : LinearLayout(context) {
                     pokemon.cp
             )
 
-            mTextMove1.text = ResourceUtils.getStringResource(context, "move_" + pokemon.move1)
-            mTextMove2.text = ResourceUtils.getStringResource(context, "move_" + pokemon.move2)
+            mTextMove1.text = if (pokemon.move1 > Constant.MOVE_SET) {
+                ResourceUtils.getStringResource(context, "move_0")
+            } else {
+                ResourceUtils.getStringResource(context, "move_" + pokemon.move1)
+            }
+
+            mTextMove2.text = if (pokemon.move2 > Constant.MOVE_SET) {
+                ResourceUtils.getStringResource(context, "move_0")
+            } else {
+                ResourceUtils.getStringResource(context, "move_" + pokemon.move2)
+            }
         }
     }
 }

app/src/main/res/values/strings.xml

@@ -18,6 +18,7 @@
         <item>RAID</item>
         <item>GEN. 1</item>
         <item>GEN. 2</item>
+        <item>GEN. 3</item>
     </string-array>
 
     <string name="filter_gym">GYM</string>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta7'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong