Merge branch 'develop' into aniket/feat/create-new-channel

app/src/main/AndroidManifest.xml

@@ -20,10 +20,9 @@
         android:fullBackupContent="@xml/backup_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true">
-
         <activity
             android:name=".authentication.ui.AuthenticationActivity"
             android:configChanges="orientation"
@@ -35,12 +34,13 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
-
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data
                     android:host="auth"
                     android:scheme="rocketchat" />
@@ -50,31 +50,25 @@
                     android:scheme="https" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".server.ui.ChangeServerActivity"
             android:theme="@style/AuthenticationTheme" />
-
         <activity
             android:name=".main.ui.MainActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.ui.WebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.cas.ui.CasWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.oauth.ui.OauthWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".chatroom.ui.ChatRoomActivity"
             android:theme="@style/AppTheme"
@@ -88,12 +82,12 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="stateAlwaysHidden" />
 
-        <!-- TODO: Change to fragment-->
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />
 
-        <!-- TODO: Change to fragment-->
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.about.ui.AboutActivity"
             android:theme="@style/AppTheme" />
@@ -109,7 +103,6 @@
                 <category android:name="${applicationId}" />
             </intent-filter>
         </receiver>
-
         <receiver
             android:name=".push.DirectReplyReceiver"
             android:enabled="true"
@@ -143,4 +136,4 @@
             android:value="12ac6e94f850aaffcdff52001af77ca415d06a43" />
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file

dependencies.gradle

@@ -36,7 +36,12 @@ ext {
             junit                 : '4.12',
             truth                 : '0.36',
             espresso              : '3.0.2',
-            mockito               : '2.10.0'
+            mockito               : '2.10.0',
+
+            //For wearable
+            wear                  : '2.3.0',
+            playServicesWearable  : '15.0.1',
+            supportWearable       : '26.1.0'
     ]
     libraries = [
             kotlin                : "org.jetbrains.kotlin:kotlin-stdlib-jre8:${versions.kotlin}",
@@ -103,5 +108,13 @@ ext {
             espressoIntents       : "com.android.support.test.espresso:espresso-intents:${versions.espresso}",
             roomTest              : "android.arch.persistence.room:testing:${versions.room}",
             truth                 : "com.google.truth:truth:$versions.truth",
+
+            //For the wear app
+            wearable              : "com.google.android.support:wearable:${versions.wear}",
+            playServicesWearable  : "com.google.android.gms:play-services-wearable:${versions.playServicesWearable}",
+            percentLayout         : "com.android.support:percent:${versions.supportWearable}",
+            supportWearable       : "com.android.support:support-v4:${versions.supportWearable}",
+            wearableRecyclerView  : "com.android.support:recyclerview-v7:${versions.supportWearable}",
+            wearSupport           : "com.android.support:wear:${versions.supportWearable}"
     ]
 }

settings.gradle

-include ':app', ':player'
+include ':app', ':player', ':wear'
\ No newline at end of file

wear/.gitignore

+/build

wear/build.gradle

+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+android {
+    compileSdkVersion 26
+    buildToolsVersion versions.buildTools
+
+    defaultConfig {
+        applicationId "chat.rocket.android.wear"
+        minSdkVersion 23
+        targetSdkVersion versions.targetSdk
+        versionCode 1
+        versionName "1.0.0"
+    }
+    buildTypes {
+        release {
+            postprocessing {
+                removeUnusedCode false
+                removeUnusedResources false
+                obfuscate false
+                optimizeCode false
+                proguardFile 'proguard-rules.pro'
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation libraries.kotlin
+    implementation libraries.wearable
+    implementation libraries.playServicesWearable
+    implementation libraries.percentLayout
+    implementation libraries.supportWearable
+    implementation libraries.wearableRecyclerView
+    implementation libraries.wearSupport
+    compileOnly 'com.google.android.wearable:wearable:2.3.0'
+}

wear/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# 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 *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

wear/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="chat.rocket.android.wear">
+
+    <uses-feature android:name="android.hardware.type.watch" />
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.DeviceDefault">
+        <uses-library
+            android:name="com.google.android.wearable"
+            android:required="true" />
+        <!--
+               Set to true if your app is Standalone, that is, it does not require the handheld
+               app to run.
+        -->
+        <meta-data
+            android:name="com.google.android.wearable.standalone"
+            android:value="true" />
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file

wear/src/main/java/chat/rocket/android/wear/MainActivity.kt

+package chat.rocket.android.wear
+
+import android.os.Bundle
+import android.support.wearable.activity.WearableActivity
+
+class MainActivity : WearableActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        // Enables Always-on
+        setAmbientEnabled()
+    }
+}

wear/src/main/res/layout/activity_main.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_grey"
+    android:padding="@dimen/box_inset_layout_padding"
+    tools:context="chat.rocket.android.wear.MainActivity"
+    tools:deviceIds="wear">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/inner_frame_layout_padding"
+        app:boxedEdges="all">
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/hello_world" />
+
+    </FrameLayout>
+</android.support.wear.widget.BoxInsetLayout>
+

wear/src/main/res/values-round/strings.xml

+<resources>
+    <string name="hello_world">Hello Round World!</string>
+</resources>

wear/src/main/res/values/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
+    Because the window insets on round devices are larger than 15dp, this padding only applies
+    to square screens.
+    -->
+    <dimen name="box_inset_layout_padding">0dp</dimen>
+
+    <!--
+    This padding applies to both square and round screens. The total padding between the buttons
+    and the window insets is box_inset_layout_padding (above variable) on square screens and
+    inner_frame_layout_padding (below variable) on round screens.
+    -->
+    <dimen name="inner_frame_layout_padding">5dp</dimen>
+</resources>

wear/src/main/res/values/strings.xml

+<resources>
+    <string name="app_name">Rocket&#46;Chat</string>
+    <!--
+    This string is used for square devices and overridden by hello_world in
+    values-round/strings.xml for round devices.
+    -->
+    <string name="hello_world">Hello Square World!</string>
+</resources>