Skip to content

Commit 221a1bf

Browse files
authored
Merge pull request #55 from yml-org/refactor/CM-1282/add-design-system
[CM-1282] Incorporate the Y-Chat new Design System into the Android sample
2 parents 9c1f2e7 + 13f0096 commit 221a1bf

File tree

87 files changed

+2548
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+2548
-969
lines changed

sample/android/src/main/AndroidManifest.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
<uses-permission android:name="android.permission.INTERNET" />
55

66
<application
7-
android:name=".AppApplication"
8-
android:allowBackup="false"
7+
android:name=".YChatApplication"
8+
android:allowBackup="true"
9+
android:icon="@mipmap/ic_launcher"
10+
android:label="@string/app_name"
911
android:supportsRtl="true"
1012
android:theme="@style/AppTheme">
1113
<activity
12-
android:name="co.yml.ychat.android.MainActivity"
14+
android:name="co.yml.ychat.android.presentation.MainActivity"
1315
android:exported="true"
1416
android:windowSoftInputMode="adjustResize">
1517
<intent-filter>
@@ -18,4 +20,4 @@
1820
</intent-filter>
1921
</activity>
2022
</application>
21-
</manifest>
23+
</manifest>
13.6 KB
Loading

sample/android/src/main/java/co/yml/ychat/android/MainActivity.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

sample/android/src/main/java/co/yml/ychat/android/MainNavigation.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

sample/android/src/main/java/co/yml/ychat/android/MainViewModel.kt

Lines changed: 0 additions & 111 deletions
This file was deleted.

sample/android/src/main/java/co/yml/ychat/android/MenuItem.kt

Lines changed: 0 additions & 10 deletions
This file was deleted.

sample/android/src/main/java/co/yml/ychat/android/MessageItem.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

sample/android/src/main/java/co/yml/ychat/android/MyApplicationTheme.kt

Lines changed: 0 additions & 59 deletions
This file was deleted.

sample/android/src/main/java/co/yml/ychat/android/AppApplication.kt renamed to sample/android/src/main/java/co/yml/ychat/android/YChatApplication.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import org.koin.android.ext.koin.androidContext
66
import org.koin.android.ext.koin.androidLogger
77
import org.koin.core.context.startKoin
88

9-
class AppApplication : Application() {
9+
class YChatApplication : Application() {
1010

1111
override fun onCreate() {
1212
super.onCreate()
1313
startKoin {
1414
androidLogger()
15-
androidContext(this@AppApplication)
15+
androidContext(this@YChatApplication)
1616
modules(appModule)
1717
}
1818
}
19-
}
19+
}

sample/android/src/main/java/co/yml/ychat/android/di/AppModule.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ package co.yml.ychat.android.di
22

33
import co.yml.ychat.YChat
44
import co.yml.ychat.android.BuildConfig
5-
import co.yml.ychat.android.MainViewModel
5+
import co.yml.ychat.android.presentation.chatcompletions.viewmodel.ChatCompletionsViewModel
6+
import co.yml.ychat.android.presentation.home.viewmodel.HomeViewModel
67
import org.koin.androidx.viewmodel.dsl.viewModelOf
78
import org.koin.dsl.module
89

910
val appModule = module {
1011
single { YChat.create(BuildConfig.API_KEY) }
11-
viewModelOf(::MainViewModel)
12+
viewModelOf(::HomeViewModel)
13+
viewModelOf(::ChatCompletionsViewModel)
1214
}

0 commit comments

Comments
 (0)