Master

Contributing.md

@@ -1,11 +1,20 @@
 How to Contribute
 =================
 
-- You should add your name with a link to your website to the [Contributors.md](./Contributors.md).
+Start
+-----
+
+To start developing Flappy SVG, there is a variety of repeatable [tasks](tasks#tasks) for you and one time [Issues](https://github.com/fossasia/flappy-svg/issues) you can solve.
+
+Hints
+-----
+
+- You should add your name with a link to your website to the [credits.html](http://fossasia.github.io/flappy-svg/credits.html).
 - Have a look at the [implementation hints](./hints).
 - When you claim an issue, you need to comment. We can not let you do all the [easy](https://github.com/fossasia/flappy-svg/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3Aeasy+label%3Agci) issues because they are for people who first contribute to the project, unless we have a lot of them.
 - Create [new branches](http://www.git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging) for pull requests if you do several pull requests or issues at a time, so they can be reviewed independently.
 - If reasonable, each issue should have an own pull request.
 - You can add issues yourself if you want specific improvements of the game. We categorize them into `easy`, `middle` and `hard`.
-- When the issue is tagged as [GCI](https://github.com/fossasia/flappy-svg/labels/GCI), it is possible to solve google codein tasks with it. 
+- All works must be your own creation or you must give proper, license-dependent attribution to the creator. See the [LICENSE](LICENSE) file and [credits.html](http://fossasia.github.io/flappy-svg/credits.html) and the [Developer Certificate](http://developercertificate.org/).
+- This must work online and offline and without internet connection.
 - This all is possible to be discussed.

FlappySVG_Android/app/src/main/AndroidManifest.xml

@@ -4,36 +4,31 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:screenOrientation="portrait"
-            android:name=".Game"
-            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:name=".SplashScreen"
             android:label="@string/app_name"
-            android:theme="@style/FullscreenTheme" >
+            android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.EMBED" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:screenOrientation="portrait"
-            android:name=".SplashScreen"
-            android:label="@string/app_name">
+            android:name=".GameActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.EMBED" />
             </intent-filter>
         </activity>
     </application>
-
 </manifest>

FlappySVG_Android/app/src/main/java/fossasia/flappysvg/Game.java → FlappySVG_Android/app/src/main/java/fossasia/flappysvg/GameActivity.java

@@ -1,23 +1,20 @@
-/*
-This work is licensed under the Creative Commons Attribution-NonCommercial 4.0 International License.
-To view a copy of this license, visit
- http://creativecommons.org/licenses/by-nc/4.0/.
- */
-
 package fossasia.flappysvg;
 
-import android.app.Activity;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.Window;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Toast;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -28,7 +25,8 @@
 
 import fossasia.flappysvg.util.DecompressZip;
 
-public class Game extends Activity {
+public class GameActivity extends AppCompatActivity {
+
     private WebView myWebView;
 
     //URL of online game page.
@@ -40,44 +38,77 @@ public class Game extends Activity {
     //Name of the root folder inside the packaged game.
     private final String game_folder_name = "flappy-svg-gh-pages";
 
+    private String local_game_path;
+    private boolean isUpdating;
+
+    private ProgressDialog progress;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.activity_game);
+        setContentView(R.layout.game_activity);
 
         myWebView = (WebView) findViewById(R.id.webView);
         WebSettings webSettings = myWebView.getSettings();
 
-        myWebView.setWebViewClient(new WebViewClient());
         webSettings.setJavaScriptEnabled(true);
         webSettings.setAllowFileAccess(true);
 
+        myWebView.setWebViewClient(new WebViewClient());
+
         //Path where the game html page is saved(locally)
-        String local_game_path = "file:///" + getCacheFolder(this).getPath() + File.separator + game_folder_name + "/index.html";
+        local_game_path = getCacheFolder(this).getPath() + File.separator + game_folder_name + "/index.html";
+        LoadGame();
+    }
 
-        //Checking network connection. If there is connection, it downloads the game to use later locally.
-        if(isNetworkAvailable()){
-            myWebView.loadUrl(game_web_url);
-            new DownloadTask().execute(download_file_path);
-        }
-        else {
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_game, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    void LoadGame(){
+        if (isThereAPreviousVersion()) {
             Log.d("Loading Game", local_game_path);
-            myWebView.loadUrl(local_game_path);
+            myWebView.loadUrl("file:///" + local_game_path);
         }
+        else{
+            if(isNetworkAvailable()){
+                new DownloadTask().execute(download_file_path);
+            }
+            else
+                Toast.makeText(GameActivity.this, "Please, connect to internet to download the game", Toast.LENGTH_LONG).show();
 
+        }
     }
 
     private class DownloadTask extends AsyncTask<String,Void,Exception> {
+        boolean isFirstTime = !isThereAPreviousVersion();
+
         @Override
         protected void onPreExecute() {
-            //Put here, alert messages(on download starts)
+            if(isFirstTime) {
+                Toast.makeText(GameActivity.this, "Downloading game", Toast.LENGTH_LONG).show();
+            }
+
+            progress = new ProgressDialog(GameActivity.this);
+            progress.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+            progress.setIndeterminate(false);
+            progress.setProgress(0);
+
+            if(isUpdating) {
+                progress.setMessage("Updating game");
+            }
+            else
+                progress.setMessage("Downloading game");
+                progress.show();
+
         }
 
         @Override
         protected Exception doInBackground(String... params) {
             String url = params[0];
-
             try {
                 downloadAssets(url);
             } catch ( Exception e ) { return e; }
@@ -87,9 +118,24 @@ protected Exception doInBackground(String... params) {
 
         @Override
         protected void onPostExecute(Exception result) {
-            if ( result == null ) { return; }
-            // something went wrong, post a message to user - you could use a dialog here or whatever
-            //Toast.makeText(Game.this, result.getLocalizedMessage(), Toast.LENGTH_LONG).show();
+            if (progress.isShowing()) {
+                progress.dismiss();
+            }
+
+            if(isFirstTime){
+                if ( result == null )
+                    Toast.makeText(GameActivity.this, "Game downloaded", Toast.LENGTH_LONG).show();
+                else {
+                    Toast.makeText(GameActivity.this, "A problem occurs, connect to internet and use Update button", Toast.LENGTH_LONG).show();
+                }
+            }
+            if(result == null){
+                myWebView.loadUrl("file:///" + local_game_path);
+                if(isUpdating){
+                    Toast.makeText(GameActivity.this, "Game updated", Toast.LENGTH_LONG).show();
+                    isUpdating = false;
+                }
+            }
         }
     }
 
@@ -98,18 +144,20 @@ private void downloadAssets(String url) {
             URL gameURL = new URL(url);
             URLConnection connection = gameURL.openConnection();
             InputStream inputStream = new BufferedInputStream(gameURL.openStream(), 10240);
-            File cacheDir = getCacheFolder(Game.this);
+            File cacheDir = getCacheFolder(GameActivity.this);
             File cacheFile = new File(cacheDir, "game.zip");
             FileOutputStream outputStream = new FileOutputStream(cacheFile);
 
             byte buffer[] = new byte[1024];
+            int fileLength = connection.getContentLength();
             int dataSize;
             int loadedSize = 0;
             while ((dataSize = inputStream.read(buffer)) != -1) {
                 loadedSize += dataSize;
                 outputStream.write(buffer, 0, dataSize);
+                if(fileLength > 0)
+                    progress.setProgress(loadedSize * 100 / fileLength);
 
-                //Progress bar code here(use loaded size)
             }
 
             outputStream.close();
@@ -149,8 +197,33 @@ public File getCacheFolder(Context context) {
 
         return cacheDir;
     }
-}
 
+    boolean isThereAPreviousVersion(){
+        File file = new File(local_game_path);
+        return file.exists();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
 
+        if (id == R.id.update_button) {
+            if(!isNetworkAvailable()) {
+                Toast.makeText(GameActivity.this, "Could not update game", Toast.LENGTH_LONG).show();
+                return true;
+            }
 
+            Toast.makeText(GameActivity.this,"Updating game", Toast.LENGTH_SHORT).show();
+            isUpdating = true;
+            new DownloadTask().execute(download_file_path);
+            return true;
+        }
 
+        if (id == R.id.restart_button) {
+            LoadGame();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

FlappySVG_Android/app/src/main/java/fossasia/flappysvg/SplashScreen.java

@@ -22,7 +22,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void run() {
                 /* Create an Intent that will start the Menu-Activity. */
-                Intent mainIntent = new Intent(SplashScreen.this, Game.class);
+                Intent mainIntent = new Intent(SplashScreen.this, GameActivity.class);
                 SplashScreen.this.startActivity(mainIntent);
                 SplashScreen.this.finish();
             }

FlappySVG_Android/app/src/main/res/layout/game_activity.xml

@@ -0,0 +1,20 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="fossasia.flappysvg.GameActivity"
+    android:background="@android:color/background_dark"
+    android:theme="@style/AppTheme">
+
+    <WebView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/webView"
+        android:layout_gravity="right|top"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="false"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:background="@android:color/background_dark" />
+
+</RelativeLayout>

FlappySVG_Android/app/src/main/res/menu/menu_game.xml

@@ -0,0 +1,15 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="fossasia.flappysvg.GameActivity">
+
+    <item android:id="@+id/restart_button"
+        android:title="Restart"
+        android:orderInCategory="100"
+        app:showAsAction="ifRoom" />
+
+    <item android:id="@+id/update_button"
+        android:title="Update"
+        android:orderInCategory="100"
+        app:showAsAction="ifRoom" />
+</menu>

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

@@ -1,7 +1,3 @@
 <resources>
     <string name="app_name">Flappy-SVG</string>
-    <string name="title_activity_splash_screen">SplashScreen</string>
-
-    <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
 </resources>