github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-21 14:03:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Android Dependencies

Browse source
This commit is contained in:
Florian Märkl 2021-01-15 12:29:56 +01:00
commit e6af02a35c
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
5 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
android/app/build.gradle
View file

@ -94,19 +94,19 @@ androidExtensions {
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.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.preference:preference:1.1.0'
implementation 'com.google.android.material:material:1.1.0-beta02'
implementation 'androidx.preference:preference:1.1.1'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.2.0'
implementation "io.reactivex.rxjava2:rxjava:2.2.12"
implementation "io.reactivex.rxjava2:rxjava:2.2.20"
implementation "io.reactivex.rxjava2:rxkotlin:2.4.0"
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
def room_version = "2.2.4"
def room_version = "2.2.6"
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"

12
android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt
View file

@ -44,7 +44,6 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
private lateinit var viewModel: StreamViewModel
private val uiVisibilityHandler = Handler()
private val streamView: View get() = surfaceView
override fun onCreate(savedInstanceState: Bundle?)
{
@ -88,13 +87,7 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
showOverlay()
}
displayModeToggle.addOnButtonCheckedListener { _, checkedId, _ ->
// following 'if' is a workaround until selectionRequired for MaterialButtonToggleGroup
// comes out of alpha.
// See https://stackoverflow.com/questions/56164004/required-single-selection-on-materialbuttontogglegroup
if (displayModeToggle.checkedButtonId == -1)
displayModeToggle.check(checkedId)
displayModeToggle.addOnButtonCheckedListener { _, _, _ ->
adjustStreamViewAspect()
showOverlay()
}
@ -102,9 +95,6 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
//viewModel.session.attachToTextureView(textureView)
viewModel.session.attachToSurfaceView(surfaceView)
viewModel.session.state.observe(this, Observer { this.stateChanged(it) })
/*streamView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
adjustStreamViewAspect()
}*/
adjustStreamViewAspect()
if(Preferences(this).rumbleEnabled)

1
android/app/src/main/res/layout/activity_stream.xml
View file

@ -83,6 +83,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:singleSelection="true"
app:selectionRequired="true"
app:checkedButton="@id/display_mode_normal_button">
<com.google.android.material.button.MaterialButton