starred/Android-Kotlin-Modulerized-CleanArchitecture
1
0
Fork 0
mirror of https://github.com/melihaksoy/Android-Kotlin-Modulerized-CleanArchitecture.git synced 2026-04-01 15:13:10 +02:00
Code Issues 8 Packages Projects Releases Wiki Activity

Feature/styling (#36)

Browse Source 
* Working with material styles

* Replaced deprecated ViewModelProviders.of and applied base styles with material components

* Various code style fixes and styles.xml improvements
This commit is contained in:
Melih Aksoy
2019-09-13 14:09:28 +02:00
committed by GitHub
parent 5a10edce17
commit 99a2abf050
58 changed files with 523 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@@ -4,7 +4,6 @@ apply plugin: 'kotlin-kapt'
apply from: "$rootProject.projectDir/scripts/default_android_config.gradle"
apply from: "$rootProject.projectDir/scripts/sources.gradle"
apply from: "$rootProject.projectDir/scripts/flavors.gradle"
android {
defaultConfig {
@@ -26,7 +25,6 @@ dependencies {
implementation project(':features:launches')
implementation project(':features:detail')
implementation libraries.coroutines
implementation libraries.navigation
debugImplementation libraries.leakCanary
@@ -37,6 +35,7 @@ dependencies {
compileOnly libraries.retrofit
compileOnly libraries.room
compileOnly libraries.paging
compileOnly libraries.swipeRefreshLayout
// Need for proper renders in xml previews
compileOnly libraries.constraintLayout

8
app/src/main/kotlin/com/melih/rocketscience/MainActivity.kt
View File

@@ -1,24 +1,22 @@
package com.melih.rocketscience
import android.os.Bundle
import androidx.databinding.DataBindingUtil
import androidx.appcompat.widget.Toolbar
import androidx.navigation.NavController
import androidx.navigation.findNavController
import androidx.navigation.ui.NavigationUI
import com.melih.rocketscience.databinding.MainActivityBinding
import dagger.android.support.DaggerAppCompatActivity
class MainActivity : DaggerAppCompatActivity() {
private lateinit var binding: MainActivityBinding
private lateinit var navController: NavController
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
setContentView(R.layout.activity_main)
navController = findNavController(R.id.nav_host_fragment)
NavigationUI.setupWithNavController(binding.toolbar, navController)
NavigationUI.setupWithNavController(findViewById<Toolbar>(R.id.toolbar), navController)
}
override fun onSupportNavigateUp(): Boolean {

6
app/src/main/kotlin/com/melih/rocketscience/di/AppComponent.kt
View File

@@ -8,8 +8,10 @@ import dagger.android.AndroidInjector
@AppScope
@Component(
modules = [AndroidInjectionModule::class,
AppModule::class],
modules = [
AndroidInjectionModule::class,
AppModule::class
],
dependencies = [CoreComponent::class]
)

43
app/src/main/res/layout/activity_main.xml
View File

@@ -1,27 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:orientation="vertical">
<data class="MainActivityBinding" />
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:actionBarSize" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:actionBarSize"
android:background="@color/colorPrimary" />
<fragment
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:defaultNavHost="true"
app:navGraph="@navigation/nav_main" />
</LinearLayout>
</layout>
<fragment
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:defaultNavHost="true"
app:navGraph="@navigation/nav_main" />
</LinearLayout>