Skip to content

Commit 16f8a96

Browse files
committed
temp
1 parent 9bf8ad3 commit 16f8a96

File tree

83 files changed

+3391
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+3391
-137
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
jcenter()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.4.2'
11+
classpath 'com.android.tools.build:gradle:8.0.2'
1212
classpath 'com.google.gms:google-services:3.2.0'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
// NOTE: Do not place your application dependencies here; they belong

core/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ apply plugin: 'kotlin-parcelize'
66
android {
77
compileSdkVersion rootProject.compileSdkVersion
88
buildToolsVersion rootProject.buildToolsVersion
9+
namespace 'in.testpress'
910

1011
defaultConfig {
1112
minSdkVersion rootProject.minSdkVersion
@@ -40,12 +41,12 @@ android {
4041
}
4142

4243
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_1_8
44-
targetCompatibility JavaVersion.VERSION_1_8
44+
sourceCompatibility JavaVersion.VERSION_17
45+
targetCompatibility JavaVersion.VERSION_17
4546
}
4647

4748
kotlinOptions {
48-
jvmTarget = JavaVersion.VERSION_1_8.toString()
49+
jvmTarget = JavaVersion.VERSION_17.toString()
4950
}
5051

5152
packagingOptions {

core/src/main/res/values/strings.xml

Lines changed: 271 additions & 0 deletions
Large diffs are not rendered by default.

course/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android'
44
android {
55
compileSdkVersion rootProject.compileSdkVersion
66
buildToolsVersion rootProject.buildToolsVersion
7+
namespace 'in.testpress.course'
78

89
defaultConfig {
910
minSdkVersion rootProject.minSdkVersion
@@ -26,11 +27,11 @@ android {
2627
unitTests.includeAndroidResources = true
2728
}
2829
compileOptions {
29-
sourceCompatibility 1.8
30-
targetCompatibility 1.8
30+
sourceCompatibility JavaVersion.VERSION_17
31+
targetCompatibility JavaVersion.VERSION_17
3132
}
3233
kotlinOptions {
33-
jvmTarget = JavaVersion.VERSION_1_8.toString()
34+
jvmTarget = JavaVersion.VERSION_17.toString()
3435
}
3536
buildFeatures {
3637
viewBinding true

course/src/main/java/in/testpress/course/fragments/LiveStreamFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class LiveStreamFragment : BaseContentDetailFragment(), LiveStreamCallbackListen
8888
exoPlayerView = view!!.findViewById(R.id.exo_player_main_frame)
8989
exoPlayerView.visibility = View.VISIBLE
9090
exoPlayerView.setAspectRatio(16f / 9f)
91-
exoPlayerView.findViewById<TextView>(R.id.exo_duration).visibility = View.GONE
91+
//exoPlayerView.findViewById<TextView>(R.id.exo_duration).visibility = View.GONE
9292
exoPlayerView.findViewById<RelativeLayout>(R.id.live_label).visibility = View.VISIBLE
9393
}
9494

course/src/main/java/in/testpress/course/ui/VideoDownloadQualityChooserDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class VideoDownloadQualityChooserDialog(val content: DomainContent) : DialogFrag
6161
}
6262

6363
private fun initializeTrackSelectionView(view: View) {
64-
trackSelectionView = view.findViewById(R.id.exo_track_selection_view)
64+
trackSelectionView = view.findViewById(com.google.android.exoplayer2.ui.R.id.exo_track_selection_view)
6565
trackSelectionView.setShowDisableOption(false)
6666
trackSelectionView.setAllowAdaptiveSelections(false)
6767
trackSelectionView.setAllowMultipleOverrides(false)

course/src/main/java/in/testpress/course/util/TrackSelectionDialog.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package `in`.testpress.course.util
22

3-
import `in`.testpress.course.R
3+
44
import `in`.testpress.course.databinding.LayoutDocumentViewerBinding
55
import `in`.testpress.course.databinding.TrackSelectionDialogBinding
66
import android.app.Dialog
@@ -15,6 +15,7 @@ import com.google.android.exoplayer2.C
1515
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
1616
import com.google.android.exoplayer2.trackselection.MappingTrackSelector
1717
import com.google.android.exoplayer2.ui.TrackSelectionView
18+
import `in`.testpress.course.R
1819

1920
open class TrackSelectionDialog(
2021
private val parameters: DefaultTrackSelector.Parameters,
@@ -68,7 +69,7 @@ open class TrackSelectionDialog(
6869
}
6970

7071
private fun initializeTrackSelectionView(view: View) {
71-
trackSelectionView = view.findViewById(R.id.exo_track_selection_view)
72+
trackSelectionView = view.findViewById(com.google.android.exoplayer2.ui.R.id.exo_track_selection_view)
7273
trackSelectionView.setShowDisableOption(false)
7374
trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections)
7475
trackSelectionView.setAllowMultipleOverrides(false)
1.49 KB
Loading
342 Bytes
Loading
392 Bytes
Loading

0 commit comments

Comments
 (0)