Skip to content

Commit 0ab32e6

Browse files
aggarwalpulkit596aggarwalpulkit596
committed
add ktlint check to actions
1 parent 84b1672 commit 0ab32e6

File tree

167 files changed

+1476
-1255
lines changed

Some content is hidden

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

167 files changed

+1476
-1255
lines changed

‎.github/workflows/Build.yml

Lines changed: 56 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,52 @@
1-
name: Build
2-
on: [pull_request]
1+
name: CI Lint and Tests
2+
3+
# Controls when the action will run. Triggers the workflow on pull request
4+
# events or push events in the develop branch.
5+
on:
6+
pull_request:
7+
push:
8+
branches:
9+
# Push events on develop branch
10+
- develop
311

412
jobs:
13+
linters:
14+
name: Lint Tests
15+
runs-on: ${{ matrix.os }}
16+
strategy:
17+
matrix:
18+
os: [ubuntu-18.04]
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
23+
- name: Download Ktlint
24+
run: |
25+
KTLINT="0.37.0"
26+
echo Using Ktlint $KTLINT
27+
curl -sSLO https://github.com/pinterest/ktlint/releases/download/$KTLINT/ktlint
28+
chmod a+x ktlint
29+
30+
- name: Kotlin lint check
31+
run: ./ktlint --android onlineapi/src/**/*.kt app/src/**/*.kt && echo "Lint completed successfully"
532
test:
633
name: Run Unit Tests
7-
runs-on: ubuntu-18.04
8-
34+
runs-on: ${{ matrix.os }}
35+
strategy:
36+
matrix:
37+
os: [ubuntu-18.04]
938
steps:
10-
- uses: actions/checkout@v1
11-
- name: set up JDK 1.8
39+
- uses: actions/checkout@v2
40+
41+
- uses: actions/cache@v2
42+
with:
43+
path: ~/.gradle/caches
44+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-jars-{{ checksum "build.gradle" }}
45+
46+
- name: Set up JDK 1.9
1247
uses: actions/setup-java@v1
1348
with:
14-
java-version: 1.8
49+
java-version: 1.9
1550

1651
- name: Grant Permission to Execute
1752
run: chmod +x gradlew
@@ -21,14 +56,22 @@ jobs:
2156

2257
apk:
2358
name: Generate APK
24-
runs-on: ubuntu-18.04
25-
59+
runs-on: ${{ matrix.os }}
60+
strategy:
61+
matrix:
62+
os: [ubuntu-18.04]
2663
steps:
27-
- uses: actions/checkout@v1
28-
- name: set up JDK 1.8
64+
- uses: actions/checkout@v2
65+
66+
- uses: actions/cache@v2
67+
with:
68+
path: ~/.gradle/caches
69+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-jars-{{ checksum "build.gradle" }}
70+
71+
- name: Set up JDK 1.9
2972
uses: actions/setup-java@v1
3073
with:
31-
java-version: 1.8
74+
java-version: 1.9
3275

3376
- name: Grant Permission to Execute
3477
run: chmod +x gradlew
@@ -39,7 +82,7 @@ jobs:
3982
- name: Build debug APK
4083
run: bash ./gradlew assembleDebug --stacktrace
4184
- name: Upload APK
42-
uses: actions/upload-artifact@v1
85+
uses: actions/upload-artifact@v2
4386
with:
4487
name: app
4588
path: app/build/outputs/apk/debug/app-debug.apk

‎.idea/codeStyles/codeStyleConfig.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
22
apply plugin: 'com.android.application'
3+
apply plugin: 'com.google.gms.google-services'
4+
apply plugin: 'com.google.firebase.crashlytics'
35
apply plugin: 'kotlin-android'
46
apply plugin: 'kotlin-android-extensions'
57
apply plugin: 'kotlin-kapt'
6-
apply plugin: 'com.google.gms.google-services'
7-
apply plugin: 'com.google.firebase.crashlytics'
88

99
ext {
1010
ankoVersion = '0.10.6'
@@ -33,11 +33,11 @@ def DISCUSS_URL = System.getenv('DISCUSS_URL') ?: "https://discuss.codingblocks.
3333
apply from: './signingconfigs.gradle'
3434

3535
android {
36-
compileSdkVersion 29
36+
compileSdkVersion 30
3737
defaultConfig {
3838
applicationId "com.codingblocks.cbonlineapp"
3939
minSdkVersion 21
40-
targetSdkVersion 29
40+
targetSdkVersion 30
4141
versionCode 101010001
4242
// 1 (versioning scheme)
4343
// 00 (major version)
@@ -47,7 +47,7 @@ android {
4747
versionName "1.1.0"
4848
signingConfig signingConfigs.debug
4949
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
50-
multiDexEnabled false
50+
multiDexEnabled true
5151
manifestPlaceholders = [
5252
onesignal_app_id : '01d75aac-5123-4145-b655-ba8d27c5dc13',
5353
onesignal_google_project_number: 'REMOTE'
@@ -63,6 +63,11 @@ android {
6363
arg("room.schemaLocation", "$projectDir/schemas".toString())
6464
}
6565
}
66+
javaCompileOptions {
67+
annotationProcessorOptions {
68+
includeCompileClasspath true
69+
}
70+
}
6671
}
6772
lintOptions {
6873
abortOnError false
@@ -85,11 +90,11 @@ android {
8590
}
8691
}
8792
compileOptions {
88-
sourceCompatibility = '1.8'
89-
targetCompatibility = '1.8'
93+
sourceCompatibility JavaVersion.VERSION_1_8
94+
targetCompatibility JavaVersion.VERSION_1_8
9095
}
9196
kotlinOptions {
92-
jvmTarget = "1.8"
97+
jvmTarget = JavaVersion.VERSION_1_8
9398
}
9499

95100
packagingOptions {

‎app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,6 @@
201201
</intent-filter>
202202
</receiver>
203203

204-
<service
205-
android:name=".util.DownloadService"
206-
android:enabled="true"
207-
android:exported="true" />
208-
209204
<meta-data
210205
android:name="com.onesignal.NotificationOpened.DEFAULT"
211206
android:value="DISABLE" />

‎app/src/main/java/com/codingblocks/cbonlineapp/CBOnlineApp.kt

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ class CBOnlineApp : Application() {
6363
override var baseUrl: String
6464
get() = BuildConfig.BASE_URL
6565
set(value) {}
66-
6766
})
6867

6968
if (BuildConfig.DEBUG) {
@@ -92,8 +91,12 @@ class CBOnlineApp : Application() {
9291
}
9392
startKoin {
9493
androidContext(this@CBOnlineApp)
95-
modules(listOf(viewModelModule, firebaseModule,
96-
databaseModule, preferencesModule))
94+
modules(
95+
listOf(
96+
viewModelModule, firebaseModule,
97+
databaseModule, preferencesModule
98+
)
99+
)
97100
}
98101

99102
// OneSignal Initialization
@@ -106,22 +109,25 @@ class CBOnlineApp : Application() {
106109

107110
// Configure Routers
108111
try {
109-
Router.initActivityRouter(applicationContext, IActivityRouteTableInitializer { router ->
110-
router["activity://courseRun/https://online.codingblocks.com/app/classroom/course/:s{$COURSE_ID}/run/:s{$RUN_ID}"] =
111-
MyCourseActivity::class.java
112-
router["activity://courseRun/https://online.codingblocks.com/courses/:s{courseId}"] =
113-
CourseActivity::class.java
114-
router["activity://courseRun/https://online.codingblocks.com/courses"] =
115-
SearchCourseActivity::class.java
116-
router["activity://courseRun/https://online.codingblocks.com/app/player/:s{$RUN_ATTEMPT_ID}/content/:s{$SECTION_ID}/:s{$CONTENT_ID}"] =
117-
VideoPlayerActivity::class.java
118-
router["activity://courseRun/https://online.codingblocks.com/app/tracks/:s{courseId}"] =
119-
TrackActivity::class.java
120-
router["activity://courseRun/https://online.codingblocks.com/app/tracks"] =
121-
LearningTracksActivity::class.java
122-
router["activity://courseRun/https://online.codingblocks.com/app/spin-n-win"] =
123-
CampaignActivity::class.java
124-
})
112+
Router.initActivityRouter(
113+
applicationContext,
114+
IActivityRouteTableInitializer { router ->
115+
router["activity://courseRun/https://online.codingblocks.com/app/classroom/course/:s{$COURSE_ID}/run/:s{$RUN_ID}"] =
116+
MyCourseActivity::class.java
117+
router["activity://courseRun/https://online.codingblocks.com/courses/:s{courseId}"] =
118+
CourseActivity::class.java
119+
router["activity://courseRun/https://online.codingblocks.com/courses"] =
120+
SearchCourseActivity::class.java
121+
router["activity://courseRun/https://online.codingblocks.com/app/player/:s{$RUN_ATTEMPT_ID}/content/:s{$SECTION_ID}/:s{$CONTENT_ID}"] =
122+
VideoPlayerActivity::class.java
123+
router["activity://courseRun/https://online.codingblocks.com/app/tracks/:s{courseId}"] =
124+
TrackActivity::class.java
125+
router["activity://courseRun/https://online.codingblocks.com/app/tracks"] =
126+
LearningTracksActivity::class.java
127+
router["activity://courseRun/https://online.codingblocks.com/app/spin-n-win"] =
128+
CampaignActivity::class.java
129+
}
130+
)
125131
} catch (e: ConcurrentModificationException) {
126132
FirebaseCrashlytics.getInstance().log("Router not working : ${e.localizedMessage}")
127133
}

‎app/src/main/java/com/codingblocks/cbonlineapp/CrashHandler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.content.Context
55
import com.codingblocks.cbonlineapp.dashboard.DashboardActivity
66
import com.codingblocks.cbonlineapp.util.JWTUtils
77
import com.codingblocks.cbonlineapp.util.PreferenceHelper
8-
import com.codingblocks.onlineapi.CBOnlineLib
98
import org.jetbrains.anko.newTask
109
import org.koin.core.KoinComponent
1110
import org.koin.core.inject

‎app/src/main/java/com/codingblocks/cbonlineapp/SplashActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.codingblocks.cbonlineapp.baseclasses.BaseCBActivity
66
import com.codingblocks.cbonlineapp.dashboard.DashboardActivity
77
import com.codingblocks.cbonlineapp.util.JWTUtils
88
import com.codingblocks.cbonlineapp.util.PreferenceHelper
9-
import com.codingblocks.onlineapi.CBOnlineLib
109
import org.jetbrains.anko.intentFor
1110
import org.koin.android.ext.android.inject
1211

‎app/src/main/java/com/codingblocks/cbonlineapp/URLRouterActivity.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ import android.text.TextUtils
66
import cn.campusapp.router.Router
77
import com.codingblocks.cbonlineapp.baseclasses.BaseCBActivity
88
import com.codingblocks.cbonlineapp.dashboard.DashboardActivity
9-
import com.codingblocks.cbonlineapp.util.JWTUtils
109
import com.codingblocks.cbonlineapp.util.PreferenceHelper
1110
import com.codingblocks.cbonlineapp.util.extensions.openChrome
1211
import com.codingblocks.cbonlineapp.util.extensions.otherwise
13-
import com.codingblocks.onlineapi.CBOnlineLib
1412
import org.koin.android.ext.android.inject
1513

1614
class URLRouterActivity : BaseCBActivity() {

‎app/src/main/java/com/codingblocks/cbonlineapp/admin/AdminActivity.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import kotlinx.android.synthetic.main.activity_admin.*
1414

1515
class AdminActivity : BaseCBActivity(), FragmentChangeListener {
1616

17-
1817
override fun openInbox(conversationId: String) {
1918
bottomNavAdmin.selectedItemId = R.id.inbox
2019
replaceFragmentSafely(
@@ -48,7 +47,6 @@ class AdminActivity : BaseCBActivity(), FragmentChangeListener {
4847
}
4948
}
5049

51-
5250
private fun initializeUI() {
5351
replaceFragmentSafely(
5452
fragment = AdminOverviewFragment(),
@@ -61,14 +59,16 @@ class AdminActivity : BaseCBActivity(), FragmentChangeListener {
6159
replaceFragmentSafely(
6260
fragment = InboxFragment(),
6361
containerViewId = R.id.pagerAdmin,
64-
allowStateLoss = true)
62+
allowStateLoss = true
63+
)
6564
true
6665
}
6766
R.id.doubts -> {
6867
replaceFragmentSafely(
6968
fragment = AdminDoubtsFragment(),
7069
containerViewId = R.id.pagerAdmin,
71-
allowStateLoss = true)
70+
allowStateLoss = true
71+
)
7272
true
7373
}
7474
else -> {
@@ -80,7 +80,6 @@ class AdminActivity : BaseCBActivity(), FragmentChangeListener {
8080
true
8181
}
8282
}
83-
8483
}
8584
}
8685
}

‎app/src/main/java/com/codingblocks/cbonlineapp/admin/InboxFragment.kt

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,16 @@ class InboxFragment : BaseCBFragment() {
5454
webView.settings.allowFileAccess = true
5555
webView.settings.allowFileAccessFromFileURLs = true
5656
}
57-
CBOnlineLib.api.getSignature().enqueue(retrofitCallback { _, response ->
58-
val signature = response?.body()?.get("signature")
59-
val userId = prefs.SP_USER_ID
60-
val userName = prefs.SP_USER_NAME
61-
val email = prefs.SP_EMAIL_ID
62-
val script: String
63-
if (conversationId.isEmpty()) {
64-
script = """
57+
CBOnlineLib.api.getSignature().enqueue(
58+
retrofitCallback { _, response ->
59+
val signature = response?.body()?.get("signature")
60+
val userId = prefs.SP_USER_ID
61+
val userName = prefs.SP_USER_NAME
62+
val email = prefs.SP_EMAIL_ID
63+
val script: String
64+
if (conversationId.isEmpty()) {
65+
script =
66+
"""
6567
Talk.ready.then(function() {
6668
var me = new Talk.User({
6769
id: $userId,
@@ -76,9 +78,10 @@ class InboxFragment : BaseCBFragment() {
7678
var inbox = talkSession.createInbox();
7779
inbox.mount(document.getElementById("talkjs-container"));
7880
});
79-
""".trimIndent()
80-
} else {
81-
script = """
81+
""".trimIndent()
82+
} else {
83+
script =
84+
"""
8285
Talk.ready.then(function() {
8386
var me = new Talk.User({
8487
id: $userId,
@@ -95,22 +98,23 @@ class InboxFragment : BaseCBFragment() {
9598
var inbox = talkSession.createChatbox(conversation);
9699
inbox.mount(document.getElementById("talkjs-container"));
97100
});
98-
""".trimIndent()
99-
}
100-
101-
webView.webViewClient = object : WebViewClient() {
102-
override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
103-
return false
101+
""".trimIndent()
104102
}
105103

106-
override fun onPageFinished(view: WebView, url: String?) {
107-
super.onPageFinished(view, url)
108-
view.evaluateJavascript("javascript:$script", null)
104+
webView.webViewClient = object : WebViewClient() {
105+
override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
106+
return false
107+
}
108+
109+
override fun onPageFinished(view: WebView, url: String?) {
110+
super.onPageFinished(view, url)
111+
view.evaluateJavascript("javascript:$script", null)
112+
}
109113
}
110-
}
111114

112-
webView.loadUrl("file:///android_asset/Chat.html")
113-
})
115+
webView.loadUrl("file:///android_asset/Chat.html")
116+
}
117+
)
114118
if (inboxRoot != null)
115119
inboxRoot.addView(webView)
116120
}

0 commit comments

Comments
 (0)