Skip to content

Commit

Permalink
reinit project
Browse files Browse the repository at this point in the history
  • Loading branch information
yebonkim committed Jun 24, 2022
1 parent 43fc2f2 commit 9bf04ce
Show file tree
Hide file tree
Showing 68 changed files with 493 additions and 1,406 deletions.
38 changes: 15 additions & 23 deletions .idea/misc.xml

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

9 changes: 0 additions & 9 deletions .idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

2 changes: 1 addition & 1 deletion app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/build
/build
60 changes: 31 additions & 29 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,44 +1,46 @@
apply plugin: 'com.android.application'
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
compileSdkVersion 28
compileSdk 32

defaultConfig {
applicationId "example.com.englishnote"
minSdkVersion 19
targetSdkVersion 28
applicationId "com.example.wordbook"
minSdk 21
targetSdk 32
versionCode 1
versionName "1.0"
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
buildFeatures {
dataBinding true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.room:room-runtime:2.1.0'
implementation 'androidx.room:room-rxjava2:2.1.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation "io.reactivex.rxjava2:rxjava:2.2.16"
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.jakewharton:butterknife:10.2.0'
implementation 'com.balysv.materialmenu:material-menu:1.5.4'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
annotationProcessor 'androidx.room:room-compiler:2.1.0'

implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.example.wordbook

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.wordbook", appContext.packageName)
}
}

This file was deleted.

19 changes: 11 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="example.com.englishnote">
xmlns:tools="http://schemas.android.com/tools"
package="com.example.wordbook">

<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
android:theme="@style/Theme.WordBook"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

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

<activity android:name=".EditVocaActivity" />
<activity android:name=".StudyActivity" />
<activity
android:name=".TestActivity"
android:launchMode="singleTop" />
<activity android:name=".TestActivity" />
<activity android:name=".VocaListActivity" />
<activity android:name=".EditVocaActivity" />
</application>

</manifest>
11 changes: 11 additions & 0 deletions app/src/main/java/com/example/wordbook/EditVocaActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.example.wordbook

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle

class EditVocaActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_edit_voca)
}
}
11 changes: 11 additions & 0 deletions app/src/main/java/com/example/wordbook/StudyActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.example.wordbook

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle

class StudyActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
}
}
11 changes: 11 additions & 0 deletions app/src/main/java/com/example/wordbook/TestActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.example.wordbook

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle

class TestActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
}
}
11 changes: 11 additions & 0 deletions app/src/main/java/com/example/wordbook/VocaListActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.example.wordbook

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle

class VocaListActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
}
}
30 changes: 0 additions & 30 deletions app/src/main/java/example/com/englishnote/ActionBarManager.java

This file was deleted.

Loading

0 comments on commit 9bf04ce

Please sign in to comment.