Skip to content

fix: #2398 Migrate the project to support Androidx #2464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: development
Choose a base branch
from
Open

fix: #2398 Migrate the project to support Androidx #2464

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8652fa
chore #2398: Migrate the project to support Androidx
dheerajkotwani Jan 20, 2020
273cd08
Merge remote-tracking branch 'origin/development' into original
dheerajkotwani Jan 21, 2020
0fcf325
fix: Fix circle ci build
dheerajkotwani Jan 21, 2020
35e0e82
fix: circle ci build
dheerajkotwani Jan 21, 2020
01807c7
fix: circle ci build
dheerajkotwani Jan 21, 2020
4c1f405
fix: circle ci build
dheerajkotwani Jan 21, 2020
1d7cb35
removed unwanted suppress from the code
dheerajkotwani Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ android {
versionName "1.3.0"
vectorDrawables.useSupportLibrary = true
// for unit test
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders = [
YOUTUBE_API_KEY: YOUTUBE_API_KEY
]
Expand Down Expand Up @@ -119,14 +119,14 @@ androidExtensions {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

implementation "com.android.support:appcompat-v7:${rootConfiguration.supportLibraryVersion}"
implementation "com.android.support:exifinterface:${rootConfiguration.supportLibraryVersion}"
implementation "com.android.support:recyclerview-v7:${rootConfiguration.supportLibraryVersion}"
implementation "com.android.support:design:${rootConfiguration.supportLibraryVersion}"
implementation "com.android.support:cardview-v7:${rootConfiguration.supportLibraryVersion}"
implementation "com.android.support:support-v4:${rootConfiguration.supportLibraryVersion}"
implementation "com.android.support:customtabs:${rootConfiguration.supportLibraryVersion}"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation "androidx.appcompat:appcompat:1.0.0"
implementation "androidx.exifinterface:exifinterface:1.0.0"
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation "com.google.android.material:material:1.0.0"
implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "androidx.browser:browser:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

//piechart
implementation "com.github.PhilJay:MPAndroidChart:${rootConfiguration.mpAndroidChartVersion}"
Expand Down Expand Up @@ -158,10 +158,10 @@ dependencies {
//Unit Test
testImplementation "junit:junit:${rootConfiguration.jUnitVersion}"
testImplementation "org.mockito:mockito-core:${rootConfiguration.mockitoCoreVersion}"
androidTestImplementation "com.android.support:support-annotations:${rootConfiguration.supportLibraryVersion}"
androidTestImplementation "com.android.support.test:runner:${rootConfiguration.testVersion}"
androidTestImplementation "com.android.support.test:rules:${rootConfiguration.testVersion}"
androidTestImplementation "com.android.support.test.espresso:espresso-core:${rootConfiguration.espressoVersion}"
androidTestImplementation "androidx.annotation:annotation:1.0.0"
androidTestImplementation "androidx.test:runner:1.1.0"
androidTestImplementation "androidx.test:rules:1.1.0"
androidTestImplementation "androidx.test.espresso:espresso-core:3.1.0"

//realm adapter
implementation "io.realm:android-adapters:${rootConfiguration.realmVersion}"
Expand All @@ -182,6 +182,8 @@ dependencies {
implementation "com.google.android.gms:play-services-auth:${rootConfiguration.playServiceAuthVersion}"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${rootConfiguration.kotlinVersion}"

implementation "org.jetbrains.kotlin:kotlin-reflect:1.1.0"

//Stetho
debugImplementation "com.facebook.stetho:stetho:${rootConfiguration.stethoVersion}"

Expand Down
2 changes: 1 addition & 1 deletion app/config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ext {
supportLibraryVersion = '28.0.0'
leakCanaryVersion = '1.6.2'
mpAndroidChartVersion = 'v3.0.3'
butterKnifeVersion = '9.0.0-rc1'
butterKnifeVersion = '10.1.0'
retrofitVersion = '2.4.0'
okHttpVersion = '3.12.0'
linkPreviewVersion = '1.0.9'
Expand Down
17 changes: 9 additions & 8 deletions app/src/androidTest/java/org/fossasia/susi/ai/chat/ChatActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package org.fossasia.susi.ai.chat

import android.Manifest
import android.support.test.espresso.Espresso.onView
import android.support.test.espresso.assertion.ViewAssertions.matches
import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
import android.support.test.espresso.matcher.ViewMatchers.withId
import android.support.test.filters.LargeTest
import android.support.test.rule.ActivityTestRule
import android.support.test.rule.GrantPermissionRule
import android.support.test.runner.AndroidJUnit4
import android.view.WindowManager
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.filters.LargeTest
import androidx.test.rule.ActivityTestRule
import androidx.test.rule.GrantPermissionRule
import androidx.test.runner.AndroidJUnit4
import java.io.IOException
import org.fossasia.susi.ai.R
import org.junit.Before
Expand All @@ -25,6 +25,7 @@ import timber.log.Timber
* Created by collinx on 22-10-2017.
*/

@Suppress("DEPRECATION")
@RunWith(AndroidJUnit4::class)
@LargeTest
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
Expand Down
19 changes: 10 additions & 9 deletions app/src/androidTest/java/org/fossasia/susi/ai/login/LoginActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package org.fossasia.susi.ai.login

import android.Manifest
import android.support.test.espresso.Espresso.onView
import android.support.test.espresso.action.ViewActions.scrollTo
import android.support.test.espresso.assertion.ViewAssertions.matches
import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
import android.support.test.espresso.matcher.ViewMatchers.withId
import android.support.test.filters.MediumTest
import android.support.test.rule.ActivityTestRule
import android.support.test.rule.GrantPermissionRule
import android.support.test.runner.AndroidJUnit4
import android.view.WindowManager
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.scrollTo
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.filters.MediumTest
import androidx.test.rule.ActivityTestRule
import androidx.test.rule.GrantPermissionRule
import androidx.test.runner.AndroidJUnit4
import java.io.IOException
import org.fossasia.susi.ai.R
import org.junit.Before
Expand All @@ -24,6 +24,7 @@ import timber.log.Timber
* Created by collinx on 22-10-2017.
*/

@Suppress("DEPRECATION")
Copy link
Member

@liveHarshit liveHarshit Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why suppress?

Copy link
Member Author

@dheerajkotwani dheerajkotwani Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

androidx.test.runner.AndroidJUnit4 was showing deprecation there and without this the circle ci build was also failing.

Copy link
Member

@liveHarshit liveHarshit Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be another way

Copy link
Member Author

@dheerajkotwani dheerajkotwani Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay @liveHarshit I will try this with some different approach

Copy link
Member Author

@dheerajkotwani dheerajkotwani Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@liveHarshit made the changes as asked by you

@RunWith(AndroidJUnit4::class)
@MediumTest
class LoginActivityTest {
Expand Down
15 changes: 8 additions & 7 deletions app/src/androidTest/java/org/fossasia/susi/ai/login/WelcomeActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.fossasia.susi.ai.login

import android.support.test.espresso.Espresso.onView
import android.support.test.espresso.assertion.ViewAssertions.matches
import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
import android.support.test.espresso.matcher.ViewMatchers.withId
import android.support.test.filters.MediumTest
import android.support.test.rule.ActivityTestRule
import android.support.test.runner.AndroidJUnit4
import android.view.WindowManager
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.filters.MediumTest
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import java.io.IOException
import org.fossasia.susi.ai.R
import org.junit.Before
Expand All @@ -20,6 +20,7 @@ import timber.log.Timber
* Created by collinx on 22-10-2017.
*/

@Suppress("DEPRECATION")
@RunWith(AndroidJUnit4::class)
@MediumTest
class WelcomeActivityTest {
Expand Down
17 changes: 9 additions & 8 deletions app/src/androidTest/java/org/fossasia/susi/ai/signup/SignUpActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.fossasia.susi.ai.signup

import android.support.test.espresso.Espresso.onView
import android.support.test.espresso.action.ViewActions.scrollTo
import android.support.test.espresso.assertion.ViewAssertions.matches
import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
import android.support.test.espresso.matcher.ViewMatchers.withId
import android.support.test.filters.MediumTest
import android.support.test.rule.ActivityTestRule
import android.support.test.runner.AndroidJUnit4
import android.view.WindowManager
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.scrollTo
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.filters.MediumTest
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import java.io.IOException
import org.fossasia.susi.ai.R
import org.junit.Before
Expand All @@ -21,6 +21,7 @@ import timber.log.Timber
* Created by collinx on 22-10-2017.
*/

@Suppress("DEPRECATION")
@RunWith(AndroidJUnit4::class)
@MediumTest
class SignUpActivityTest {
Expand Down
15 changes: 8 additions & 7 deletions app/src/androidTest/java/org/fossasia/susi/ai/skills/SkillsActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.fossasia.susi.ai.skills

import android.support.test.espresso.Espresso.onView
import android.support.test.espresso.assertion.ViewAssertions.matches
import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
import android.support.test.espresso.matcher.ViewMatchers.withId
import android.support.test.filters.LargeTest
import android.support.test.rule.ActivityTestRule
import android.support.test.runner.AndroidJUnit4
import android.view.WindowManager
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.filters.LargeTest
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import java.io.IOException
import org.fossasia.susi.ai.R
import org.junit.Before
Expand All @@ -20,6 +20,7 @@ import timber.log.Timber
* Created by collinx on 16-10-2017.
*/

@Suppress("DEPRECATION")
@RunWith(AndroidJUnit4::class)
@LargeTest
class SkillsActivityTest {
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/java/kotterknife/ButterKnife.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
@file:Suppress("DEPRECATION", "RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "UNUSED_ANONYMOUS_PARAMETER")

package kotterknife

import android.app.Activity
import android.app.Dialog
import android.app.DialogFragment
import android.app.Fragment
import android.support.v4.app.DialogFragment as SupportDialogFragment
import android.support.v4.app.Fragment as SupportFragment
import android.support.v7.widget.RecyclerView.ViewHolder
import android.view.View
import androidx.fragment.app.DialogFragment as SupportDialogFragment
import androidx.fragment.app.Fragment as SupportFragment
import androidx.recyclerview.widget.RecyclerView.ViewHolder
import kotlin.properties.ReadOnlyProperty
import kotlin.reflect.KProperty

Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/org/fossasia/susi/ai/MainApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package org.fossasia.susi.ai

import android.annotation.SuppressLint
import android.app.Application
import android.support.v7.app.AppCompatDelegate
import android.util.Log
import androidx.appcompat.app.AppCompatDelegate
import com.facebook.stetho.Stetho
import com.squareup.leakcanary.LeakCanary
import io.realm.Realm
Expand All @@ -24,7 +24,6 @@ class MainApplication : Application() {

override fun onCreate() {
super.onCreate()

if (LeakCanary.isInAnalyzerProcess(this)) {
// This process is dedicated to LeakCanary for heap analysis.
// You should not init your app in this process.
Expand All @@ -34,7 +33,7 @@ class MainApplication : Application() {

instance = this
// The Realm file will be located in Context.getFilesDir() with name "default.realm"
Realm.init(this)
Realm.init(applicationContext)
val config = RealmConfiguration.Builder().deleteRealmIfMigrationNeeded().build()
Realm.setDefaultConfiguration(config)

Expand Down
23 changes: 13 additions & 10 deletions app/src/main/java/org/fossasia/susi/ai/chat/ChatActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("UNUSED_ANONYMOUS_PARAMETER")

package org.fossasia.susi.ai.chat

import ai.kitt.snowboy.MsgEnum
Expand All @@ -21,13 +23,6 @@ import android.os.Message
import android.speech.RecognizerIntent
import android.speech.tts.TextToSpeech
import android.speech.tts.UtteranceProgressListener
import android.support.design.widget.Snackbar
import android.support.v4.app.ActivityCompat
import android.support.v4.view.GestureDetectorCompat
import android.support.v4.view.ViewCompat
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.text.Editable
import android.text.InputType
import android.text.TextWatcher
Expand All @@ -40,6 +35,11 @@ import android.view.animation.OvershootInterpolator
import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.core.view.GestureDetectorCompat
import androidx.core.view.ViewCompat
import com.google.android.material.snackbar.Snackbar
import io.realm.RealmResults
import java.util.Locale
import kotlinx.android.synthetic.main.activity_chat.*
Expand Down Expand Up @@ -88,6 +88,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
}
}

@SuppressLint("RestrictedApi")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_chat)
Expand Down Expand Up @@ -312,7 +313,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
}

override fun setupAdapter(chatMessageDatabaseList: RealmResults<ChatMessage>) {
val linearLayoutManager = LinearLayoutManager(this)
val linearLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
linearLayoutManager.stackFromEnd = true

rv_chat_feed.layoutManager = linearLayoutManager
Expand All @@ -337,9 +338,9 @@ class ChatActivity : AppCompatActivity(), IChatView {
}
}

rv_chat_feed.addOnScrollListener(object : RecyclerView.OnScrollListener() {
rv_chat_feed.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
@SuppressLint("RestrictedApi")
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
override fun onScrolled(recyclerView: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) {
super.onScrolled(recyclerView, dx, dy)

if (linearLayoutManager.findLastCompletelyVisibleItemPosition() < rv_chat_feed.adapter?.itemCount!!.minus(5)) {
Expand All @@ -365,6 +366,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
}

// Take user's speech as input and send the message
@SuppressLint("RestrictedApi")
override fun promptSpeechInput() {
if (recordingThread != null) {
chatPresenter.stopHotwordDetection()
Expand All @@ -380,6 +382,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
}

// Replies user with Speech
@SuppressLint("RestrictedApi")
override fun voiceReply(reply: String, language: String) {
searchChat.visibility = View.VISIBLE
fabsetting.visibility = View.VISIBLE
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/org/fossasia/susi/ai/chat/STTfragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import android.speech.RecognitionListener
import android.speech.RecognizerIntent
import android.speech.SpeechRecognizer
import android.speech.tts.TextToSpeech
import android.support.annotation.NonNull
import android.support.v4.app.Fragment
import android.support.v7.widget.LinearLayoutManager
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.annotation.NonNull
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import java.util.Locale
import kotlinx.android.synthetic.main.activity_chat.*
import kotlinx.android.synthetic.main.fragment_sttframe.*
Expand All @@ -28,7 +28,7 @@ import timber.log.Timber
/**
* Created by meeera on 17/8/17.
*/
class STTFragment : Fragment() {
class STTFragment : androidx.fragment.app.Fragment() {
lateinit var recognizer: SpeechRecognizer
lateinit var chatPresenter: IChatPresenter
private val thisActivity = activity
Expand Down Expand Up @@ -85,7 +85,7 @@ class STTFragment : Fragment() {
private fun setupCommands(rootView: View) {
var voiceCommand = getResources().getStringArray(R.array.voiceCommands)
var voiceCommandsList = voiceCommand.toCollection(ArrayList())
rootView.clickableCommands.layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
rootView.clickableCommands.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
rootView.clickableCommands.adapter = VoiceCommandsAdapter(voiceCommandsList, activity)
}

Expand Down
Loading