Modularization Base Structure (microsoft#41)

* Modularization Base Strcuture

This commit creates following modules
1) fluentui_core
2) fluentui_listitem
3) fluentui_drawer
4) fluentui_tablayout
5) fluentui_others
6) FluentUI

In addition, contains a build pipeline to create universal package
of the Fluent UI library

* Fix formatting issues

* Remove defaultTheme from Demo Activities

* Few Corrections Around ContextWrapper

* Formatting Corrections

* Remove unwanted imports

* Remove .gitignore from every submodule

* Address review comments

1) Remove project.afterEvaluate
2) Add RestrictTo to MSRecyclerView
3) Add documentation on config.gradle

* Keep Drawer Module Consistent with Modular Branch

* Small Correction to move an integer value

Moved one persistent bottom sheet value for landscape from
fluentui_others to fluentui_drawer

* Correcting Formatting Issues

* Add Internal Maven Repo to Publish

* Add todo item for package name

* Minor corrections in fluentui_others module

* Bump to version 0.0.12

* Remove hardcoding of version ids in gradle file

* Update README.md with Modularization Details

Co-authored-by: Mayuresh Gharpure <[email protected]>

Author: msgharpu

.gitignore

@@ -34,7 +34,7 @@ captures/
 
 # IntelliJ
 *.iml
-.idea/*
+.idea/
 
 .DS_Store
 
@@ -55,8 +55,8 @@ freeline/
 freeline_project_description.json
 
 # fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
+*/fastlane/report.xml
+*/fastlane/Preview.html
+*/fastlane/screenshots
+*/fastlane/test_output
+*/fastlane/readme.md

FluentUI.Demo/.gitignore

@@ -15,8 +15,8 @@ android {
         applicationId 'com.microsoft.fluentuidemo'
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 11
-        versionName '0.0.11'
+        versionCode 12
+        versionName '0.0.12'
     }
     buildTypes {
         release {
@@ -55,8 +55,12 @@ dependencies {
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation project(':FluentUI')
+    implementation 'com.android.support.constraint:constraint-layout:2.0.1'//Changing to 2.0.1 from 1.1.3
+    implementation project(':fluentui_core')
+    implementation project(':fluentui_listitem')
+    implementation project(':fluentui_drawer')
+    implementation project(':fluentui_tablayout')
+    implementation project(':fluentui_others')
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.github.bumptech.glide:glide:4.8.0'
     implementation 'com.jakewharton.threetenabp:threetenabp:1.1.0'

FluentUI.Demo/build.gradle

@@ -332,7 +332,7 @@ class ListItemViewActivity : DemoActivity() {
         if (useCustomAccessoryView) {
             val customTextView = TextView(this)
             customTextView.text = getString(R.string.list_item_sub_header_custom_accessory_text)
-            TextViewCompat.setTextAppearance(customTextView, R.style.TextAppearance_FluentUI_ListSubHeaderTitle_Tertiary)
+            TextViewCompat.setTextAppearance(customTextView, R.style.FluentUIDemo_ListItemSubHeaderTitle)
             customTextView.setOnClickListener {
                 Snackbar.make(
                     it,

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/ListItemViewActivity.kt

@@ -10,6 +10,6 @@
     android:id="@+id/list_example"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/fluentuiListItemBackgroundColor"
+    android:background="?attr/fluentuiBackgroundColor"
     app:layoutManager="android.support.v7.widget.LinearLayoutManager"
     tools:context=".demos.ListItemViewActivity" />

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/PersistentBottomSheetActivity.kt

@@ -40,6 +40,13 @@
             android:layout_marginTop="@dimen/default_layout_margin"
             android:text="@string/toggle_sheet_content" />
 
+        <Button
+            android:id="@+id/set_one_line_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_layout_margin"
+            android:text="@string/one_line_content" />
+
     </LinearLayout>
 
     <com.microsoft.fluentui.persistentbottomsheet.PersistentBottomSheet

FluentUI.Demo/src/main/res/layout/activity_list_item_view.xml

@@ -12,7 +12,7 @@
 
     <com.microsoft.fluentui.tablayout.TabLayout
         android:id="@+id/demo_tab_layout"
-        style="@style/FluentUI.TabLayout"
+        style="@style/FluentUIDemo.TabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabType="Standard"/>

FluentUI.Demo/src/main/res/layout/activity_persistent_bottom_sheet.xml

@@ -19,5 +19,7 @@
 
     <!--ActionBarLayout-->
     <color name="action_bar_radio_labels">@color/fluentui_black</color>
+    <!--Botttomsheet tint-->
+    <color name="bottomsheet_horizontal_icon_tint">@color/fluentui_gray_500</color>
 
 </resources>

FluentUI.Demo/src/main/res/layout/activity_tab_layout.xml

@@ -245,6 +245,7 @@
     <string name="new_view">This is New View</string>
     <string name="toggle_sheet_content">Toggle Bottomsheet Content</string>
     <string name="switch_to_custom_content">Switch to custom Content</string>
+    <string name="one_line_content">One Line Bottomsheet Content</string>
     <!--Persistent BottomSheet Items-->
     <string name="persistent_sheet_item_add_remove_view">Add/Remove View</string>
     <string name="persistent_sheet_item_change_collapsed_height"> Change Collapsed Height</string>

FluentUI.Demo/src/main/res/values/colors.xml

@@ -79,13 +79,17 @@
     <style name="Demo.Tooltip.Button" parent="Widget.FluentUI.Button" />
 
     <!--TabLayout Demo-->
-    <style name="FluentUI.TabLayout" parent="">
-        <item name="containerBackgroundColor">?attr/fluentuiTabLayoutContainerBackgroundColor</item>
-        <item name="tabsBackgroundColor">?attr/fluentuiTabLayoutBackgroundColor</item>
-        <item name="tabSelectedBackgroundColor">?attr/fluentuiTabSelectedBackgroundColor</item>
-        <item name="tabUnselectedBackgroundColor">?attr/fluentuiTabUnselectedBackgroundColor</item>
-        <item name="tabSelectedTextColor">?attr/fluentuiTabSelectedTextColor</item>
-        <item name="tabUnselectedTextColor">?attr/fluentuiTabUnselectedTextColor</item>
+    <style name="FluentUIDemo.TabLayout" parent="">
+        <item name="containerBackgroundColor">?attr/fluentuiBackgroundPrimaryColor</item>
+        <item name="tabsBackgroundColor">@color/fluentui_communication_shade_10</item>
+        <item name="tabSelectedBackgroundColor">?attr/fluentuiBackgroundColor</item>
+        <item name="tabUnselectedBackgroundColor">@color/fluentui_communication_shade_10</item>
+        <item name="tabSelectedTextColor">?attr/fluentuiBackgroundPrimaryColor</item>
+        <item name="tabUnselectedTextColor">?attr/fluentuiBackgroundColor</item>
+    </style>
+    <!-- ListItem Demo -->
+    <style name="FluentUIDemo.ListItemSubHeaderTitle" parent="">
+        <item name="android:textColor">?attr/fluentuiForegroundSecondaryColor</item>
     </style>
 
 </resources>

FluentUI.Demo/src/main/res/values/strings.xml

@@ -2,71 +2,47 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-
 apply plugin: 'com.android.library'
-
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
+apply from: '../config.gradle'
+
 android {
-    compileSdkVersion 28
+    compileSdkVersion constants.compileSdkVersion
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 11
-        versionName '0.0.11'
+        minSdkVersion constants.minSdkVersion
+        targetSdkVersion constants.targetSdkVersion
+        versionCode 12
+        versionName project.ext.FluentUI_versionid
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true
-    }
-    lintOptions {
-        abortOnError false
+        consumerProguardFiles 'consumer-rules.pro'
     }
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-    productFlavors {
-    }
-}
-
-gradle.taskGraph.whenReady { taskGraph ->
-    taskGraph.allTasks.forEach {
-        if (it.name.contains("ReleaseUnitTest")) {
-            it.enabled = false
-        }
-    }
-}
 
-repositories {
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:exifinterface:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':fluentui_core')
+    implementation project(':fluentui_listitem')
+    implementation project(':fluentui_drawer')
+    implementation project(':fluentui_tablayout')
+    implementation project(':fluentui_others')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.jakewharton.threetenabp:threetenabp:1.1.0'
-    implementation 'com.splitwise:tokenautocomplete:2.0.8'
-    implementation "com.microsoft.device:dualscreen-layout:1.0.0-alpha01"
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:4.0-alpha-3'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:design:$supportVersion"
+    testImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "com.android.support.test:runner:$testRunnerVersion"
+    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
 }
 
 task sourceJar(type: Jar) {
@@ -97,9 +73,17 @@ publishing {
                 configurations.implementation.allDependencies.each {
                     if (it.group != null && (it.name != null && it.name != "unspecified") && it.version != null) {
                         def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
+                        if (it.group.equals('fluentui-android')) {
+                            dependencyNode.appendNode('groupId', 'com.microsoft.fluentui')
+                            dependencyNode.appendNode('artifactId', it.name)
+                            def artifactName = it.name.replaceAll('-','_')+'_versionid'
+                            dependencyNode.appendNode('version', getProperty(artifactName).toString())
+                        } else {
+                            dependencyNode.appendNode('groupId', it.group)
+                            dependencyNode.appendNode('artifactId', it.name)
+                            dependencyNode.appendNode('version', it.version)
+                        }
+
                     }
                 }
             }

FluentUI.Demo/src/main/res/values/styles.xml

@@ -3,6 +3,6 @@
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   -->
-
+<!-- TODO Change package name to com.microsoft.fluentui once modularization is complete -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui" />
+    package="com.microsoft.fluentui_container" />