From 3df8f8930ab7a0c831305ed5010d3405b8328918 Mon Sep 17 00:00:00 2001 From: Arif Date: Thu, 5 Nov 2020 09:11:08 +0700 Subject: [PATCH] Update Android Studio 4.1 --- .gitignore | 2 ++ MySimpleCleanArchitecture/app/build.gradle | 33 ++++++++++++------- .../app/src/main/AndroidManifest.xml | 2 +- .../presentation/MainActivity.kt | 6 ++-- .../app/src/main/res/values-night/themes.xml | 16 +++++++++ .../app/src/main/res/values/colors.xml | 12 ++++--- .../app/src/main/res/values/styles.xml | 11 ------- .../app/src/main/res/values/themes.xml | 16 +++++++++ MySimpleCleanArchitecture/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 4 +-- 10 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 MySimpleCleanArchitecture/app/src/main/res/values-night/themes.xml delete mode 100644 MySimpleCleanArchitecture/app/src/main/res/values/styles.xml create mode 100644 MySimpleCleanArchitecture/app/src/main/res/values/themes.xml diff --git a/.gitignore b/.gitignore index 69ab256..800591d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ MyCustomLint/.idea/ + +MySimpleCleanArchitecture/.idea/ diff --git a/MySimpleCleanArchitecture/app/build.gradle b/MySimpleCleanArchitecture/app/build.gradle index 31fdb2e..cfa532d 100644 --- a/MySimpleCleanArchitecture/app/build.gradle +++ b/MySimpleCleanArchitecture/app/build.gradle @@ -1,10 +1,11 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'kotlin-android' +} android { compileSdkVersion 30 - buildToolsVersion "29.0.3" + buildToolsVersion "30.0.2" defaultConfig { applicationId "com.dicoding.mysimplecleanarchitecture" @@ -23,17 +24,25 @@ android { } } + 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-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.3.1' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' testImplementation "org.mockito:mockito-core:3.3.1" testImplementation "org.mockito:mockito-inline:3.2.4" diff --git a/MySimpleCleanArchitecture/app/src/main/AndroidManifest.xml b/MySimpleCleanArchitecture/app/src/main/AndroidManifest.xml index 0010ca6..60369c8 100644 --- a/MySimpleCleanArchitecture/app/src/main/AndroidManifest.xml +++ b/MySimpleCleanArchitecture/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/Theme.MySimpleCleanArchitecture"> diff --git a/MySimpleCleanArchitecture/app/src/main/java/com/dicoding/mysimplecleanarchitecture/presentation/MainActivity.kt b/MySimpleCleanArchitecture/app/src/main/java/com/dicoding/mysimplecleanarchitecture/presentation/MainActivity.kt index adeb50a..57a392f 100644 --- a/MySimpleCleanArchitecture/app/src/main/java/com/dicoding/mysimplecleanarchitecture/presentation/MainActivity.kt +++ b/MySimpleCleanArchitecture/app/src/main/java/com/dicoding/mysimplecleanarchitecture/presentation/MainActivity.kt @@ -2,10 +2,10 @@ package com.dicoding.mysimplecleanarchitecture.presentation import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.widget.TextView import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import com.dicoding.mysimplecleanarchitecture.R -import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { @@ -13,12 +13,14 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + val tvWelcome = findViewById(R.id.tv_welcome) + val factory = MainViewModelFactory.getInstance() val viewModel = ViewModelProvider(this, factory)[MainViewModel::class.java] viewModel.setName("Dicoding") viewModel.message.observe(this, Observer { - tv_welcome.text = it.welcomeMessage + tvWelcome.text = it.welcomeMessage }) } } diff --git a/MySimpleCleanArchitecture/app/src/main/res/values-night/themes.xml b/MySimpleCleanArchitecture/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..20ebabf --- /dev/null +++ b/MySimpleCleanArchitecture/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/MySimpleCleanArchitecture/app/src/main/res/values/colors.xml b/MySimpleCleanArchitecture/app/src/main/res/values/colors.xml index 030098f..f8c6127 100644 --- a/MySimpleCleanArchitecture/app/src/main/res/values/colors.xml +++ b/MySimpleCleanArchitecture/app/src/main/res/values/colors.xml @@ -1,6 +1,10 @@ - #6200EE - #3700B3 - #03DAC5 - + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/MySimpleCleanArchitecture/app/src/main/res/values/styles.xml b/MySimpleCleanArchitecture/app/src/main/res/values/styles.xml deleted file mode 100644 index 5885930..0000000 --- a/MySimpleCleanArchitecture/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/MySimpleCleanArchitecture/app/src/main/res/values/themes.xml b/MySimpleCleanArchitecture/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..811cea9 --- /dev/null +++ b/MySimpleCleanArchitecture/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/MySimpleCleanArchitecture/build.gradle b/MySimpleCleanArchitecture/build.gradle index 2341922..3c7b55a 100644 --- a/MySimpleCleanArchitecture/build.gradle +++ b/MySimpleCleanArchitecture/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' + ext.kotlin_version = '1.4.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/MySimpleCleanArchitecture/gradle/wrapper/gradle-wrapper.properties b/MySimpleCleanArchitecture/gradle/wrapper/gradle-wrapper.properties index 60f593d..9295f9e 100644 --- a/MySimpleCleanArchitecture/gradle/wrapper/gradle-wrapper.properties +++ b/MySimpleCleanArchitecture/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 15 15:01:54 ICT 2020 +#Wed Nov 04 14:05:28 ICT 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 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip