Improvement/jitpack maven

build.gradle

@@ -1,14 +1,14 @@
 buildscript {
 
     ext {
-        kotlin_version = '1.4.10'
+        kotlin_version = '1.4.30'
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }

crowdin-controls/build.gradle

@@ -1,12 +1,13 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 ext {
-    libraryVersionCode = 2
-    libraryVersionName = "1.0.1"
+    libraryVersionCode = 3
+    libraryVersionName = "1.0.2"
 
-    publishedGroupId = 'com.crowdin.platform'
+    publishedGroupId = 'com.crowdin.control'
     libraryName = 'CrowdinControlsSdk'
     artifact = 'controls'
 
@@ -64,7 +65,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 

crowdin-controls/maven.gradle

@@ -22,13 +22,13 @@ artifacts {
 publishing {
     publications {
         Publication(MavenPublication) {
-            artifact("$buildDir/outputs/aar/crowdin-release.aar")
-            groupId
+            artifact("$buildDir/outputs/aar/crowdin-controls-release.aar")
+            groupId publishedGroupId
             artifactId artifact
             version this.version
 
             pom.withXml {
-                def dependenciesNode = asNode().getAt('dependencies')[0] ?: asNode().appendNode('dependencies')
+                def dependenciesNode = asNode()['dependencies'][0] ?: asNode().appendNode('dependencies')
                 // Iterate over the implementation dependencies (we don't want the test ones), adding a <dependency> node for each
                 configurations.implementation.allDependencies.each {
                     // Ensure dependencies such as fileTree are not included.

crowdin/build.gradle

@@ -1,11 +1,25 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+buildscript {
+
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"
+    }
+}
+
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
 apply from: '../jacoco.gradle'
 
 ext {
-    libraryVersionCode = 17
-    libraryVersionName = "1.4.1"
+    libraryVersionCode = 18
+    libraryVersionName = "1.4.2"
 
     publishedGroupId = 'com.crowdin.platform'
     libraryName = 'CrowdinAndroidSdk'
@@ -27,6 +41,8 @@ ext {
     allLicenses = ["MIT"]
 }
 
+def STRING = 'String'
+
 android {
     compileSdkVersion 29
 
@@ -36,6 +52,8 @@ android {
         versionCode libraryVersionCode
         versionName libraryVersionName
 
+        buildConfigField STRING, 'VERSION_NAME', "\"${libraryVersionName}\""
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -65,30 +83,18 @@ android {
     }
 }
 
-buildscript {
-
-    repositories {
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
-    }
-}
-
 dependencies {
     implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.work:work-runtime-ktx:2.4.0"
-    implementation "com.google.android.material:material:1.2.1"
+    implementation "androidx.work:work-runtime-ktx:2.5.0"
+    implementation "com.google.android.material:material:1.3.0"
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
-    implementation "com.google.code.gson:gson:2.8.5"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.0.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10"
+    implementation 'com.squareup.retrofit2:converter-gson:2.7.1'
+    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.2.1"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.1.0'
 }
 

crowdin/maven.gradle

@@ -23,12 +23,12 @@ publishing {
     publications {
         Publication(MavenPublication) {
             artifact("$buildDir/outputs/aar/crowdin-release.aar")
-            groupId
+            groupId publishedGroupId
             artifactId artifact
             version this.version
 
             pom.withXml {
-                def dependenciesNode = asNode().getAt('dependencies')[0] ?: asNode().appendNode('dependencies')
+                def dependenciesNode = asNode()['dependencies'][0] ?: asNode().appendNode('dependencies')
                 // Iterate over the implementation dependencies (we don't want the test ones), adding a <dependency> node for each
                 configurations.implementation.allDependencies.each {
                     // Ensure dependencies such as fileTree are not included.

crowdin/src/main/java/com/crowdin/platform/auth/AuthActivity.kt

@@ -13,6 +13,7 @@ import android.view.View
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -25,10 +26,11 @@ import com.crowdin.platform.data.model.TokenRequest
 import com.crowdin.platform.data.remote.CrowdinRetrofitService
 import com.crowdin.platform.util.ThreadUtils
 import com.crowdin.platform.util.executeIO
-import kotlinx.android.synthetic.main.auth_layout.*
 
 internal class AuthActivity : AppCompatActivity() {
 
+    private lateinit var webView: WebView
+    private lateinit var progressView: LinearLayout
     private lateinit var clientId: String
     private lateinit var clientSecret: String
     private var domain: String? = null
@@ -52,6 +54,9 @@ internal class AuthActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.auth_layout)
 
+        webView = findViewById(R.id.webView)
+        progressView = findViewById(R.id.progressView)
+
         if (Crowdin.isAuthorized()) {
             requestPermission()
         } else {

crowdin/src/main/java/com/crowdin/platform/data/model/AuthInfo.kt

@@ -4,7 +4,7 @@ internal class AuthInfo(authResponse: AuthResponse) {
 
     var accessToken = authResponse.accessToken
     var refreshToken = authResponse.refreshToken
-    var expiresIn = System.currentTimeMillis() + (authResponse.expiresIn * 60)
+    private var expiresIn = System.currentTimeMillis() + (authResponse.expiresIn * 60)
 
     fun isExpired(): Boolean {
         return System.currentTimeMillis() > expiresIn

crowdin/src/main/res/layout/auth_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -31,4 +31,4 @@
             android:textSize="16sp"
             android:textStyle="bold" />
     </LinearLayout>
-</FrameLayout>
+</merge>

example-info/build.gradle

@@ -36,10 +36,10 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "com.google.android.material:material:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    testImplementation 'junit:junit:4.+'
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "com.google.android.material:material:1.3.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

example/build.gradle

@@ -1,6 +1,7 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -37,7 +38,7 @@ dependencies {
     implementation project(":example-info")
 
     implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "com.google.android.material:material:1.2.1"
+    implementation "com.google.android.material:material:1.3.0"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30"
 }

example/src/main/java/com/crowdin/platform/example/MainActivity.kt

@@ -8,21 +8,27 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.TextView
 import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import com.crowdin.platform.example.category.CategoryFragment
 import com.crowdin.platform.example.task.fragment.DashboardFragment
 import com.crowdin.platform.example.task.fragment.HistoryFragment
 import com.crowdin.platform.util.inflateWithCrowdin
 import com.google.android.material.navigation.NavigationView
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.app_bar_main.*
 
 class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
 
+    private lateinit var toolbarMain: Toolbar
+    private lateinit var drawerLayout: DrawerLayout
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        toolbarMain = findViewById(R.id.toolbarMain)
+        drawerLayout = findViewById(R.id.drawerLayout)
+        val navigationView = findViewById<NavigationView>(R.id.navigationView)
+
         setSupportActionBar(toolbarMain)
 
         val toggle = ActionBarDrawerToggle(

example/src/main/java/com/crowdin/platform/example/SettingsFragment.kt

@@ -5,15 +5,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
+import android.widget.Spinner
 import androidx.fragment.app.Fragment
 import com.crowdin.platform.Crowdin
 import com.crowdin.platform.example.task.OnItemSelectedListener
 import com.crowdin.platform.example.utils.updateLocale
-import kotlinx.android.synthetic.main.fragment_settings.*
 import java.util.Locale
 
 class SettingsFragment : Fragment(), OnItemSelectedListener.SpinnerItemListener {
 
+    private lateinit var spinnerLanguages: Spinner
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -24,6 +26,7 @@ class SettingsFragment : Fragment(), OnItemSelectedListener.SpinnerItemListener
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        spinnerLanguages = view.findViewById(R.id.spinnerLanguages)
         loadDataInSpinner()
     }
 

example/src/main/java/com/crowdin/platform/example/category/CategoryAdapter.kt

@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.crowdin.platform.example.R
 import com.crowdin.platform.example.utils.dialogDeleteCategory
 import com.crowdin.platform.example.utils.dialogUpdateCategory
-import kotlinx.android.synthetic.main.row_category.view.*
 
 class CategoryAdapter(
     private val mContext: Context,
@@ -52,9 +51,9 @@ class CategoryAdapter(
     inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view), CategoryUpdate,
         CategoryDelete {
 
-        private val categoryNameTv: TextView = view.txtCategoryName
-        private val editCategoryImg: ImageView = view.imgEditCategory
-        private val deleteCategoryImg: ImageView = view.imgDeleteCategory
+        private val categoryNameTv: TextView = view.findViewById(R.id.txtCategoryName)
+        private val editCategoryImg: ImageView = view.findViewById(R.id.imgEditCategory)
+        private val deleteCategoryImg: ImageView = view.findViewById(R.id.imgDeleteCategory)
 
         fun onBind(categoryModel: CategoryModel) {
             categoryNameTv.text = categoryModel.categoryName

example/src/main/java/com/crowdin/platform/example/category/CategoryFragment.kt

@@ -4,15 +4,19 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.crowdin.platform.example.R
 import com.crowdin.platform.example.utils.dialogAddCategory
-import kotlinx.android.synthetic.main.fragment_category.*
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import java.util.ArrayList
 
 class CategoryFragment : Fragment(), View.OnClickListener, CategoryAdd, CategoryIsEmpty {
 
+    private lateinit var addCategoryFAB: FloatingActionButton
+    private lateinit var emptyView: TextView
     private lateinit var categoryAdapter: CategoryAdapter
     private var categories: ArrayList<CategoryModel> = ArrayList()
 
@@ -26,6 +30,9 @@ class CategoryFragment : Fragment(), View.OnClickListener, CategoryAdd, Category
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        addCategoryFAB = view.findViewById(R.id.addCategoryFAB)
+        emptyView = view.findViewById(R.id.emptyView)
+        val recyclerView = view.findViewById<RecyclerView>(R.id.recyclerView)
         recyclerView.setHasFixedSize(true)
         recyclerView.layoutManager = LinearLayoutManager(requireActivity())
         addCategoryFAB.setOnClickListener(this)