Merge pull request #88 from icerockdev/develop

Release 0.1.0 dev 11
icerockdev · Feb 11, 2020 · 5ad5080 · 5ad5080
2 parents f837600 + b4a0cb2
commit 5ad5080
Show file tree

Hide file tree

Showing 52 changed files with 1,874 additions and 273 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This is a Kotlin MultiPlatform library that provides declarative UI and applicat
  in common code. You can implement full application for Android and iOS only from common code with it.  
 
 ## Current status
-Current version - `0.1.0-dev-10`. Dev version is not tested in production tasks yet, API can be changed and
+Current version - `0.1.0-dev-11`. Dev version is not tested in production tasks yet, API can be changed and
  bugs may be found. But dev version is chance to test limits of API and concepts to feedback and improve lib.
  We open for any feedback and ideas (go to issues or #moko at [kotlinlang.slack.com](https://kotlinlang.slack.com))!
 
@@ -217,6 +217,7 @@ val loginScreen = Theme(baseTheme) {
   - 0.1.0-dev-8
   - 0.1.0-dev-9
   - 0.1.0-dev-10
+  - 0.1.0-dev-11
 
 ## Installation
 root build.gradle  
@@ -231,7 +232,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:widgets:0.1.0-dev-10")
+    commonMainApi("dev.icerock.moko:widgets:0.1.0-dev-11")
 }
 ```
 
@@ -249,7 +250,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko.widgets:gradle-plugin:0.1.0-dev-10"
+        classpath "dev.icerock.moko.widgets:gradle-plugin:0.1.0-dev-11"
     }
 }
 

diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -39,6 +39,9 @@ object Deps {
             val glide = AndroidLibrary(
                 name = "com.github.bumptech.glide:glide:${Versions.Libs.Android.glide}"
             )
+            val roundedImageView = AndroidLibrary(
+                name = "com.makeramen:roundedimageview:${Versions.Libs.Android.roundedImageView}"
+            )
         }
 
         object MultiPlatform {

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -10,8 +10,8 @@ object Versions {
     }
 
     const val kotlin = "1.3.61"
-    private const val mokoWidgets = "0.1.0-dev-10"
-    private const val mokoResources = "0.7.0"
+    private const val mokoWidgets = "0.1.0-dev-11"
+    private const val mokoResources = "0.8.0"
 
     object Plugins {
         const val mokoWidgets = Versions.mokoWidgets
@@ -22,12 +22,13 @@ object Versions {
         object Android {
             const val appCompat = "1.1.0"
             const val swipeRefreshLayout = "1.0.0"
-            const val material = "1.0.0"
+            const val material = "1.1.0"
             const val constraintLayout = "1.1.3"
             const val lifecycle = "2.0.0"
             const val recyclerView = "1.0.0"
             const val inputMask = "5.0.0"
             const val glide = "4.10.0"
+            const val roundedImageView = "2.3.0"
         }
 
         object MultiPlatform {

diff --git a/sample/android-app/src/main/java/com/icerockdev/MainApplication.kt b/sample/android-app/src/main/java/com/icerockdev/MainApplication.kt
@@ -12,9 +12,7 @@ class MainApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        mppApp = App().apply {
-            setup()
-        }
+        mppApp = App().apply { initialize() }
     }
 
     companion object {

diff --git a/sample/ios-app/Podfile.lock b/sample/ios-app/Podfile.lock
@@ -61,6 +61,6 @@ SPEC CHECKSUMS:
   MultiPlatformLibraryMvvm: 999ac3896d8214fd65e0e0a376a2e553bf4515b3
   SkyFloatingLabelTextField: 4b46db0ab1ccde0919cded29c656e6b4805eda04
 
-PODFILE CHECKSUM: 28883f836bd0d431cc3d548bcfba9f7b496c17f6
+PODFILE CHECKSUM: b2d99b49a98817d6b9e5a4dd2b7596b74ced0389
 
-COCOAPODS: 1.8.3
+COCOAPODS: 1.8.4
diff --git a/sample/ios-app/src/AppDelegate.swift b/sample/ios-app/src/AppDelegate.swift
@@ -13,7 +13,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
 
         let app = App()
-        app.setup()
+        app.initialize()
 
         let screen = app.rootScreen.instantiate()
         let rootViewController = screen.createViewController()

diff --git a/sample/mpp-library/src/commonMain/kotlin/App.kt b/sample/mpp-library/src/commonMain/kotlin/App.kt
@@ -6,6 +6,7 @@ import com.icerockdev.library.AppTheme
 import com.icerockdev.library.MR
 import com.icerockdev.library.SharedFactory
 import com.icerockdev.library.universal.CartScreen
+import com.icerockdev.library.universal.InfoWebViewScreen
 import com.icerockdev.library.universal.LoginScreen
 import com.icerockdev.library.universal.LoginViewModel
 import com.icerockdev.library.universal.PlatformProfileScreen
@@ -18,11 +19,15 @@ import dev.icerock.moko.parcelize.Parcelable
 import dev.icerock.moko.parcelize.Parcelize
 import dev.icerock.moko.resources.desc.desc
 import dev.icerock.moko.widgets.ButtonWidget
+import dev.icerock.moko.widgets.ImageWidget
 import dev.icerock.moko.widgets.InputWidget
 import dev.icerock.moko.widgets.button
 import dev.icerock.moko.widgets.container
 import dev.icerock.moko.widgets.core.Theme
 import dev.icerock.moko.widgets.core.Value
+import dev.icerock.moko.widgets.factory.ButtonWithIconViewFactory
+import dev.icerock.moko.widgets.factory.IconGravity
+import dev.icerock.moko.widgets.factory.SystemImageViewFactory
 import dev.icerock.moko.widgets.factory.SystemInputViewFactory
 import dev.icerock.moko.widgets.flat.FlatInputViewFactory
 import dev.icerock.moko.widgets.screen.Args
@@ -36,10 +41,16 @@ import dev.icerock.moko.widgets.screen.navigation.NavigationBar
 import dev.icerock.moko.widgets.screen.navigation.NavigationItem
 import dev.icerock.moko.widgets.screen.navigation.NavigationScreen
 import dev.icerock.moko.widgets.screen.navigation.Resultable
+import dev.icerock.moko.widgets.screen.navigation.SelectStates
 import dev.icerock.moko.widgets.screen.navigation.createPushResultRoute
 import dev.icerock.moko.widgets.screen.navigation.createPushRoute
 import dev.icerock.moko.widgets.screen.navigation.createReplaceRoute
 import dev.icerock.moko.widgets.screen.navigation.createRouter
+import dev.icerock.moko.widgets.style.background.Background
+import dev.icerock.moko.widgets.style.background.Fill
+import dev.icerock.moko.widgets.style.background.StateBackground
+import dev.icerock.moko.widgets.style.view.CornerRadiusValue
+import dev.icerock.moko.widgets.style.view.PaddingValues
 import dev.icerock.moko.widgets.style.view.TextStyle
 import dev.icerock.moko.widgets.style.view.WidgetSize
 
@@ -57,6 +68,20 @@ class App() : BaseApplication() {
                 ),
                 backgroundColor = Color(0xF5F5F5FF)
             )
+            factory[LoginScreen.Id.RegistrationButtonId] = ButtonWithIconViewFactory(
+                icon = MR.images.stars_black_18,
+                iconGravity = IconGravity.TEXT_END,
+                iconPadding = 8.0f,
+                padding = PaddingValues(padding = 16f),
+                background = StateBackground(
+                    normal = Background(fill = Fill.Solid(color = Color(0xAAFFFFFF))),
+                    pressed = Background(fill = Fill.Solid(color = Color(0x88FFFFFF))),
+                    disabled = Background(fill = Fill.Solid(color = Color(0x55FFFFFF)))
+                )
+            )
+            factory[ImageWidget.DefaultCategory] = SystemImageViewFactory(
+                cornerRadiusValue = CornerRadiusValue(16.0f)
+            )
         }
 
         val widgetsTheme = Theme(theme) {
@@ -119,7 +144,8 @@ class App() : BaseApplication() {
                 tab(
                     id = 1,
                     title = "Products".desc(),
-                    icon = MR.images.home_black_18,
+                    selectedIcon = MR.images.cart_black_18,
+                    unselectedIcon = MR.images.home_black_18,
                     screenDesc = productsNavigation
                 )
                 tab(
@@ -137,18 +163,27 @@ class App() : BaseApplication() {
             }
         }
 
-        return registerScreen(NavigationScreen::class) {
+        return registerScreen(RootNavigationScreen::class) {
             val router = createRouter()
 
             val regScreen = registerScreen(RegisterScreen::class) {
                 RegisterScreen(theme)
             }
 
+            val oauthScreen = registerScreen(InfoWebViewScreen::class) {
+                InfoWebViewScreen(
+                    theme = loginTheme
+                )
+            }
+
             val loginScreen = registerScreen(LoginScreen::class) {
                 LoginScreen(
                     theme = loginTheme,
                     mainRoute = router.createReplaceRoute(mainScreen),
-                    registerRoute = router.createPushResultRoute(regScreen) { it.token }
+                    registerRoute = router.createPushResultRoute(regScreen) { it.token },
+                    infoWebViewRoute = router.createPushRoute(oauthScreen) {
+                        InfoWebViewScreen.WebViewArgs(it)
+                    }
                 ) { LoginViewModel(it) }
             }
 
@@ -190,6 +225,15 @@ class MainBottomNavigationScreen(
     builder: BottomNavigationItem.Builder.() -> Unit
 ) : BottomNavigationScreen(router, builder), NavigationItem {
     override val navigationBar: NavigationBar = NavigationBar.None
+
+    init {
+        bottomNavigationColor = Color(0x6518f4FF)
+
+        itemStateColors = SelectStates(
+            selected = Color(0xfdfffdFF),
+            unselected = Color(0xc0a3f9FF)
+        )
+    }
 }
 
 class RootNavigationScreen(initialScreen: TypedScreenDesc<Args.Empty, LoginScreen>, router: Router) :

diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/universal/CartScreen.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/universal/CartScreen.kt
@@ -33,7 +33,7 @@ class CartScreen(
                         size = WidgetSize.WrapContent,
                         content = ButtonWidget.Content.Text(Value.data("profile".desc()))
                     ) {
-                        profileRoute.route(this@CartScreen, 10)
+                        profileRoute.route(10)
                     }
                 }
             }

diff --git a/...e/mpp-library/src/commonMain/kotlin/com/icerockdev/library/universal/InfoWebViewScreen.kt b/...e/mpp-library/src/commonMain/kotlin/com/icerockdev/library/universal/InfoWebViewScreen.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package com.icerockdev.library.universal
+
+import dev.icerock.moko.mvvm.livedata.MutableLiveData
+import dev.icerock.moko.parcelize.Parcelable
+import dev.icerock.moko.parcelize.Parcelize
+import dev.icerock.moko.resources.desc.desc
+import dev.icerock.moko.widgets.constraint
+import dev.icerock.moko.widgets.core.Theme
+import dev.icerock.moko.widgets.core.Widget
+import dev.icerock.moko.widgets.progressBar
+import dev.icerock.moko.widgets.screen.Args
+import dev.icerock.moko.widgets.screen.WidgetScreen
+import dev.icerock.moko.widgets.screen.getArgument
+import dev.icerock.moko.widgets.screen.navigation.NavigationBar
+import dev.icerock.moko.widgets.screen.navigation.NavigationItem
+import dev.icerock.moko.widgets.style.view.SizeSpec
+import dev.icerock.moko.widgets.style.view.WidgetSize
+import dev.icerock.moko.widgets.visibility
+import dev.icerock.moko.widgets.webView
+
+class InfoWebViewScreen(
+    private val theme: Theme
+) : WidgetScreen<Args.Parcel<InfoWebViewScreen.WebViewArgs>>(), NavigationItem {
+
+    override val navigationBar: NavigationBar = NavigationBar.Normal("WebView Sample".desc())
+
+    override fun createContentWidget(): Widget<WidgetSize.Const<SizeSpec.AsParent, SizeSpec.AsParent>> {
+        val inputArgs = getArgument()
+
+        val isWebViewPageLoading = MutableLiveData(false)
+
+        return with(theme) {
+            constraint(
+                size = WidgetSize.AsParent
+            ) {
+                val webViewConstraintItem = +webView(
+                    size = WidgetSize.AsParent,
+                    isJavaScriptEnabled = true,
+                    targetUrl = inputArgs.targetUrl,
+                    isWebPageLoading = isWebViewPageLoading
+                )
+
+                val progressVisibilityConstraintItem = +visibility(
+                    child = progressBar(
+                        size = WidgetSize.WrapContent
+                    ),
+                    showed = isWebViewPageLoading
+                )
+
+                constraints {
+                    webViewConstraintItem leftRightToLeftRight root
+                    webViewConstraintItem topToTop root.safeArea
+
+                    progressVisibilityConstraintItem topToTop root
+                    progressVisibilityConstraintItem centerXToCenterX root
+                }
+            }
+        }
+    }
+
+    @Parcelize
+    data class WebViewArgs(
+        val targetUrl: String
+    ) : Parcelable
+
+}
diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/universal/LoginScreen.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/universal/LoginScreen.kt
@@ -4,7 +4,6 @@
 
 package com.icerockdev.library.universal
 
-import com.icerockdev.library.MR
 import dev.icerock.moko.fields.FormField
 import dev.icerock.moko.fields.liveBlock
 import dev.icerock.moko.mvvm.dispatcher.EventsDispatcher
@@ -41,6 +40,7 @@ class LoginScreen(
     private val theme: Theme,
     private val mainRoute: Route<Unit>,
     private val registerRoute: RouteWithResult<Unit, String>,
+    private val infoWebViewRoute: Route<String>,
     private val loginViewModelFactory: (EventsDispatcher<LoginViewModel.EventsListener>) -> LoginViewModel
 ) : WidgetScreen<Args.Empty>(), NavigationItem, LoginViewModel.EventsListener {
 
@@ -61,8 +61,8 @@ class LoginScreen(
 
         constraint(size = WidgetSize.AsParent) {
             val logoImage = +image(
-                size = WidgetSize.Const(SizeSpec.WrapContent, SizeSpec.WrapContent),
-                image = const(Image.resource(MR.images.logo)),
+                size = WidgetSize.AspectByWidth(width = SizeSpec.Exact(300f), aspectRatio = 1.49f),
+                image = const(Image.network("https://html5box.com/html5lightbox/images/mountain.jpg")),
                 scaleType = ImageWidget.ScaleType.FIT
             )
 
@@ -84,10 +84,15 @@ class LoginScreen(
                 content = ButtonWidget.Content.Text(Value.data("Login".desc())),
                 onTap = viewModel::onLoginPressed
             )
+            val showInfoButton = +button(
+                size = WidgetSize.Const(SizeSpec.AsParent, SizeSpec.Exact(50f)),
+                content = ButtonWidget.Content.Text(Value.data("Show info".desc())),
+                onTap = viewModel::onShowInfoPressed
+            )
 
             val registerButton = +button(
                 id = Id.RegistrationButtonId,
-                size = WidgetSize.Const(SizeSpec.WrapContent, SizeSpec.Exact(40f)),
+                size = WidgetSize.Const(SizeSpec.Exact(300f), SizeSpec.WrapContent),
                 content = ButtonWidget.Content.Text(Value.data("Registration".desc())),
                 onTap = viewModel::onRegistrationPressed
             )
@@ -107,7 +112,10 @@ class LoginScreen(
                 loginButton topToBottom passwordInput
                 loginButton leftRightToLeftRight root
 
-                registerButton topToBottom loginButton
+                showInfoButton topToBottom loginButton
+                showInfoButton leftRightToLeftRight root
+
+                registerButton topToBottom showInfoButton
                 registerButton rightToRight root
 
                 // logo image height must be automatic ?
@@ -130,12 +138,17 @@ class LoginScreen(
     }
 
     override fun routeToMain() {
-        mainRoute.route(this)
+        mainRoute.route()
     }
 
     override fun routeToRegistration() {
         registerRoute.route(this, registerHandler)
     }
+
+    override fun routeToWebViewInfo() {
+        infoWebViewRoute.route("https://icerockdev.com/")
+    }
+
 }
 
 class LoginViewModel(
@@ -148,12 +161,17 @@ class LoginViewModel(
         eventsDispatcher.dispatchEvent { routeToMain() }
     }
 
+    fun onShowInfoPressed() {
+        eventsDispatcher.dispatchEvent { routeToWebViewInfo() }
+    }
+
     fun onRegistrationPressed() {
         eventsDispatcher.dispatchEvent { routeToRegistration() }
     }
 
     interface EventsListener {
         fun routeToMain()
         fun routeToRegistration()
+        fun routeToWebViewInfo()
     }
 }