created lib from condition watcher

Author: FisherKK

.idea/gradle.xml

@@ -0,0 +1 @@
+/build

.idea/modules.xml

@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+}

.idea/vcs.xml

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/froger_mcs/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

conditionwatcher/.gitignore

@@ -0,0 +1,13 @@
+package com.azimolabs.conditionwatcher;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}

conditionwatcher/build.gradle

@@ -0,0 +1,3 @@
+<manifest package="com.azimolabs.conditionwatcher">
+
+</manifest>

conditionwatcher/proguard-rules.pro

@@ -1,4 +1,4 @@
-package com.azimolabs.f1sherkk.conditionwatcherexample.conditionWatcher;
+package com.azimolabs.conditionwatcher;
 
 /**
  * Created by F1sherKK on 08/10/15.
@@ -31,21 +31,19 @@ public static ConditionWatcher getInstance() {
     public static void waitForCondition(Instruction instruction) throws Exception {
         int status = CONDITION_NOT_MET;
         int elapsedTime = 0;
-        boolean isConditionMet;
 
         do {
-            isConditionMet = instruction.checkCondition();
-            if (isConditionMet) {
+            if (instruction.checkCondition()) {
                 status = CONDITION_MET;
+            } else {
+                elapsedTime += getInstance().watchInterval;
+                Thread.sleep(getInstance().watchInterval);
             }
 
-            elapsedTime += getInstance().watchInterval;
-            Thread.sleep(getInstance().watchInterval);
             if (elapsedTime == getInstance().timeoutLimit) {
                 status = TIMEOUT;
                 break;
             }
-
         } while (status != CONDITION_MET);
 
         if (status == TIMEOUT)

conditionwatcher/src/androidTest/java/com/azimolabs/conditionwatcher/ApplicationTest.java

@@ -1,4 +1,4 @@
-package com.azimolabs.f1sherkk.conditionwatcherexample.conditionWatcher;
+package com.azimolabs.conditionwatcher;
 
 import android.os.Bundle;
 

conditionwatcher/src/main/AndroidManifest.xml

@@ -0,0 +1,15 @@
+package com.azimolabs.conditionwatcher;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

app/src/androidTest/java/com/azimolabs/f1sherkk/conditionwatcherexample/conditionWatcher/ConditionWatcher.java conditionwatcher/src/main/java/com/azimolabs/conditionwatcher/ConditionWatcher.java

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.azimolabs.f1sherkk.conditionwatcherexample"
-        minSdkVersion 16
+        minSdkVersion 15
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
@@ -40,7 +40,5 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-v4'
     }
 
-    androidTestCompile "org.mockito:mockito-core:1.10.19"
-    androidTestCompile "com.google.dexmaker:dexmaker:1.2"
-    androidTestCompile "com.google.dexmaker:dexmaker-mockito:1.2"
+    androidTestCompile project(':conditionwatcher')
 }

app/src/androidTest/java/com/azimolabs/f1sherkk/conditionwatcherexample/conditionWatcher/Instruction.java conditionwatcher/src/main/java/com/azimolabs/conditionwatcher/Instruction.java

@@ -4,7 +4,7 @@
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.azimolabs.f1sherkk.conditionwatcherexample.conditionWatcher.ConditionWatcher;
+import com.azimolabs.conditionwatcher.ConditionWatcher;
 import com.azimolabs.f1sherkk.conditionwatcherexample.data.Server;
 import com.azimolabs.f1sherkk.conditionwatcherexample.instruction.BtnStartAnimationInstruction;
 import com.azimolabs.f1sherkk.conditionwatcherexample.instruction.LoadingDialogInstruction;

conditionwatcher/src/test/java/com/azimolabs/conditionwatcher/ExampleUnitTest.java

@@ -4,8 +4,8 @@
 import android.support.test.InstrumentationRegistry;
 import android.widget.Button;
 
+import com.azimolabs.conditionwatcher.Instruction;
 import com.azimolabs.f1sherkk.conditionwatcherexample.R;
-import com.azimolabs.f1sherkk.conditionwatcherexample.conditionWatcher.Instruction;
 import com.azimolabs.f1sherkk.conditionwatcherexample.utils.TestApplication;
 
 /**

app/.gitignore sample/.gitignore

@@ -4,7 +4,7 @@
 import android.app.DialogFragment;
 import android.support.test.InstrumentationRegistry;
 
-import com.azimolabs.f1sherkk.conditionwatcherexample.conditionWatcher.Instruction;
+import com.azimolabs.conditionwatcher.Instruction;
 import com.azimolabs.f1sherkk.conditionwatcherexample.ui.dialog.LoadingDialog;
 import com.azimolabs.f1sherkk.conditionwatcherexample.utils.TestApplication;
 

app/build.gradle sample/build.gradle

@@ -4,8 +4,8 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.v4.widget.SwipeRefreshLayout;
 
+import com.azimolabs.conditionwatcher.Instruction;
 import com.azimolabs.f1sherkk.conditionwatcherexample.R;
-import com.azimolabs.f1sherkk.conditionwatcherexample.conditionWatcher.Instruction;
 import com.azimolabs.f1sherkk.conditionwatcherexample.utils.TestApplication;
 
 /**

app/proguard-rules.pro sample/proguard-rules.pro

@@ -1 +1 @@
-include ':app'
+include ':sample', 'conditionwatcher'