Browse Source

update gradle, constraintlayout & coroutines

* gradle 6.2.1 -> 6.4
* constraintlayout 2.0.0-beta4 -> 2.0.0-beta6
* coroutines 1.3.5 -> 1.3.6
develop
Jannik Seiler 2 weeks ago
parent
commit
bc09e33147
Signed by: Seil0 <seil0@mosad.xyz> GPG Key ID: E8459F3723C52C24
7 changed files with 28 additions and 9 deletions
  1. +3
    -2
      app/build.gradle
  2. +3
    -2
      app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
  3. +8
    -0
      app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml
  4. +10
    -4
      app/src/main/res/layouts/fragments/layout/fragment_timetable.xml
  5. BIN
      gradle/wrapper/gradle-wrapper.jar
  6. +1
    -1
      gradle/wrapper/gradle-wrapper.properties
  7. +3
    -0
      gradlew.bat

+ 3
- 2
app/build.gradle View File

@@ -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'


+ 3
- 2
app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt View File

@@ -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()
}



+ 8
- 0
app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/linLayout_addlesson"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

</LinearLayout>

+ 10
- 4
app/src/main/res/layouts/fragments/layout/fragment_timetable.xml View File

@@ -22,11 +22,17 @@
android:id="@+id/linLayout_Timetable"/>
</ScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:src="@drawable/icon_custom_black"
android:id="@+id/faBtnAddLesson"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true" android:id="@+id/faBtnAddLesson" android:elevation="7dp"
android:visibility="gone" android:layout_gravity="bottom|center|end" android:layout_marginEnd="11dp"
android:layout_marginBottom="11dp" android:focusable="true"/>
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" />
</FrameLayout>

BIN
gradle/wrapper/gradle-wrapper.jar View File


+ 1
- 1
gradle/wrapper/gradle-wrapper.properties View File

@@ -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

+ 3
- 0
gradlew.bat View File

@@ -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"


Loading…
Cancel
Save