Add new implementation of base Screen (#22)

* Add new implementation of base Screen

* Add javadoc to ScreenPlatform annotation

* Rename annotation ScreenPlatform to ScreenType

Author: paveliam

src/main/java/aquality/appium/mobile/application/AqualityServices.java

@@ -5,7 +5,6 @@
 import aquality.appium.mobile.configuration.ILocalServiceSettings;
 import aquality.appium.mobile.elements.interfaces.IElementFactory;
 import aquality.appium.mobile.screens.screenfactory.IScreenFactory;
-import aquality.appium.mobile.screens.screenfactory.IScreenFactoryProvider;
 import aquality.selenium.core.localization.ILocalizedLogger;
 import aquality.selenium.core.logging.Logger;
 import aquality.selenium.core.waitings.IConditionalWait;
@@ -162,7 +161,7 @@ public static IElementFactory getElementFactory() {
      * @return Factory of screens.
      */
     public static IScreenFactory getScreenFactory() {
-        return get(IScreenFactoryProvider.class).getScreenFactory();
+        return get(IScreenFactory.class);
     }
 
     /**

src/main/java/aquality/appium/mobile/application/MobileModule.java

@@ -6,7 +6,7 @@
 import aquality.appium.mobile.configuration.ILocalServiceSettings;
 import aquality.appium.mobile.elements.IElementsModule;
 import aquality.appium.mobile.elements.interfaces.IElementFactory;
-import aquality.appium.mobile.screens.screenfactory.IScreenFactoryProvider;
+import aquality.appium.mobile.screens.screenfactory.IScreenFactory;
 import aquality.appium.mobile.screens.screenfactory.IScreensModule;
 import aquality.selenium.core.applications.AqualityModule;
 import com.google.inject.Provider;
@@ -25,6 +25,6 @@ protected void configure() {
         bind(ILocalServiceSettings.class).to(getLocalServiceSettingsImplementation()).in(Singleton.class);
         bind(IConfiguration.class).to(getConfigurationImplementation());
         bind(IElementFactory.class).to(getElementFactoryImplementation());
-        bind(IScreenFactoryProvider.class).to(getScreenFactoryProviderImplementation());
+        bind(IScreenFactory.class).to(getScreenFactoryImplementation());
     }
 }

src/main/java/aquality/appium/mobile/elements/ElementType.java

@@ -11,12 +11,13 @@ public enum ElementType {
     RADIOBUTTON(IRadioButton.class),
     TEXTBOX(ITextBox.class);
 
-    private Class<? extends IElement> clazz;
+    private final Class<? extends IElement> clazz;
 
     <T extends IElement> ElementType(Class<T> clazz){
         this.clazz = clazz;
     }
 
+    @SuppressWarnings("unchecked")
     public <T extends IElement> Class<T> getClazz() {
         return (Class<T>) clazz;
     }

src/main/java/aquality/appium/mobile/screens/AndroidScreen.java

@@ -1,16 +1,13 @@
 package aquality.appium.mobile.screens;
 
 import aquality.appium.mobile.application.AqualityServices;
-import aquality.appium.mobile.application.PlatformName;
 import aquality.appium.mobile.elements.interfaces.IElementFactory;
 import aquality.appium.mobile.elements.interfaces.ILabel;
 import aquality.selenium.core.elements.interfaces.IElementStateProvider;
-import io.appium.java_client.AppiumDriver;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
-import org.openqa.selenium.InvalidArgumentException;
 
-public abstract class Screen<T extends AppiumDriver> implements IScreen {
+public abstract class Screen implements IScreen {
 
     private final By locator;
     private final String name;
@@ -25,27 +22,6 @@ protected Screen(By locator, String name) {
         this.screenLabel = getElementFactory().getLabel(locator, name);
     }
 
-    protected IElementFactory getElementFactory(){
-        return AqualityServices.getElementFactory();
-    }
-
-    @SuppressWarnings("unchecked")
-    protected T getDriver() {
-        ensureApplicationPlatformCorrect(getPlatform());
-        return (T) AqualityServices.getApplication().getDriver();
-    }
-
-    protected abstract PlatformName getPlatform();
-
-    private void ensureApplicationPlatformCorrect(PlatformName targetPlatform) {
-        PlatformName currentPlatform = AqualityServices.getApplication().getPlatformName();
-        if (targetPlatform != currentPlatform) {
-            throw new InvalidArgumentException(String.format(
-                    "Cannot perform this operation. Current platform %s don't match to target %s",
-                    currentPlatform, targetPlatform));
-        }
-    }
-
     public By getLocator() {
         return locator;
     }
@@ -61,4 +37,8 @@ public Dimension getSize() {
     public IElementStateProvider state() {
         return screenLabel.state();
     }
+
+    protected IElementFactory getElementFactory(){
+        return AqualityServices.getElementFactory();
+    }
 }

src/main/java/aquality/appium/mobile/screens/IOSScreen.java

@@ -6,9 +6,9 @@
 public interface IScreensModule {
 
     /**
-     * @return class which implements {@link IScreenFactoryProvider}
+     * @return class which implements {@link IScreenFactory}
      */
-    default Class<? extends IScreenFactoryProvider> getScreenFactoryProviderImplementation() {
-        return ScreenFactoryProvider.class;
+    default Class<? extends IScreenFactory> getScreenFactoryImplementation() {
+        return ScreenFactory.class;
     }
 }