diff --git a/app/build.gradle b/app/build.gradle index ce4139f..16dd622 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,17 +47,18 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6' implementation 'androidx.core:core:1.2.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' implementation 'com.google.android.material:material:1.1.0' implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.afollestad:aesthetic:1.0.0-beta05' implementation 'com.afollestad.material-dialogs:core:3.3.0' implementation 'com.afollestad.material-dialogs:color:3.3.0' + implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0' implementation 'org.apache.commons:commons-lang3:3.10' diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt index 66b9148..c06d7a0 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt @@ -29,6 +29,7 @@ import android.view.ViewGroup import android.widget.ScrollView import androidx.fragment.app.Fragment import com.afollestad.materialdialogs.MaterialDialog +import com.afollestad.materialdialogs.bottomsheets.BottomSheet import com.google.android.material.floatingactionbutton.FloatingActionButton import kotlinx.android.synthetic.main.fragment_timetable.* import kotlinx.coroutines.* @@ -81,9 +82,9 @@ class TimeTableFragment : Fragment() { } faBtnAddLesson.setOnClickListener { - MaterialDialog(context!!) + MaterialDialog(context!!, BottomSheet()) .title(text = resources.getString(R.string.add_lesson)) - .message(text = "wähle einen Studiengang aus:\n\nWähle eine Vorlesung aus: \n\n Diese Funktion ist noch nicht verfügbar") + .message(text = "wähle einen Studiengang aus:\n\nWähle eine Vorlesung aus: \n\nDiese Funktion ist noch nicht verfügbar") .show() } diff --git a/app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml b/app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml new file mode 100644 index 0000000..ae3a6e5 --- /dev/null +++ b/app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layouts/fragments/layout/fragment_timetable.xml b/app/src/main/res/layouts/fragments/layout/fragment_timetable.xml index 94e22d4..668b906 100644 --- a/app/src/main/res/layouts/fragments/layout/fragment_timetable.xml +++ b/app/src/main/res/layouts/fragments/layout/fragment_timetable.xml @@ -22,11 +22,17 @@ android:id="@+id/linLayout_Timetable"/> + + android:layout_gravity="bottom|center|end" + android:layout_marginEnd="11dp" + android:layout_marginBottom="11dp" + android:clickable="true" + android:elevation="7dp" + android:focusable="true" + android:src="@drawable/icon_custom_black" + android:visibility="visible" /> \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc2..f3d88b1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4a6ebce..4c5803d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew.bat b/gradlew.bat index 24467a1..9109989 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"