Merge pull request #68 from TREE-Ind/updates-ui-build

Updates ui build

build.gradle

@@ -42,4 +42,15 @@ String getVersionName() {
         versionName = versionName + "-" + ext.versionClassifier
     }
     return versionName;
+}
+
+subprojects {
+    project.configurations.all {
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'com.android.support'
+                    && !details.requested.name.contains('multidex') ) {
+                details.useVersion "24.0.0"
+            }
+        }
+    }
 }

mobile/build.gradle

@@ -57,35 +57,35 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-
-    compile 'org.altbeacon:android-beacon-library:2.11'
-    compile 'com.android.support:appcompat-v7:24.0.0'
-    compile 'com.android.support:design:24.0.0'
-    compile 'org.java-websocket:Java-WebSocket:1.3.0'
-    compile 'com.android.support:support-v4:24.0.0'
+    implementation 'org.altbeacon:android-beacon-library:2.11'
+    api 'com.android.support:appcompat-v7:24.0.0'
+    implementation 'com.android.support:design:24.0.0'
+    implementation 'org.java-websocket:Java-WebSocket:1.3.0'
+    api 'com.android.support:support-v4:24.0.0'
     // layout deps
-    compile 'com.android.support:cardview-v7:24.0.+'
-    compile 'com.android.support:recyclerview-v7:24.0.+'
+    implementation 'com.android.support:cardview-v7:24.0.+'
+    implementation 'com.android.support:recyclerview-v7:24.0.+'
+    implementation 'com.android.support:palette-v7:26.0.1'
     // Unit test dependencies
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.powermock:powermock-api-mockito:1.6.4'
-    testCompile 'org.powermock:powermock-module-junit4-rule-agent:1.6.4'
-    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.4'
-    testCompile 'org.powermock:powermock-module-junit4:1.6.4'
-    testCompile 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.4'
+    testImplementation 'org.powermock:powermock-module-junit4-rule-agent:1.6.4'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.4'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.4'
+    testImplementation 'junit:junit:4.12'
     // Instrumentation dependencies
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support:support-annotations:24.0.0'
-    compile('com.crashlytics.sdk.android:crashlytics:2.5.7@aar') {
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestImplementation 'com.android.support.test:runner:0.5'
+    androidTestImplementation 'com.android.support:support-annotations:24.0.0'
+    implementation('com.crashlytics.sdk.android:crashlytics:2.5.7@aar') {
         transitive = true;
     }
-    compile 'com.google.android.gms:play-services-wearable:9.4.0'
+    implementation 'com.google.android.gms:play-services-wearable:9.4.0'
     wearApp project(':wear')
-    compile project(':shared')
+    implementation project(':shared')
 
     //kotlin
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

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

@@ -52,7 +52,7 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         android:src="@drawable/ic_mycroft"
-        android:alpha="0.5"
-        app:backgroundTint="@android:color/holo_blue_light" />
+        android:alpha="0.8"
+        app:backgroundTint="@android:color/white" />
 
 </android.support.design.widget.CoordinatorLayout>

mobile/src/main/res/layout/card_layout.xml

@@ -27,6 +27,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="6dp"
+    card_view:cardBackgroundColor="@color/colorPrimary"
     card_view:cardCornerRadius="4dp"
     card_view:cardElevation="2dp"
     >
@@ -42,8 +43,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:textColor="@android:color/black"
-            android:textSize="18sp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
             tools:text="Some text to check whether the layout looks ok.\n \nHere's how it appears with line breaks."
             />
 

mobile/src/main/res/layout/content_main.xml

@@ -40,7 +40,7 @@
     <Switch
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="App Reader"
+        android:text="Voice Responses"
         android:id="@+id/voxswitch"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"

mobile/src/main/res/values/colors.xml

@@ -20,7 +20,7 @@
   -->
 
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#22A7F0</color>
+    <color name="colorPrimaryDark">#4990e2</color>
+    <color name="colorAccent">#80c3f3</color>
 </resources>

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

@@ -22,7 +22,7 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="fab_margin">12dp</dimen>
 
     <!--
 Refer to App Widget Documentation for margin information

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

@@ -19,11 +19,11 @@
   -->
 
 <resources>
-    <string name="app_name">Mycroft-Android</string>
+    <string name="app_name">Mycroft</string>
     <string name="action_settings">Settings</string>
     <string name="beacon_activity">Beacon Func</string>
     <string name="ranging_activity">Beacon Range</string>
-    <string name="mycroftai">MycroftAI</string>
+    <string name="mycroftai">Mycroft</string>
     <string name="title_activity_settings">Settings</string>
 
     <!-- Strings related to Settings -->
@@ -42,10 +42,10 @@
     <string name="pref_title_default_ip">Mycroft IP address</string>
     <string name="pref_default_display_ip">192.168.0.2</string>
 
-    <string name="pref_title_app_reader_switch">App Reader</string>
+    <string name="pref_title_app_reader_switch">Voice Responses</string>
     <string name="pref_summary_app_reader_switch">enable TTS responses</string>
 
-    <string name="pref_title_display_app_reader_switch">App Reader</string>
+    <string name="pref_title_display_app_reader_switch">Voice Responses</string>
     <string name="pref_summary_display_app_reader_switch">display App Reader switch on main screen</string>
 
     <string name="pref_title_add_friends_to_messages">Add friends to messages</string>
@@ -111,7 +111,7 @@
     <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
     <string name="websocket_connected">Connected to Mycroft!</string>
     <string name="websocket_closed">Connection to Mycroft has closed! Please re-connect and check connection settings!</string>
-    <string name="websocket_error">Connection error! Please ensure Mycroft is available and on the same network as your device!</string>
+    <string name="websocket_error">Connection error! Please ensure Ezra is available and on the same network as your device!</string>
 
     <string name="connect">Connect</string>
     <string name="discover">Discover</string>

mobile/src/main/res/values/styles.xml

@@ -23,9 +23,11 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
+
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
     </style>
 
     <style name="AppTheme.NoActionBar">

shared/build.gradle

@@ -23,10 +23,10 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
-        minSdkVersion 20
+        minSdkVersion 21
         targetSdkVersion 24
         versionCode project.ext.versionCode
         versionName project.ext.versionName
@@ -43,11 +43,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:24.0.0'
-    testCompile 'junit:junit:4.12'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'com.android.support:appcompat-v7:24.0.0'
+    testImplementation 'junit:junit:4.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

wear/build.gradle

@@ -24,10 +24,10 @@ apply plugin: 'kotlin-android'
 android {
 
     compileSdkVersion 24
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId 'mycroft.ai'
-        minSdkVersion 20
+        minSdkVersion 21
         targetSdkVersion 24
         versionCode project.ext.versionCode
         versionName project.ext.versionName
@@ -43,9 +43,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.google.android.support:wearable:2.0.0-alpha2'
-    compile 'com.google.android.gms:play-services-wearable:9.4.0'
-    compile project(':shared')
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.google.android.support:wearable:2.0.0-alpha2'
+    implementation 'com.google.android.gms:play-services-wearable:9.4.0'
+    implementation project(':shared')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }