Merge "Jetchat: creates new themes" into jetapps

Author: JoseAlcerreca

JetChat/ASSETS_LICENSE

@@ -0,0 +1,88 @@
+All font files are licensed under the SIL OPEN FONT LICENSE license. All other files are licensed under the Apache 2 license.
+
+
+SIL OPEN FONT LICENSE
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting — in part or in whole — any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

JetChat/app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.JetChat.NoActionBar">
+        android:theme="@style/Theme.Jetchat.NoActionBar">
         <activity
             android:name=".NavActivity"
             android:windowSoftInputMode="adjustResize"

JetChat/app/src/main/java/com/example/compose/jetchat/Themes.kt

@@ -54,8 +54,8 @@ import androidx.ui.res.vectorResource
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.PxPosition
 import androidx.ui.unit.dp
-import com.example.compose.jetchat.JetChatTheme
 import com.example.compose.jetchat.R
+import com.example.compose.jetchat.theme.JetchatTheme
 
 /**
  * Entry point for a conversation screen.
@@ -220,7 +220,7 @@ fun AuthorAndTextMessage(
 @Preview()
 @Composable
 fun ConversationPreview() {
-    JetChatTheme {
+    JetchatTheme {
         ConversationContent(
             uiState = ConversationUiState(),
             navigateToProfile = { }

JetChat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt

@@ -27,8 +27,8 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.navigation.findNavController
 import androidx.ui.core.setContent
-import com.example.compose.jetchat.JetChatTheme
 import com.example.compose.jetchat.R
+import com.example.compose.jetchat.theme.JetchatTheme
 
 class ConversationFragment : Fragment() {
 
@@ -47,7 +47,7 @@ class ConversationFragment : Fragment() {
             )
             setContent(Recomposer.current()) {
                 Providers(BackPressedDispatcherAmbient provides requireActivity()) {
-                    JetChatTheme {
+                    JetchatTheme {
                         ConversationContent(
                             uiState = ConversationUiState(),
                             navigateToProfile = { user ->

JetChat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationFragment.kt

@@ -17,68 +17,52 @@
 package com.example.compose.jetchat.profile
 
 import androidx.compose.Composable
-import androidx.compose.State
-import androidx.compose.mutableStateOf
-import androidx.compose.state
 import androidx.ui.tooling.preview.Preview
-import com.example.compose.jetchat.JetChatProfileTheme
-
+import com.example.compose.jetchat.theme.JetchatTheme
 
 @Preview(widthDp = 340, name = "340 width - Me")
 @Composable
 fun ProfilePreview340() {
-    JetChatProfileTheme(userIsMe = true) {
-        ProfileScreen(
-            aliConnors
-        )
+    JetchatTheme {
+        ProfileScreen(aliConnors)
     }
 }
 
 @Preview(widthDp = 480, name = "480 width - Me")
 @Composable
 fun ProfilePreview480Me() {
-    JetChatProfileTheme(userIsMe = true) {
-        ProfileScreen(
-            aliConnors
-        )
+    JetchatTheme {
+        ProfileScreen(aliConnors)
     }
 }
 
 @Preview(widthDp = 480, name = "480 width - Other")
 @Composable
 fun ProfilePreview480Other() {
-    JetChatProfileTheme(userIsMe = false) {
-        ProfileScreen(
-            someOneElse
-        )
+    JetchatTheme {
+        ProfileScreen(someOneElse)
     }
 }
 @Preview(widthDp = 340, name = "340 width - Me - Dark")
 @Composable
 fun ProfilePreview340MeDark() {
-    JetChatProfileTheme(isDarkTheme = true, userIsMe = true) {
-        ProfileScreen(
-            aliConnors
-        )
+    JetchatTheme(isDarkTheme = true) {
+        ProfileScreen(aliConnors)
     }
 }
 
 @Preview(widthDp = 480, name = "480 width - Me - Dark")
 @Composable
 fun ProfilePreview480MeDark() {
-    JetChatProfileTheme(isDarkTheme = true, userIsMe = true) {
-        ProfileScreen(
-            aliConnors
-        )
+    JetchatTheme(isDarkTheme = true) {
+        ProfileScreen(aliConnors)
     }
 }
 
 @Preview(widthDp = 480, name = "480 width - Other - Dark")
 @Composable
 fun ProfilePreview480OtherDark() {
-    JetChatProfileTheme(isDarkTheme = true, userIsMe = false) {
-        ProfileScreen(
-            someOneElse
-        )
+    JetchatTheme(isDarkTheme = true) {
+        ProfileScreen(someOneElse)
     }
 }