diff --git a/app/debug/app-debug.aab b/app/debug/app-debug.aab deleted file mode 100644 index f5c0e2b..0000000 Binary files a/app/debug/app-debug.aab and /dev/null differ diff --git a/app/release/app-release.aab b/app/release/app-release.aab deleted file mode 100644 index f0e2a41..0000000 Binary files a/app/release/app-release.aab and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c491531..e000ff3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/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.NoActionBar"> + android:theme="@style/AppTheme"> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index dee9210..57f97d2 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/taymath/tutortoolkit/MainActivity.kt b/app/src/main/java/com/taymath/tutortoolkit/MainActivity.kt index 1d463f7..0a47d05 100644 --- a/app/src/main/java/com/taymath/tutortoolkit/MainActivity.kt +++ b/app/src/main/java/com/taymath/tutortoolkit/MainActivity.kt @@ -2,16 +2,17 @@ package com.taymath.tutortoolkit import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.databinding.DataBindingUtil +import androidx.drawerlayout.widget.DrawerLayout /** * This main activity is just a container for our fragments, * where the real action is. */ class MainActivity : AppCompatActivity() { - + private lateinit var drawerLayout: DrawerLayout override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) } } diff --git a/app/src/main/res/drawable-v24/ic_item_test.xml b/app/src/main/res/drawable-v24/ic_item_test.xml deleted file mode 100644 index da1dcd9..0000000 --- a/app/src/main/res/drawable-v24/ic_item_test.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ 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 deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 73c4f2d..07fc0ed 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,12 +5,30 @@ - + android:layout_width="match_parent"> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/navdrawer_menu.xml b/app/src/main/res/menu/navdrawer_menu.xml new file mode 100644 index 0000000..f5555fd --- /dev/null +++ b/app/src/main/res/menu/navdrawer_menu.xml @@ -0,0 +1,6 @@ + + + + + + \ 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 index 090e20c..383ee98 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 1d8c3bb..2aba7fc 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.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 index 769cd8c..f188af0 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png 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 index a64adc4..1b273e6 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 65bd81c..79bb6b6 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.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 index b3f4ae4..5dadd3b 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png 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 index 4c04cab..240ad4c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 6b1d5f3..2532cf1 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.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 index e554044..e9ca870 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png 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 index dfbfbf1..53d4e5f 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index aefd87a..6136c59 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.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 index 760df6b..3e6e0e9 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png 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 index 372b657..6737928 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index b5aff02..65b9aa6 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.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 index d933af7..bf14605 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/test/java/com/taymath/tutortoolkit/ExampleUnitTest.kt b/app/src/test/java/com/taymath/tutortoolkit/ExampleUnitTest.kt index 876c9e7..d5da99f 100644 --- a/app/src/test/java/com/taymath/tutortoolkit/ExampleUnitTest.kt +++ b/app/src/test/java/com/taymath/tutortoolkit/ExampleUnitTest.kt @@ -1,19 +1,8 @@ package com.taymath.tutortoolkit -import androidx.room.Room -import androidx.test.platform.app.InstrumentationRegistry -import com.taymath.tutortoolkit.database.Grade -import com.taymath.tutortoolkit.database.StudentDatabase -import com.taymath.tutortoolkit.database.StudentDatabaseDao -import org.hamcrest.CoreMatchers.equalTo -import org.junit.After import org.junit.Test import org.junit.Assert.* -import org.junit.Before -import org.junit.runner.RunWith -import org.junit.runners.JUnit4 -import java.io.IOException /** * Example local unit test, which will execute on the development machine (host). @@ -26,33 +15,3 @@ class ExampleUnitTest { assertEquals(4, 2 + 2) } } - -@RunWith(JUnit4::class) -class SimpleEntityReadWriteTest { - private lateinit var userDao: StudentDatabaseDao - private lateinit var db: StudentDatabase - - @Before - fun createDb() { - val context = InstrumentationRegistry.getInstrumentation().getTargetContext() - db = Room.inMemoryDatabaseBuilder( - context, StudentDatabase::class.java - ).build() - userDao = db.studentDatabaseDao - } - - @After - @Throws(IOException::class) - fun closeDb() { - db.close() - } - - @Test - @Throws(Exception::class) - fun writeUserAndReadInList() { - val grade: Grade = Grade() - userDao.insertGrade(grade) - val byName = userDao.getGrade() - assertThat(byName, equalTo(grade)) - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index f7a2900..119c1f5 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { repositories { google() jcenter() - + } dependencies { classpath 'com.android.tools.build:gradle:3.6.2' @@ -32,10 +32,10 @@ allprojects { repositories { google() jcenter() - + } } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb40496..0cf7c9d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Fri Apr 10 13:29:17 PDT 2020 +#Wed Apr 29 12:31:28 PDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME