Skip to content

Commit

Permalink
Updated gradle and libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
TalbotGooday committed Mar 25, 2024
1 parent dea7c01 commit b34683f
Show file tree
Hide file tree
Showing 155 changed files with 170 additions and 67 deletions.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified .idea/.gitignore
100644 → 100755
Empty file.
Empty file modified .idea/.name
100644 → 100755
Empty file.
40 changes: 40 additions & 0 deletions .idea/appInsightsSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified .idea/jarRepositories.xml
100644 → 100755
Empty file.
6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified .idea/modules.xml
100644 → 100755
Empty file.
Empty file modified .idea/vcs.xml
100644 → 100755
Empty file.
Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
36 changes: 24 additions & 12 deletions app/build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'
plugins {
id("com.android.application")
id("kotlin-android")
}


android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.gapps.videonoapi"
compileSdk 34
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}

buildTypes {
release {
minifyEnabled false
Expand All @@ -24,21 +25,32 @@ android {
buildFeatures {
viewBinding true
}

compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}

namespace "com.gapps.videonoapi"
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.12.0'

implementation 'com.squareup.okhttp3:okhttp:4.10.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

//Gson
implementation(project(':embedded_video_lib'))

implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation("io.coil-kt:coil:2.3.0")
implementation("io.coil-kt:coil-gif:2.3.0")
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation("io.coil-kt:coil:2.5.0")
implementation("io.coil-kt:coil-gif:2.4.0")
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
}
Empty file modified app/proguard-rules.pro
100644 → 100755
Empty file.
Empty file.
4 changes: 1 addition & 3 deletions app/src/main/AndroidManifest.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<activity
android:name=".ui.main.MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -28,8 +27,7 @@
</activity>
<activity
android:name=".ui.text.TextActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" />
</application>

</manifest>
</manifest>
Empty file modified app/src/main/java/com/gapps/videonoapi/app/App.kt
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions app/src/main/java/com/gapps/videonoapi/ui/base/BaseActivity.kt
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ abstract class BaseActivity : AppCompatActivity() {
)
)
setProgressView(TextView(this@BaseActivity).apply {
text = "Loading"; setTextColor(-1)
text = "Loading"
setTextColor(-1)
})
show()
}
Expand All @@ -81,4 +82,4 @@ abstract class BaseActivity : AppCompatActivity() {
e.printStackTrace()
}
}
}
}
Empty file modified app/src/main/java/com/gapps/videonoapi/ui/main/MainActivity.kt
100644 → 100755
Empty file.
Empty file.
Empty file modified app/src/main/java/com/gapps/videonoapi/ui/text/TextActivity.kt
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified app/src/main/java/com/gapps/videonoapi/utils/extensions/View.kt
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified app/src/main/res/drawable-v24/ic_launcher_foreground.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable-v24/ic_play.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable-xxhdpi/dailymotion.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/hulu.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/ibm.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/loom.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/rutube.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/streamable.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/ted_talks.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/vimeo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/youtube.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable-xxhdpi/youtube_music.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable/bg_action_button_image.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_arrow_drop.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_arrow_forward.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_coub.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_fb.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_launcher_background.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_refresh.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_video.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_vzaar.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/ic_wistia.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/drawable/image_shop_1.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/drawable/ultimedia.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/layout/activity_main.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/layout/activity_text.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/layout/item_video.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/menu/menu_main.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/values/colors.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/values/dimens.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/values/strings.xml
100644 → 100755
Empty file.
Empty file modified app/src/main/res/values/styles.xml
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.8.0'
ext.kotlin_version = '1.9.21'

repositories {
google()
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:7.4.2"
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
38 changes: 24 additions & 14 deletions embedded_video_lib/build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
plugins {
id("com.android.library")
id("kotlin-android")
}

android {
defaultConfig {
minSdkVersion 19
targetSdkVersion 33
versionCode 1
versionName "1.0"
compileSdk 34
minSdkVersion 21
targetSdkVersion 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
Expand All @@ -25,19 +24,30 @@ android {
buildFeatures {
viewBinding true
}

compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}

namespace "com.gapps.library"
}

dependencies {
//AndroidX
api 'androidx.appcompat:appcompat:1.6.1'
api 'com.google.android.material:material:1.8.0'
api 'androidx.core:core-ktx:1.10.0'
api 'com.google.android.material:material:1.11.0'
api 'androidx.core:core-ktx:1.12.0'

//Gson
api 'com.google.code.gson:gson:2.9.0'
api 'com.google.code.gson:gson:2.10.1'
//Coroutines
api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'

//OkHttp
api 'com.squareup.okhttp3:okhttp:4.10.0'
api 'com.squareup.okhttp3:okhttp:4.12.0'
}
Empty file modified embedded_video_lib/consumer-rules.pro
100644 → 100755
Empty file.
Empty file modified embedded_video_lib/proguard-rules.pro
100644 → 100755
Empty file.
Empty file.
3 changes: 1 addition & 2 deletions embedded_video_lib/src/main/AndroidManifest.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gapps.library">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" >

<uses-permission android:name="android.permission.INTERNET" />

Expand Down
Empty file modified embedded_video_lib/src/main/java/com/gapps/library/api/Const.kt
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class BottomSheetDialogFixed : BottomSheetDialog {
super.onCreate(savedInstanceState)

window?.run {
findViewById<View>(R.id.container)?.fitsSystemWindows = false
findViewById<View>(R.id.coordinator)?.fitsSystemWindows = false
findViewById<View>(com.google.android.material.R.id.container)?.fitsSystemWindows = false
findViewById<View>(com.google.android.material.R.id.coordinator)?.fitsSystemWindows = false
}

findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)?.let {
Expand All @@ -44,4 +44,4 @@ class BottomSheetDialogFixed : BottomSheetDialog {
behavior.setState(BottomSheetBehavior.STATE_EXPANDED)
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.appcompat.widget.AppCompatImageButton
import androidx.core.content.ContextCompat
import androidx.core.graphics.ColorUtils
import androidx.core.view.ViewCompat
import androidx.core.view.isVisible
import androidx.core.view.updatePadding
import com.gapps.library.R
import com.gapps.library.ui.bottom_dialog.BottomSheetDialogFixed
Expand Down Expand Up @@ -109,11 +110,13 @@ class BottomVideoController private constructor(
title.apply {
this.setTextColor(titleColor)
this.text = titleText
this.isVisible = titleText?.isNotEmpty() == true
}

videoServiceType.apply {
this.setTextColor(textColor)
this.text = hostText
this.isVisible = hostText?.isNotEmpty() == true
}

leftButton.apply {
Expand Down Expand Up @@ -353,4 +356,4 @@ class BottomVideoController private constructor(

fun show() = BottomVideoController(this).show()
}
}
}
Empty file modified embedded_video_lib/src/main/java/com/gapps/library/utils/MD5.kt
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified embedded_video_lib/src/main/res/drawable/ic_vna_play_icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified embedded_video_lib/src/main/res/values-w600dp/dimens.xml
100644 → 100755
Empty file.
Empty file modified embedded_video_lib/src/main/res/values/colors.xml
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions embedded_video_lib/src/main/res/values/dimens.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="vna_large_text_space">10dp</dimen>
<dimen name="vna_large_text_space">16dp</dimen>
<dimen name="vna_medium_text_space">4dp</dimen>
<dimen name="vna_bv_dialog_width">0dp</dimen>
<dimen name="vna_control_panel_height">48dp</dimen>
<dimen name="vna_copy_icon_size">35dp</dimen>
<dimen name="vna_copy_icon_margin">18dp</dimen>
<dimen name="vna_host_text_size">14sp</dimen>
<dimen name="vna_title_text_size">16sp</dimen>
<dimen name="vna_web_view_default_height">195dp</dimen>
</resources>
</resources>
Empty file modified embedded_video_lib/src/main/res/values/strings.xml
100644 → 100755
Empty file.
Empty file modified embedded_video_lib/src/main/res/values/styles.xml
100644 → 100755
Empty file.
Empty file.
1 change: 1 addition & 0 deletions gradle.properties
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
-Dorg.gradle.logging.level=debug
android.nonTransitiveRClass=false
Binary file modified gradle/wrapper/gradle-wrapper.jar
100644 → 100755
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b34683f

Please sign in to comment.