commit d6d5475fc47ba42c9d37919484a7ab935a930951 Author: hmalik144 Date: Tue Sep 15 20:57:57 2020 +0100 Creation of MVVM components: - UI - MainViewModel/MainViewModelFactory - Repository/RepositoryImpl - Data sources - Websocket networking with scarlet - Room Database diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..603b140 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..88ea3aa --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,122 @@ + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/dictionaries b/.idea/dictionaries new file mode 100644 index 0000000..ed3680a --- /dev/null +++ b/.idea/dictionaries @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..b9f8a5e --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..8b7f4af --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..703e5d4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..8a0a00a --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,69 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +apply plugin: 'kotlin-kapt' + +android { + compileSdkVersion 30 + buildToolsVersion "29.0.3" + + defaultConfig { + applicationId "com.example.h_mal.messengerapp" + minSdkVersion 23 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.1' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + + + // Networking + def scarlet_version = '0.1.9' + implementation "com.tinder.scarlet:scarlet:${scarlet_version}" + implementation "com.tinder.scarlet:websocket-okhttp:${scarlet_version}" + implementation "com.tinder.scarlet:message-adapter-gson:${scarlet_version}" + implementation "com.tinder.scarlet:stream-adapter-coroutines:${scarlet_version}" + implementation "com.tinder.scarlet:lifecycle-android:${scarlet_version}" + def okhttp3_version = '4.9.0' + implementation "com.squareup.okhttp3:okhttp:${okhttp3_version}" + implementation "com.squareup.okhttp3:logging-interceptor:${okhttp3_version}" + implementation "com.google.code.gson:gson:2.8.6" + // Kodein Dependency Injection + implementation "org.kodein.di:kodein-di-generic-jvm:6.2.1" + implementation "org.kodein.di:kodein-di-framework-android-x:6.2.1" + // Room database + def room_version = "2.2.5" + implementation "androidx.room:room-runtime:$room_version" + kapt "androidx.room:room-compiler:$room_version" + implementation "androidx.room:room-ktx:$room_version" +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# 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 \ No newline at end of file diff --git a/app/src/androidTest/java/com/example/h_mal/messengerapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/h_mal/messengerapp/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..7195658 --- /dev/null +++ b/app/src/androidTest/java/com/example/h_mal/messengerapp/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.h_mal.messengerapp + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.h_mal.messengerapp", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..ecb4f03 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/MainActivity.kt b/app/src/main/java/com/example/h_mal/messengerapp/MainActivity.kt new file mode 100644 index 0000000..3ce45e0 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/MainActivity.kt @@ -0,0 +1,18 @@ +package com.example.h_mal.messengerapp + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import com.example.h_mal.messengerapp.ui.main.MainFragment + +class MainActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.main_activity) + if (savedInstanceState == null) { + supportFragmentManager.beginTransaction() + .replace(R.id.container, MainFragment.newInstance()) + .commitNow() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/application/AppClass.kt b/app/src/main/java/com/example/h_mal/messengerapp/application/AppClass.kt new file mode 100644 index 0000000..7f1adf7 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/application/AppClass.kt @@ -0,0 +1,45 @@ +package com.example.h_mal.messengerapp.application + +import android.app.Application +import com.example.h_mal.messengerapp.data.network.MessengerApi +import com.example.h_mal.messengerapp.data.network.NetworkConnectionInterceptor +import com.example.h_mal.messengerapp.data.network.okHttpClient +import com.example.h_mal.messengerapp.data.repository.RepositoryImpl +import com.example.h_mal.messengerapp.data.room.AppRoomDatabase +import com.example.h_mal.messengerapp.ui.main.MainViewModelFactory +import kotlinx.coroutines.ExperimentalCoroutinesApi +import org.kodein.di.Kodein +import org.kodein.di.KodeinAware +import org.kodein.di.android.x.androidXModule +import org.kodein.di.generic.bind +import org.kodein.di.generic.instance +import org.kodein.di.generic.provider +import org.kodein.di.generic.singleton + +class AppClass: Application(), KodeinAware{ + + // Kodein aware to initialise the classes used for DI + @ExperimentalCoroutinesApi + override val kodein = Kodein.lazy { + import(androidXModule(this@AppClass)) + + bind() from singleton { + NetworkConnectionInterceptor( + instance() + ) + } + bind() from singleton { + okHttpClient( + instance() + ) + } + bind() from singleton { + MessengerApi( + instance() + ) + } + bind() from singleton { AppRoomDatabase(instance()) } + bind() from singleton { RepositoryImpl(instance()) } + bind() from provider { MainViewModelFactory(instance()) } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/data/network/MessengerApi.kt b/app/src/main/java/com/example/h_mal/messengerapp/data/network/MessengerApi.kt new file mode 100644 index 0000000..a49749b --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/data/network/MessengerApi.kt @@ -0,0 +1,45 @@ +package com.example.h_mal.messengerapp.data.network + +import com.tinder.scarlet.Scarlet +import com.tinder.scarlet.Stream +import com.tinder.scarlet.WebSocket +import com.tinder.scarlet.messageadapter.gson.GsonMessageAdapter +import com.tinder.scarlet.websocket.okhttp.newWebSocketFactory +import com.tinder.scarlet.ws.Receive +import com.tinder.scarlet.ws.Send +import com.tinder.streamadapter.coroutines.CoroutinesStreamAdapterFactory +import kotlinx.coroutines.channels.ReceiveChannel +import okhttp3.OkHttpClient + + +interface MessengerApi { + + @Receive + fun observerMessage(): ReceiveChannel + + @Receive + fun observerFailure(): ReceiveChannel + + @Send + fun send(message: Any): Boolean + + + // invoke method creating an invocation of the api call + companion object{ + operator fun invoke( + okkHttpClient: OkHttpClient + ) : MessengerApi { + + val webSocketUrl = "ws://echo.websocket.org/" + + // creation of retrofit class + return Scarlet.Builder() + .webSocketFactory(okkHttpClient.newWebSocketFactory(webSocketUrl)) + .addMessageAdapterFactory(GsonMessageAdapter.Factory()) + .addStreamAdapterFactory(CoroutinesStreamAdapterFactory()) + .build() + .create() + + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/data/network/NetworkConnectionInterceptor.kt b/app/src/main/java/com/example/h_mal/messengerapp/data/network/NetworkConnectionInterceptor.kt new file mode 100644 index 0000000..a273922 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/data/network/NetworkConnectionInterceptor.kt @@ -0,0 +1,42 @@ +package com.example.h_mal.messengerapp.data.network + +import android.content.Context +import android.net.ConnectivityManager +import android.net.NetworkCapabilities +import okhttp3.Interceptor +import okhttp3.Response +import java.io.IOException + +/** + * Network interceptor to verify valid network connection + * Throws an [IOException] if there no valid internet connection + */ +class NetworkConnectionInterceptor( + context: Context +): Interceptor { + private val applicationContext = context.applicationContext + + override fun intercept(chain: Interceptor.Chain): Response { + if (!isInternetAvailable()) { + throw IOException("Make sure you have an active data connection") + } + + return chain.proceed(chain.request()) + } + + private fun isInternetAvailable(): Boolean { + var result = false + val connectivityManager = + applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager? + connectivityManager?.let { + it.getNetworkCapabilities(connectivityManager.activeNetwork)?.apply { + result = when { + hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true + hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true + else -> false + } + } + } + return result + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/data/network/OkHttpClient.kt b/app/src/main/java/com/example/h_mal/messengerapp/data/network/OkHttpClient.kt new file mode 100644 index 0000000..1ccd6c8 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/data/network/OkHttpClient.kt @@ -0,0 +1,21 @@ +package com.example.h_mal.messengerapp.data.network + +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import java.util.concurrent.TimeUnit + +fun okHttpClient( + networkInterceptor: NetworkConnectionInterceptor +): OkHttpClient { + val logging: HttpLoggingInterceptor = HttpLoggingInterceptor().apply { + level = HttpLoggingInterceptor.Level.BODY + } + + return OkHttpClient.Builder() + .addInterceptor(logging) + .addNetworkInterceptor(networkInterceptor) + .readTimeout(60, TimeUnit.SECONDS) + .writeTimeout(60, TimeUnit.SECONDS) + .connectTimeout(60, TimeUnit.SECONDS) + .build() +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/data/repository/Repository.kt b/app/src/main/java/com/example/h_mal/messengerapp/data/repository/Repository.kt new file mode 100644 index 0000000..8ac1ef7 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/data/repository/Repository.kt @@ -0,0 +1,11 @@ +package com.example.h_mal.messengerapp.data.repository + +import com.tinder.scarlet.WebSocket +import kotlinx.coroutines.channels.ReceiveChannel + +interface Repository { + + fun observeText(): ReceiveChannel + fun submitMessage(message: String) + fun getEvent(): ReceiveChannel +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/data/repository/RepositoryImpl.kt b/app/src/main/java/com/example/h_mal/messengerapp/data/repository/RepositoryImpl.kt new file mode 100644 index 0000000..f91cabc --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/data/repository/RepositoryImpl.kt @@ -0,0 +1,29 @@ +package com.example.h_mal.messengerapp.data.repository + +import android.util.Log +import com.example.h_mal.messengerapp.data.network.MessengerApi +import com.tinder.scarlet.WebSocket +import kotlinx.coroutines.channels.ReceiveChannel +import kotlinx.coroutines.channels.consumeEach +import java.io.IOException + +class RepositoryImpl( + private val messengerApi: MessengerApi +) : Repository{ + + override fun observeText(): ReceiveChannel { + return messengerApi.observerMessage() + } + + override fun submitMessage(message: String){ + val send = messengerApi.send(message) + if (!send){ + throw IOException("Could not send message") + } + } + + override fun getEvent(): ReceiveChannel { + return messengerApi.observerFailure() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/data/room/MessageDao.kt b/app/src/main/java/com/example/h_mal/messengerapp/data/room/MessageDao.kt new file mode 100644 index 0000000..e1d1aab --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/data/room/MessageDao.kt @@ -0,0 +1,26 @@ +package com.example.h_mal.messengerapp.data.room + +import androidx.lifecycle.LiveData +import androidx.room.* + +@Dao +interface MessageDao { + + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun saveAllItems(messages : List) + + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun saveSingleItem(message : MessageEntity) + + @Query("SELECT * FROM MessageEntity") + fun getAllItems() : LiveData> + + @Query("SELECT * FROM MessageEntity WHERE id = :id") + fun getItem(id: Int) : LiveData + + @Query("DELETE FROM MessageEntity") + suspend fun deleteAllEntries() + + @Delete + fun deleteSingleEntry(message: MessageEntity) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/data/room/MessageEntity.kt b/app/src/main/java/com/example/h_mal/messengerapp/data/room/MessageEntity.kt new file mode 100644 index 0000000..986d6e5 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/data/room/MessageEntity.kt @@ -0,0 +1,12 @@ +package com.example.h_mal.messengerapp.data.room + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity +data class MessageEntity( + @PrimaryKey(autoGenerate = true) + val id: Int, + val sender: Boolean, + val message: String +) \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/data/room/RoomDatabase.kt b/app/src/main/java/com/example/h_mal/messengerapp/data/room/RoomDatabase.kt new file mode 100644 index 0000000..6f1e739 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/data/room/RoomDatabase.kt @@ -0,0 +1,34 @@ +package com.example.h_mal.messengerapp.data.room + +import android.content.Context +import androidx.room.* + +@Database( + entities = [MessageEntity::class], + version = 1 +) +abstract class AppRoomDatabase : RoomDatabase() { + + abstract fun getMessageDao(): MessageDao + + companion object { + + @Volatile + private var instance: AppRoomDatabase? = null + private val LOCK = Any() + + // create an instance of room database or use previously created instance + operator fun invoke(context: Context) = instance ?: synchronized(LOCK) { + instance ?: buildDatabase(context).also { + instance = it + } + } + + private fun buildDatabase(context: Context) = + Room.databaseBuilder( + context.applicationContext, + AppRoomDatabase::class.java, + "MyDatabase.db" + ).build() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainFragment.kt b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainFragment.kt new file mode 100644 index 0000000..2e92761 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainFragment.kt @@ -0,0 +1,49 @@ +package com.example.h_mal.messengerapp.ui.main + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.lifecycle.ViewModelProvider +import com.example.h_mal.messengerapp.R +import kotlinx.android.synthetic.main.main_fragment.* +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.InternalCoroutinesApi +import org.kodein.di.KodeinAware +import org.kodein.di.android.x.kodein +import org.kodein.di.generic.instance + +class MainFragment : Fragment(), KodeinAware { + override val kodein by kodein() + private val factory by instance() + + companion object { + fun newInstance() = MainFragment() + } + + + @InternalCoroutinesApi + @ExperimentalCoroutinesApi + private lateinit var viewModel: MainViewModel + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle?): View { + return inflater.inflate(R.layout.main_fragment, container, false) + } + + @InternalCoroutinesApi + @ExperimentalCoroutinesApi + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + + + viewModel = ViewModelProvider(this, factory).get(MainViewModel::class.java) + + + message.setOnClickListener { + viewModel.submitMessage("dsfsdfsdjf") + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainViewModel.kt b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainViewModel.kt new file mode 100644 index 0000000..eb8dd61 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainViewModel.kt @@ -0,0 +1,32 @@ +package com.example.h_mal.messengerapp.ui.main + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.example.h_mal.messengerapp.data.repository.Repository +import com.tinder.scarlet.Stream +import com.tinder.scarlet.WebSocket +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.InternalCoroutinesApi +import kotlinx.coroutines.channels.consumeEach +import kotlinx.coroutines.launch + + +@InternalCoroutinesApi +@ExperimentalCoroutinesApi +class MainViewModel( + private val repository: Repository +) : ViewModel() { + + init { + viewModelScope.launch { + repository.observeText().consumeEach { + Log.i("WebsocketOut", it) + } + } + } + + fun submitMessage(message: String){ + repository.submitMessage(message) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainViewModelFactory.kt b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainViewModelFactory.kt new file mode 100644 index 0000000..c2fe4cd --- /dev/null +++ b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainViewModelFactory.kt @@ -0,0 +1,27 @@ +package com.example.h_mal.messengerapp.ui.main + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import com.example.h_mal.messengerapp.data.repository.RepositoryImpl +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.InternalCoroutinesApi + +/** + * ViewModel provider factory to instantiate MainViewModel. + */ +class MainViewModelFactory( + private val repositoryImpl: RepositoryImpl +) : ViewModelProvider.Factory { + + @InternalCoroutinesApi + @ExperimentalCoroutinesApi + @Suppress("UNCHECKED_CAST") + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(MainViewModel::class.java)) { + return ( + MainViewModel(repositoryImpl) + ) as T + } + throw IllegalArgumentException("Unknown ViewModel class") + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml new file mode 100644 index 0000000..1dfb73b --- /dev/null +++ b/app/src/main/res/layout/main_activity.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/main_fragment.xml b/app/src/main/res/layout/main_fragment.xml new file mode 100644 index 0000000..1196542 --- /dev/null +++ b/app/src/main/res/layout/main_fragment.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a571e60 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..61da551 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c41dd28 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..db5080a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..6dba46d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..da31a87 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..15ac681 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b216f2d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f25a419 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e96783c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..4faecfa --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #6200EE + #3700B3 + #03DAC5 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..68d1041 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + MessengerApp + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..fac9291 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/example/h_mal/messengerapp/ExampleUnitTest.kt b/app/src/test/java/com/example/h_mal/messengerapp/ExampleUnitTest.kt new file mode 100644 index 0000000..a653bf1 --- /dev/null +++ b/app/src/test/java/com/example/h_mal/messengerapp/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.h_mal.messengerapp + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..71b78e0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,26 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext.kotlin_version = "1.3.72" + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:4.0.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4d15d01 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2fcf33e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Sep 15 15:00:04 BST 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..846197c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name = "MessengerApp" \ No newline at end of file