Skip to content

update code #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 16 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,46 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'


android {
compileSdkVersion 29
buildToolsVersion "29.0.2"
buildToolsVersion "29.0.3"

defaultConfig {
applicationId "com.codingblocks.todo"
applicationId "com.example.todoapp"
minSdkVersion 23
targetSdkVersion 29
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
}

ext {
ankoVersion = '0.10.6'
room_version = "2.2.1"
}

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.1.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'


//database
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-runtime:2.2.3"
implementation "androidx.room:room-ktx:2.2.3"
kapt "androidx.room:room-compiler:2.2.3"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.codingblocks.todo
package com.example.todoapp

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand All @@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.codingblocks.todo", appContext.packageName)
assertEquals("com.example.todoapp", appContext.packageName)
}
}
11 changes: 2 additions & 9 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.codingblocks.todo">
package="com.example.todoapp">

<application
android:allowBackup="true"
Expand All @@ -10,21 +10,14 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".HistoryActivity"></activity>
<activity
android:name=".NewTaskActivity"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity" />
<activity android:name=".TaskActivity" />
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<receiver
android:name=".AlarmReceiver"
android:enabled="true" />
</application>

</manifest>
78 changes: 0 additions & 78 deletions app/src/main/java/com/codingblocks/todo/AlarmReceiver.kt

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/java/com/codingblocks/todo/AppDatabase.kt

This file was deleted.

16 changes: 0 additions & 16 deletions app/src/main/java/com/codingblocks/todo/Constants.kt

This file was deleted.

44 changes: 0 additions & 44 deletions app/src/main/java/com/codingblocks/todo/HistoryActivity.kt

This file was deleted.

Loading