Version 5.5.5

Fixed widget don't load on system restart, added aleatory Pokémon widget and now can watch Pokémon in fullscreen on DroiDéx News
alefesouza · Jun 30, 2014 · 0859835 · 0859835
1 parent d20bd41
commit 0859835
Show file tree

Hide file tree

Showing 41 changed files with 852 additions and 201 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest 
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="aloogle.pokedex"
-    android:versionCode="39"
-    android:versionName="5.5">
+    android:versionCode="45"
+    android:versionName="5.5.5">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -46,20 +46,35 @@
 
         <activity
             android:name=".activity.ActivityVerifyUpdate"
+            android:configChanges="orientation|screenSize"
             android:parentActivityName=".activity.ActivityMain"/>
 
         <activity
             android:name=".activity.ActivitySendFeedback"
+            android:configChanges="orientation|screenSize"
             android:parentActivityName=".activity.ActivityMain"/>
 
         <activity
             android:name=".activity.ActivityNews"
+            android:configChanges="orientation|screenSize"
             android:parentActivityName=".activity.ActivityMain"/>
 
         <activity
             android:name=".activity.ActivitySettings"
             android:parentActivityName=".activity.ActivityMain"/>
 
+        <activity
+            android:name=".activity.ActivityHelp"
+            android:parentActivityName=".activity.ActivityMain"/>
+
+        <activity
+            android:name=".activity.pt.ActivityAboutChangelog"
+            android:parentActivityName=".activity.ActivityMain"/>
+
+        <activity
+            android:name=".activity.pt.ActivityHelp"
+            android:parentActivityName=".activity.ActivityMain"/>
+
         <activity
             android:name=".activity.ActivityPokemonFilter"
             android:theme="@style/Transucent_Pokedex_Red_Theme"/>
@@ -71,10 +86,17 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/widget" />
         </receiver>
 
+        <receiver android:name=".widget.WidgetShortcutRandom" android:label="@string/addaleatorypokemon">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/widget_random" />
+        </receiver>
+
         <activity android:name=".widget.WidgetShortcutConfigure">
-         <intent-filter>
-           <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-         </intent-filter>
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
         </activity>
     </application>
 

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ DroiDéx
 
 DroiDéx é um aplicativo baseado no DéxDroid ( https://github.com/RadhiFadlillah/Pokedex ) versão 3.1, ou seja, uma Pokédex para Android, decidi cria-lo porque eu gostava muito do aplicativo DéxDroid e fiquei muito decepcionado ao ver que ele saiu da Play Store e não recebeu mais atualizações, mas como o desenvolvedor original deixou ele em código aberto e deixou que qualquer um modificasse e distribuísse desde haja os devidos créditos, decidi que eu mesmo iria continua-lo.
 
-Esse é o código da versão 5.5
+Esse é o código da versão 5.5.5
 
 Nessa versão foram adicionados:
 
@@ -23,12 +23,14 @@ Nessa versão foram adicionados:
 * Primal Groudon
 * Mega Diancie
 
+As principais diferenças se comparado ao aplicativo original são uma página de configurações para mudar a cor do aplicativo, e poder adicionar widgets de QUALQUER Pokémon na tela inicial.
+
 ##### English
 
 DroiDéx is an application based on DéxDroid (https://
-github.com/RadhiFadlillah/Pokedex) version 3.1, wich is an Pokédex for Android. I decided creating it because i loved the app DéxDroid and became so disappointed when I realized it was removed from Play Store and had no more updates, but since the original developer left it open source and allowed anyone to modify and distribute, containing the credits to him, i decided to update it by myself.
+github.com/RadhiFadlillah/Pokedex) version 3.1, wich is an Pokédex for Android. I decided creating it because i loved the app DéxDroid and became so disappointed when I realized it was removed from Play Store and had no more updates, but since the original developer left it open source and allowed anyone to modify and distribute, containing the credits to him, I decided to update it by myself.
 
-This is the 5.5 version code
+This is the 5.5.5 version code
 
 Recently added Pokémon:
 
@@ -46,6 +48,8 @@ Recently added Pokémon:
 * Primal Groudon
 * Mega Diancie
 
+Compared to the original application, the major differences are a settings page to change the theme color and the function to add widgets of ANY Pokémon onto your homescreen.
+
 Here the README of DéxDroid:
 
 DéxDroid

diff --git a/assets/databases/pokedex_data b/assets/databases/pokedex_data
diff --git a/res/anim/bottom_in.xml b/res/anim/bottom_in.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/linear_interpolator">  
-  <translate 
-      android:fromYDelta="100%p" 
-      android:toYDelta="0" 
-      android:duration="500"/>
+    android:interpolator="@android:anim/linear_interpolator">  
+    <translate 
+        android:fromYDelta="100%p" 
+        android:toYDelta="0" 
+        android:duration="500"/>
 </set> 
diff --git a/res/anim/fade_in.xml b/res/anim/fade_in.xml
@@ -1,6 +1,6 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android" 
-     android:fillAfter="true">
-     <alpha android:fromAlpha="0.0" 
-            android:toAlpha="1.0"
-            android:duration="2000"/>
+    android:fillAfter="true">
+    <alpha android:fromAlpha="0.0" 
+        android:toAlpha="1.0"
+        android:duration="2000"/>
 </set>
diff --git a/res/anim/fade_out.xml b/res/anim/fade_out.xml
@@ -1,6 +1,6 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android" 
-     android:fillAfter="true">
-     <alpha android:fromAlpha="1.0" 
-            android:toAlpha="0.0"
-            android:duration="2000"/>
+    android:fillAfter="true">
+    <alpha android:fromAlpha="1.0" 
+        android:toAlpha="0.0"
+        android:duration="2000"/>
 </set>
diff --git a/res/anim/forbackward_in.xml b/res/anim/forbackward_in.xml
@@ -1 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> <scale xmlns:android="http://schemas.android.com/apk/res/android" android:fromXScale="0.1" android:toXScale="1.0" android:fromYScale="0.1" android:toYScale="1.0" android:duration="1000" android:pivotX="50%" android:pivotY="50%" > </scale> </set>
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXScale="0.1"
+        android:toXScale="1.0"
+        android:fromYScale="0.1"
+        android:toYScale="1.0"
+        android:duration="1000"
+        android:pivotX="50%"
+        android:pivotY="50%" >
+    </scale>
+</set>
diff --git a/res/anim/forbackward_out.xml b/res/anim/forbackward_out.xml
@@ -1 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> <scale xmlns:android="http://schemas.android.com/apk/res/android" android:fromXScale="1.0" android:toXScale="0.1" android:fromYScale="1.0" android:toYScale="0.1" android:duration="1000" android:pivotX="50%" android:pivotY="50%" > </scale> </set>
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXScale="1.0"
+        android:toXScale="0.1"
+        android:fromYScale="1.0"
+        android:toYScale="0.1"
+        android:duration="1000"
+        android:pivotX="50%"
+        android:pivotY="50%" >
+    </scale>
+</set>
diff --git a/res/anim/forward_in.xml b/res/anim/forward_in.xml
@@ -1 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> <scale xmlns:android="http://schemas.android.com/apk/res/android" android:fromXScale="0.0" android:toXScale="1.0" android:fromYScale="0.0" android:toYScale="1.0" android:duration="1000" android:pivotX="50%" android:pivotY="50%" > </scale> </set>
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXScale="0.0"
+        android:toXScale="1.0"
+        android:fromYScale="0.0"
+        android:toYScale="1.0"
+        android:duration="1000"
+        android:pivotX="50%"
+        android:pivotY="50%" >
+    </scale>
+</set>
diff --git a/res/anim/forward_out.xml b/res/anim/forward_out.xml
@@ -1 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> <scale xmlns:android="http://schemas.android.com/apk/res/android" android:startOffset="5000" android:fromXScale="1.0" android:toXScale="0.1" android:fromYScale="1.0" android:toYScale="0.1" android:duration="1000" android:pivotX="50%" android:pivotY="50%" > </scale> </set>
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale xmlns:android="http://schemas.android.com/apk/res/android"
+        android:startOffset="5000"
+        android:fromXScale="1.0"
+        android:toXScale="0.1"
+        android:fromYScale="1.0"
+        android:toYScale="0.1"
+        android:duration="1000"
+        android:pivotX="50%"
+        android:pivotY="50%" >
+	</scale>
+</set>
diff --git a/res/anim/left_out.xml b/res/anim/left_out.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/linear_interpolator">  
-  <translate 
-      android:fromXDelta="0" 
-      android:toXDelta="-100%p" 
-      android:duration="500"/>
+    android:interpolator="@android:anim/linear_interpolator">  
+    <translate 
+        android:fromXDelta="0" 
+        android:toXDelta="-100%p" 
+        android:duration="500"/>
 </set> 
diff --git a/res/anim/right_in.xml b/res/anim/right_in.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/linear_interpolator">  
-  <translate 
-      android:fromXDelta="100%p" 
-      android:toXDelta="0" 
-      android:duration="500"/>
+    android:interpolator="@android:anim/linear_interpolator">  
+    <translate 
+        android:fromXDelta="100%p" 
+        android:toXDelta="0" 
+        android:duration="500"/>
 </set>  
diff --git a/res/anim/top_out.xml b/res/anim/top_out.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/linear_interpolator">  
-  <translate 
-      android:fromYDelta="0" 
-      android:toYDelta="-100%p" 
-      android:duration="500"/>
+    android:interpolator="@android:anim/linear_interpolator">  
+    <translate 
+        android:fromYDelta="0" 
+        android:toYDelta="-100%p" 
+        android:duration="500"/>
 </set> 
diff --git a/res/layout/activity_splash.xml b/res/layout/activity_splash.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"	tools:context=".activity.ActivitySplashScreen">
+    android:layout_width="fill_parent" android:layout_height="fill_parent"    tools:context=".activity.ActivitySplashScreen">
 
     <ImageView android:src="@drawable/droidex"
         android:layout_width="wrap_content"

diff --git a/res/layout/activity_webview.xml b/res/layout/activity_webview.xml
@@ -1,21 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <aloogle.pokedex.lib.AnimatedGifImageView
-        android:id="@+id/animatedGifImageView"
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+<FrameLayout
+        android:id="@+id/main_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+    <aloogle.pokedex.lib.AnimatedGifImageView
+        android:id="@+id/animatedGifImageView"
         android:layout_height="70dp"
         android:layout_width="70dp"
         android:layout_marginTop="50sp"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true" />
 
    <WebView
         android:id="@+id/webview01"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent">
-   </WebView>
-
+   </WebView>
+
+    </FrameLayout>
+
+    <FrameLayout 
+        android:id="@+id/target_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">        
+    </FrameLayout>
 </RelativeLayout>

diff --git a/res/layout/pokemon_left_info.xml b/res/layout/pokemon_left_info.xml
@@ -228,7 +228,7 @@
         android:columnCount="2">
 
         <TextView
-            android:text="Version"
+            android:text="@string/data_version"
             style="@style/left_column"
             android:background="@drawable/bg_line"/>
 
@@ -239,7 +239,7 @@
             android:spinnerMode="dialog"/>
 
         <TextView
-            android:text="Method"
+            android:text="@string/data_method"
             style="@style/left_column"
             android:background="@drawable/bg_line"/>
 
@@ -251,7 +251,7 @@
 
         <TextView
             android:id="@+id/txtLocation"
-            android:text="List of location"
+            android:text="@string/data_list_location"
             style="@style/left_column"
             android:paddingRight="5dp"
             android:gravity="center"
@@ -300,7 +300,7 @@
         android:columnCount="2">
 
         <TextView
-            android:text="Version Group"
+            android:text="@string/data_version_group"
             style="@style/left_column"
             android:background="@drawable/bg_line"/>
 
@@ -311,7 +311,7 @@
             android:spinnerMode="dialog"/>
 
         <TextView
-            android:text="Method"
+            android:text="@string/data_method"
             style="@style/left_column"
             android:background="@drawable/bg_line"/>
 
@@ -323,7 +323,7 @@
 
         <TextView
             android:id="@+id/txtMove"
-            android:text="List of move"
+            android:text="@string/data_list_move"
             style="@style/left_column"
             android:paddingRight="5dp"
             android:gravity="center"

diff --git a/res/layout/pokemon_list_data.xml b/res/layout/pokemon_list_data.xml
@@ -15,7 +15,7 @@
         android:id="@+id/txtReturn"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="← return to Pokémon's data"
+        android:text="@string/data_return"
         android:textSize="12sp"
         android:paddingBottom="5dp"
         android:paddingTop="5dp"

diff --git a/res/layout/widget_shortcut.xml b/res/layout/widget_shortcut.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:orientation="vertical" >
 
     <ImageView
-        android:id="@+id/imageView1"
-        android:layout_width="69dp"
-        android:layout_height="69dp"
+        android:id="@+id/imageWidget1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:src="@drawable/ic_launcher" />
 
 </LinearLayout>
diff --git a/res/layout/widget_shortcut_configure.xml b/res/layout/widget_shortcut_configure.xml
@@ -39,6 +39,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/textView1"
-        android:text="@string/widgetshortcutbeta" />
+        android:text="@string/widgetshortcutinforesize" />
 
 </RelativeLayout>