Merge pull request #82 from theimpulson/dev

Minor improvements

app/build.gradle

@@ -43,14 +43,21 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
+
+    lint {
+        lintConfig file("lint.xml")
+    }
+
+    androidResources {
+        generateLocaleConfig true
+    }
 }
 
 dependencies {
     final def markwon_version = '4.6.2'
     final def lifecycle_version = '2.6.1'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.13.2'
     implementation 'com.google.firebase:firebase-analytics-ktx:21.3.0'
 
     implementation 'com.onesignal:OneSignal:[4.0.0, 4.99.99]'

app/lint.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="MissingTranslation" severity="ignore" />
+</lint>

app/src/main/AndroidManifest.xml

@@ -12,7 +12,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:localeConfig="@xml/locales_config"
         android:theme="@style/AppTheme">
         <meta-data
             android:name="com.onesignal.NotificationOpened.DEFAULT"

app/src/main/java/app/opass/ccip/extension/View.kt

@@ -7,7 +7,12 @@ import android.view.WindowInsets
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.Px
 import androidx.core.content.getSystemService
-import androidx.core.view.*
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.marginBottom
+import androidx.core.view.marginLeft
+import androidx.core.view.marginRight
+import androidx.core.view.marginTop
+import androidx.core.view.updateLayoutParams
 
 fun View.setOnApplyWindowInsetsListenerCompat(block: (v: View, insets: WindowInsets, insetsCompat: WindowInsetsCompat) -> WindowInsets) {
     setOnApplyWindowInsetsListener { v, insets ->

app/src/main/java/app/opass/ccip/ui/dialogs/NotificationDialogFragment.kt

@@ -2,7 +2,6 @@ package app.opass.ccip.ui.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import app.opass.ccip.R
 import app.opass.ccip.util.PreferenceUtil

app/src/main/java/app/opass/ccip/ui/schedule/ScheduleViewModel.kt

@@ -1,11 +1,23 @@
 package app.opass.ccip.ui.schedule
 
 import android.app.Application
-import androidx.lifecycle.*
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.liveData
+import androidx.lifecycle.map
+import androidx.lifecycle.switchMap
+import androidx.lifecycle.viewModelScope
 import app.opass.ccip.CCIPApplication
 import app.opass.ccip.R
 import app.opass.ccip.extension.debounce
-import app.opass.ccip.model.*
+import app.opass.ccip.model.ConfSchedule
+import app.opass.ccip.model.Session
+import app.opass.ccip.model.SessionLang
+import app.opass.ccip.model.SessionTag
+import app.opass.ccip.model.SessionType
 import app.opass.ccip.util.PreferenceUtil
 import com.google.gson.internal.bind.util.ISO8601Utils
 import kotlinx.coroutines.Dispatchers

app/src/main/java/app/opass/ccip/ui/sessiondetail/SpeakerImageAdapter.kt

@@ -4,7 +4,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
 import app.opass.ccip.model.Speaker
-import java.util.*
 
 class SpeakerImageAdapter(fm: FragmentManager, speakers: List<Speaker>) : FragmentStatePagerAdapter(fm) {
     private val mFragmentList = ArrayList<Fragment>()

app/src/main/java/app/opass/ccip/util/AlarmUtil.kt

@@ -13,7 +13,6 @@ import app.opass.ccip.R
 import app.opass.ccip.model.Session
 import app.opass.ccip.ui.sessiondetail.SessionDetailActivity
 import com.google.gson.internal.bind.util.ISO8601Utils
-import java.text.ParseException
 import java.text.ParsePosition
 import java.util.*
 

app/src/main/java/app/opass/ccip/util/ConfScheduleDeserializer.kt

@@ -1,11 +1,17 @@
 package app.opass.ccip.util
 
-import app.opass.ccip.model.*
+import app.opass.ccip.model.ConfSchedule
+import app.opass.ccip.model.En
+import app.opass.ccip.model.Room
+import app.opass.ccip.model.Session
+import app.opass.ccip.model.SessionTag
+import app.opass.ccip.model.SessionType
+import app.opass.ccip.model.Speaker
+import app.opass.ccip.model.Zh
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.reflect.TypeToken
-import org.intellij.lang.annotations.Language
 import java.lang.reflect.Type
 
 class ConfScheduleDeserializer : JsonDeserializer<ConfSchedule> {

app/src/main/java/app/opass/ccip/util/LocalizedStringDeserializer.kt

@@ -1,7 +1,14 @@
 package app.opass.ccip.util
 
 import app.opass.ccip.model.LocalizedString
-import com.google.gson.*
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonNull
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
 import java.lang.reflect.Type
 
 class LocalizedStringDeserializer : JsonDeserializer<LocalizedString>, JsonSerializer<LocalizedString> {

app/src/main/res/resources.properties

@@ -0,0 +1 @@
+unqualifiedResLocale=en-US

app/src/main/res/values-hi/strings.xml

@@ -45,7 +45,7 @@
     <string name="speaker_info">वक्ता की जानकारी</string>
     <string name="program_abstract">सार</string>
     <string name="tag">टैग</string>
-    <string name="min">कम से कम</string>
+    <string name="min"> मिनट</string>
     <string name="meal">खाना</string>
     <string name="vegan">शुद्ध शाकाहारी</string>
     <string name="keynote">मुख्य भाषण</string>