Added load screen. Jobs persisted for requirement #6

Javinator9889 · Mar 5, 2018 · 171d725 · 171d725
1 parent cadc982
commit 171d725
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 6 deletions.
diff --git a/app/debug/app-debug.apk b/app/debug/app-debug.apk
diff --git a/app/debug/output.json b/app/debug/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":36},"path":"app-debug.apk","properties":{"packageId":"javinator9889.bitcoinpools","split":"","minSdkVersion":"21"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40},"path":"app-debug.apk","properties":{"packageId":"javinator9889.bitcoinpools","split":"","minSdkVersion":"21"}}]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,8 @@
         <activity
             android:name=".DataLoaderScreen"
             android:configChanges="orientation"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/javinator9889/bitcoinpools/DataLoaderScreen.java b/app/src/main/java/javinator9889/bitcoinpools/DataLoaderScreen.java
@@ -36,6 +36,7 @@
 
 public class DataLoaderScreen extends AppCompatActivity {
     public static MaterialDialog progressDialog = null;
+    public static AppCompatActivity dataLoaderScreenActivity;
 
     private float mpu;
     private HashMap<String, Float> retrievedData;
@@ -45,6 +46,7 @@ public class DataLoaderScreen extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        dataLoaderScreenActivity = this;
         if (BitCoinApp.isOnline()) {
             Log.d(Constants.LOG.MATAG, Constants.LOG.CREATING_MAINVIEW);
             setContentView(R.layout.activity_loading);
@@ -58,6 +60,20 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             progressDialog.show();
             new DataLoader().execute();
             //new MainActivity.DataLoader().execute();
+        } else {
+            new MaterialDialog.Builder(this)
+                    .title(R.string.noConnectionTitle)
+                    .content(R.string.noConnectionDesc)
+                    .cancelable(false)
+                    .positiveText(R.string.accept)
+                    .onPositive(new MaterialDialog.SingleButtonCallback() {
+                        @Override
+                        public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                            onBackPressed();
+                        }
+                    })
+                    .build()
+                    .show();
         }
     }
 
@@ -88,7 +104,7 @@ protected void onPostExecute(Boolean result) {
                 activityMainIntent.putExtra("CARDS", cardsData);
                 activityMainIntent.putExtra("BTCPRICE", btcPrice);
                 startActivity(activityMainIntent);
-                DataLoaderScreen.this.finish();
+                //DataLoaderScreen.this.finish();
             } else {
                 Log.i("DLS", "Data non-loaded...");
                 if (progressDialog != null) {

diff --git a/app/src/main/java/javinator9889/bitcoinpools/FragmentViews/Tab1PoolsChart.java b/app/src/main/java/javinator9889/bitcoinpools/FragmentViews/Tab1PoolsChart.java
@@ -1,5 +1,6 @@
 package javinator9889.bitcoinpools.FragmentViews;
 
+import android.content.Context;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;

diff --git a/app/src/main/java/javinator9889/bitcoinpools/MainActivity.java b/app/src/main/java/javinator9889/bitcoinpools/MainActivity.java
@@ -156,7 +156,9 @@ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which)
     protected void onResume() {
         super.onResume();
         //DataLoaderScreen.progressDialog.setProgress(DataLoaderScreen.progressDialog.getCurrentProgress() + 5);
-        DataLoaderScreen.progressDialog.dismiss();
+        //DataLoaderScreen.progressDialog.dismiss();
+        Toast.makeText(this, "Hi, the activity is fully loaded", Toast.LENGTH_LONG).show();
+        DataLoaderScreen.dataLoaderScreenActivity.finish();
     }
 
 

diff --git a/app/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml
@@ -0,0 +1,11 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <!-- The background color, preferably the same as your normal theme -->
+    <!--<item android:drawable="@android:color/white"/>-->
+    <item android:drawable="@color/colorPrimaryDark"/>
+    <!-- Your product logo - 144dp color version of your app icon -->
+    <item>
+        <bitmap
+            android:src="@drawable/ic_launcher_foreground"
+            android:gravity="center"/>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -36,8 +36,9 @@
         <item name="android:textColor">#FAFAFA</item>
     </style>
 
-    <style name="MyMaterialTheme" parent="MyMaterialTheme.Base">
-
+    <style name="AppTheme.Launcher" parent="CustomTheme">
+        <item name="android:windowBackground">@drawable/launch_screen</item>
+<!--        <item name="colorBackground">@color/colorPrimaryDark</item>-->
     </style>
 
     <style name="MyMaterialTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">