moved re-frame app to root folder

Former-commit-id: 5a3b923

Author: michaelr524

.gitignore

@@ -25,7 +25,7 @@ project.xcworkspace
 # Android/IJ
 #
 .idea
-.gradle/
+.gradle
 local.properties
 
 # node.js
@@ -41,9 +41,4 @@ target/
 
 # Figwheel
 #
-figwheel_server.log
-.nrepl-port
-
-# Mercurial
-.hg/
-.hgignore
+figwheel_server.log

.re-natal

@@ -1,17 +1,21 @@
 {
-  "name": "Messenger",
-  "interface": "om-next",
-  "androidHost": "localhost",
+  "name": "SyngIm",
+  "interface": "reagent",
+  "androidHost": "10.0.3.2",
   "modules": [
     "react-native-contacts",
     "react-native-invertible-scroll-view",
     "awesome-phonenumber",
     "realm",
     "react-native-loading-spinner-overlay",
-    "react-native-i18n"
+    "react-native-i18n",
+    "realm/react-native",
+    "react-native-action-button",
+    "react-native-vector-icons/Ionicons",
+    "react-native-circle-checkbox",
+    "react-native-randombytes"
   ],
   "imageDirs": [
     "images"
-  ],
-  "iosHost": "localhost"
+  ]
 }

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. This change
 ### Changed
 - Add a new arity to `make-widget-async` to provide a different widget shape.
 
-## [0.1.1] - 2016-02-21
+## [0.1.1] - 2016-03-23
 ### Changed
 - Documentation on how to make the widgets.
 
@@ -15,10 +15,10 @@ All notable changes to this project will be documented in this file. This change
 ### Fixed
 - Fixed widget maker to keep working when daylight savings switches over.
 
-## 0.1.0 - 2016-02-21
+## 0.1.0 - 2016-03-23
 ### Added
 - Files from the new template.
 - Widget maker public API - `make-widget-sync`.
 
-[unreleased]: https://github.com/your-name/messenger/compare/0.1.1...HEAD
-[0.1.1]: https://github.com/your-name/messenger/compare/0.1.0...0.1.1
+[unreleased]: https://github.com/your-name/syng-im/compare/0.1.1...HEAD
+[0.1.1]: https://github.com/your-name/syng-im/compare/0.1.0...0.1.1

README.md

@@ -1,21 +1,14 @@
-# messenger
+# syng-im
 
-## Setup
+A Clojure library designed to ... well, that part is up to you.
 
-https://github.com/drapanjanas/re-natal
+## Usage
 
+FIXME
 
-Can be required after pulling changes:
+## License
 
-switching between android device
+Copyright © 2016 FIXME
 
-https://github.com/drapanjanas/re-natal#switching-between-android-devices
-
-
-Change `server-address` value at `/src/messenger/android/utils.cljs`
-
-## Issues
-
-`Requiring unknown module "react"`
-
-Solution: https://github.com/exponentjs/react-native-invertible-scroll-view/issues/20
+Distributed under the Eclipse Public License either version 1.0 or (at
+your option) any later version.

android/Messenger.iml

@@ -26,9 +26,7 @@ import com.android.build.OutputFile
  *
  *   // whether to bundle JS and assets in another build variant (if configured).
  *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
- *   // The configuration property can be in the following formats
- *   //         'bundleIn${productFlavor}${buildType}'
- *   //         'bundleIn${buildType}'
+ *   // The configuration property is in the format 'bundleIn${productFlavor}${buildType}'
  *   // bundleInFreeDebug: true,
  *   // bundleInPaidRelease: true,
  *   // bundleInBeta: true,
@@ -62,7 +60,8 @@ import com.android.build.OutputFile
 apply from: "react.gradle"
 
 /**
- * Set this to true to create two separate APKs instead of one:
+ * Set this to true to create three separate APKs instead of one:
+ *   - A universal APK that works on all devices
  *   - An APK that only works on ARM devices
  *   - An APK that only works on x86 devices
  * The advantage is the size of the APK is reduced by about 4MB.
@@ -81,7 +80,7 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.messenger"
+        applicationId "com.syngim"
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 1
@@ -92,9 +91,9 @@ android {
     }
     splits {
         abi {
-            reset()
             enable enableSeparateBuildPerCPUArchitecture
-            universalApk false  // If true, also generate a universal APK
+            universalApk false
+            reset()
             include "armeabi-v7a", "x86"
         }
     }
@@ -120,6 +119,9 @@ android {
 }
 
 dependencies {
+    compile project(':randombytes')
+    compile project(':realm')
+    compile project(':react-native-vector-icons')
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.android.support:appcompat-v7:23.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules
@@ -128,6 +130,5 @@ dependencies {
 //    compile(name:'geth', ext:'aar')
     compile(group: 'syng-im', name: 'android-geth', version: '1.4.0-201603131817-92d65cf', ext: 'aar')
 
-    compile project(":realm")
     compile fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
 }

android/app/app.iml

@@ -30,20 +30,21 @@ gradle.projectsEvaluated {
 
     productFlavors.each { productFlavorName ->
         buildTypes.each { buildTypeName ->
-            // Create variant and target names
-            def targetName = "${productFlavorName.capitalize()}${buildTypeName.capitalize()}"
-            def targetPath = productFlavorName ?
-                    "${productFlavorName}/${buildTypeName}" :
-                    "${buildTypeName}"
+            // Create variant and source names
+            def sourceName = "${buildTypeName}"
+            def targetName = "${sourceName.capitalize()}"
+            if (productFlavorName) {
+                sourceName = "${productFlavorName}${targetName}"
+            }
 
             // React js bundle directories
             def jsBundleDirConfigName = "jsBundleDir${targetName}"
             def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
-                    file("$buildDir/intermediates/assets/${targetPath}")
+                    file("$buildDir/intermediates/assets/${sourceName}")
 
             def resourcesDirConfigName = "jsBundleDir${targetName}"
             def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
-                    file("$buildDir/intermediates/res/merged/${targetPath}")
+                    file("$buildDir/intermediates/res/merged/${sourceName}")
             def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
 
             // Bundle task name for variant
@@ -79,9 +80,7 @@ gradle.projectsEvaluated {
                             "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
                 }
 
-                enabled config."bundleIn${targetName}" ||
-                    config."bundleIn${buildTypeName.capitalize()}" ?:
-                            targetName.toLowerCase().contains("release")
+                enabled config."bundleIn${targetName}" ?: targetName.toLowerCase().contains("release")
             }
 
             // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process

android/app/build.gradle

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.messenger">
+    package="com.syngim">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />