refactoring

DavidBertet · Dec 9, 2019 · 286b6c5 · 286b6c5
1 parent 4f0e59f
commit 286b6c5
Show file tree

Hide file tree

Showing 13 changed files with 313 additions and 212 deletions.
diff --git a/cirru/classes.cirru b/cirru/classes.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -59,8 +59,6 @@ html
           = Collections
       li
         a
-          :class
-            = selected
           :href
             = concurrency.html
           = Concurrency

diff --git a/cirru/collections.cirru b/cirru/collections.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -78,26 +78,26 @@ html
             = spring-framework.html
           = Spring Framework
 
-      .section
-        .title BASICS
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/01.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/01.kt)
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/02.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/02.kt)
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/03.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/03.kt)
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/04.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/04.kt)
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/05.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/05.kt
-        .case (.name "For") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/06.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/06.kt)
-        .case (.name "For") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/07.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/07.kt)
+    .section
+      .title BASICS
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/01.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/01.kt)
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/02.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/02.kt)
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/03.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/03.kt)
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/04.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/04.kt)
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/05.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/05.kt
+      .case (.name "For") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/06.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/06.kt)
+      .case (.name "For") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/07.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/07.kt)
diff --git a/cirru/concurrency.cirru b/cirru/concurrency.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -78,14 +78,14 @@ html
             = spring-framework.html
           = Spring Framework
 
-      .section  
-        .title BASICS
-        .case (.name "I") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/01.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/01.kt)
-        .case (.name "II") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/02.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/02.kt)
-        .case (.name "III") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/03.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/03.kt)
+    .section
+      .title BASICS
+      .case (.name "I") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/01.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/01.kt)
+      .case (.name "II") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/02.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/02.kt)
+      .case (.name "III") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/03.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/03.kt)
diff --git a/cirru/delegated-properties.cirru b/cirru/delegated-properties.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -62,7 +62,7 @@ html
           = Concurrency
       li
         a
-          :class
+         :class
             = selected
           :href
             = delegated-properties.html
@@ -78,14 +78,14 @@ html
             = spring-framework.html
           = Spring Framework
 
-      .section  
-        .title BASICS
-        .case (.name "Lazy evaluation") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/lazy.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/lazy.kt)
-        .case (.name "Map to object") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/map.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/map.kt)
-        .case (.name "Observable") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/observable.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/observable.kt)
+    .section
+      .title BASICS
+      .case (.name "Lazy evaluation") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/lazy.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/lazy.kt)
+      .case (.name "Map to object") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/map.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/map.kt)
+      .case (.name "Observable") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/observable.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/observable.kt)
diff --git a/cirru/dsl.cirru b/cirru/dsl.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -67,7 +67,7 @@ html
           = Delegated properties
       li
         a
-         :class
+          :class
             = selected
           :href
             = dsl.html
@@ -86,13 +86,13 @@ html
       .case (.name "II") $ .pair
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/dsl/02.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/dsl/02.kt)
-      .case (.name "II") $ .pair
+      .case (.name "III") $ .pair
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/dsl/03.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/dsl/03.kt)
-      .case (.name "II") $ .pair
+      .case (.name "IV") $ .pair
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/dsl/04.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/dsl/04.kt)
-      .case (.name "II") $ .pair
+      .case (.name "V") $ .pair
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/dsl/05.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/dsl/05.kt)
 

diff --git a/cirru/functions.cirru b/cirru/functions.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -60,13 +60,13 @@ html
       li
         a
           :href
-            = delegated-properties.html
-          = Delegated properties
+            = concurrency.html
+          = Concurrency
       li
         a
           :href
-            = concurrency.html
-          = Concurrency
+            = delegated-properties.html
+          = Delegated properties
       li
         a
           :href

diff --git a/cirru/index.cirru b/cirru/index.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -42,6 +42,11 @@ html
           :href
             = functions.html
           = Functions
+      li
+        a
+          :href
+            = scoping-functions.html
+          = Scoping functions
       li
         a
           :href
@@ -62,11 +67,6 @@ html
           :href
             = delegated-properties.html
           = Delegated properties
-      li
-        a
-          :href
-            = scoping-functions.html
-          = Scoping functions
       li
         a
           :href
@@ -112,24 +112,20 @@ html
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/ternary-operator.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/ternary-operator.kt)
 
-    .section
-      .title BASICS
-      .case (.name "Bits Operations") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/bits-operations.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/bits-operations.kt)
-      .case (.name "Is As In") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/operations.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/operations.kt)
-      .case (.name "Smart Cast") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/cast.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/cast.kt)
-      .case (.name "Switch / When") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/switch.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/when.kt)
-      .case (.name "Default parameters") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/default-parameters.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/default-parameters.kt)
-      .case (.name "Reading a file") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/read-file.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/read-file.kt)
+    footer
+      div
+        :class
+          = center
+        p
+          = Created by:
+          a
+            :href
+              = https://www.driver733.com
+            = " @driver733"
+        p
+          = Based on:
+          a
+            :href
+              = https://github.com/fabiomsr/from-java-to-kotlin
+            = " fabiomsr/from-java-to-kotlin"
 
diff --git a/cirru/scoping-functions.cirru b/cirru/scoping-functions.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -60,13 +60,13 @@ html
       li
         a
           :href
-            = delegated-properties.html
-          = Delegated properties
+            = concurrency.html
+          = Concurrency
       li
         a
           :href
-            = concurrency.html
-          = Concurrency
+            = delegated-properties.html
+          = Delegated properties
       li
         a
           :href