Skip to content

Commit 23b0eed

Browse files
committed
Update version
1 parent 12602ed commit 23b0eed

File tree

8 files changed

+86
-13
lines changed

8 files changed

+86
-13
lines changed

app/build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ android {
1414
versionName "1.0"
1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
multiDexEnabled true
17+
18+
kapt {
19+
arguments {
20+
arg("room.schemaLocation", "$projectDir/schemas")
21+
}
22+
}
1723
// splits {
1824
// abi {
1925
// enable true
@@ -76,7 +82,7 @@ android {
7682

7783
dependencies {
7884
implementation fileTree(dir: 'libs', include: ['*.jar'])
79-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10"
85+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0"
8086
implementation 'androidx.appcompat:appcompat:1.6.1'
8187
implementation 'com.android.support:design:33.0.0'
8288
implementation 'com.google.android.material:material:1.8.0'
@@ -181,9 +187,9 @@ dependencies {
181187
implementation 'com.github.gcacace:signature-pad:1.3.1'
182188
implementation 'com.github.clans:fab:1.6.4'
183189
implementation files('libs/itextpdf-5.4.3.jar')
184-
implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
190+
implementation 'com.google.android.exoplayer:exoplayer:2.18.4'
185191
// for PIP
186-
implementation 'com.google.android.exoplayer:extension-mediasession:2.17.1'
192+
implementation 'com.google.android.exoplayer:extension-mediasession:2.18.4'
187193
// implementation 'com.github.recruit-lifestyle:WaveSwipeRefreshLayout:1.6'
188194
// ripple effect animation
189195
implementation 'com.skyfishjy.ripplebackground:library:1.0.1'
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 1,
5+
"identityHash": "c18ae15642cb191698f798e4e356ce99",
6+
"entities": [
7+
{
8+
"tableName": "user_info",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `nickname` TEXT, `mobileno` TEXT, `email` TEXT, `password` TEXT)",
10+
"fields": [
11+
{
12+
"fieldPath": "id",
13+
"columnName": "id",
14+
"affinity": "INTEGER",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "name",
19+
"columnName": "name",
20+
"affinity": "TEXT",
21+
"notNull": false
22+
},
23+
{
24+
"fieldPath": "nickname",
25+
"columnName": "nickname",
26+
"affinity": "TEXT",
27+
"notNull": false
28+
},
29+
{
30+
"fieldPath": "mobileno",
31+
"columnName": "mobileno",
32+
"affinity": "TEXT",
33+
"notNull": false
34+
},
35+
{
36+
"fieldPath": "email",
37+
"columnName": "email",
38+
"affinity": "TEXT",
39+
"notNull": false
40+
},
41+
{
42+
"fieldPath": "password",
43+
"columnName": "password",
44+
"affinity": "TEXT",
45+
"notNull": false
46+
}
47+
],
48+
"primaryKey": {
49+
"autoGenerate": true,
50+
"columnNames": [
51+
"id"
52+
]
53+
},
54+
"indices": [],
55+
"foreignKeys": []
56+
}
57+
],
58+
"views": [],
59+
"setupQueries": [
60+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
61+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c18ae15642cb191698f798e4e356ce99')"
62+
]
63+
}
64+
}

app/src/main/java/com/webaddicted/kotlinproject/global/sociallogin/SocialLogin.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ import android.app.Activity
44
import android.content.Context
55
import android.content.Intent
66
import android.util.Log
7-
import androidx.annotation.NonNull
87
import com.google.firebase.FirebaseApp
98
import com.google.firebase.auth.FirebaseAuth
10-
import com.webaddicted.kotlinproject.R
119
import com.webaddicted.kotlinproject.global.sociallogin.auth.FacebookAuth
1210
import com.webaddicted.kotlinproject.global.sociallogin.auth.GoogleAuth
1311
import com.webaddicted.kotlinproject.global.sociallogin.auth.TwitterAuth
@@ -65,9 +63,9 @@ class SocialLogin {
6563
}
6664

6765
fun googleLogin(
68-
@NonNull activity: Activity,
69-
@NonNull clientId: String?,
70-
@NonNull loginResponse: OnSocialLoginListener?
66+
activity: Activity,
67+
clientId: String?,
68+
loginResponse: OnSocialLoginListener?
7169
){
7270
GoogleAuth.googleLogin(
7371
activity,
@@ -82,10 +80,10 @@ class SocialLogin {
8280
FacebookAuth.fbLogin(activity, loginResponse)
8381
}
8482
fun twitterLogin(
85-
@NonNull activity: Activity,
86-
@NonNull twitter_consumer_key: String?,
87-
@NonNull twitter_consumer_secret: String?,
88-
@NonNull loginResponse: OnSocialLoginListener?
83+
activity: Activity,
84+
twitter_consumer_key: String?,
85+
twitter_consumer_secret: String?,
86+
loginResponse: OnSocialLoginListener?
8987
) {
9088
TwitterAuth.twitterLogin(
9189
activity,
@@ -118,6 +116,7 @@ class SocialLogin {
118116
resultCode,
119117
data
120118
)
119+
else -> {}
121120
}
122121
} else {
123122
Log.d("TAG", "onActivityResult: login Failed")

app/src/main/java/com/webaddicted/kotlinproject/view/base/BaseFcmFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ abstract class BaseFcmFragment (private val layoutId: Int) : Fragment(), View.On
7777
ValidationHelper.showSnackBar(view, response.errorMessage!!)
7878
else activity?.showToast(getString(R.string.something_went_wrong))
7979
}
80+
else -> { hideApiLoader()}
8081
}
8182
}
8283

app/src/main/java/com/webaddicted/kotlinproject/view/fcmkit/FcmEmailAuthFrm.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ class FcmEmailAuthFrm : BaseFragment(R.layout.frm_fcm_email_auth) {
190190
GlobalUtility.showToast("message successfully sent")
191191
else GlobalUtility.showToast(getString(R.string.something_went_wrong)+response.toString())
192192
}
193+
else -> { hideApiLoader()}
193194
}
194195
}
195196
}

app/src/main/java/com/webaddicted/kotlinproject/view/fragment/FabButtonFrm.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class FabButtonFrm : BaseFragment(R.layout.frm_fab_btn) {
105105
mBinding.fabProgress.setIndeterminate(true)
106106
mProgressTypes!!.offer(ProgressType.PROGRESS_NO_BACKGROUND)
107107
}
108+
else -> { hideApiLoader()}
108109
}
109110
}
110111

app/src/main/java/com/webaddicted/kotlinproject/view/fragment/NewsFrm.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ class NewsFrm : BaseFragment(R.layout.frm_news) {
111111
mBinding.txtNoDataFound.visible()
112112
else mBinding.txtNoDataFound.gone()
113113
}
114+
else -> { hideApiLoader()}
114115
}
115116
}
116117

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ buildscript {
2727
classpath 'com.android.tools.build:gradle:7.4.2'
2828
classpath 'com.google.gms:google-services:4.3.15'
2929
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
30-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
30+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
3131
}
3232

3333
}

0 commit comments

Comments
 (0)