Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2020-03-28 14:05:31 +01:00
commit 436e642153
6 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd-telegram/build.gradle
View file

@ -24,6 +24,7 @@ android {
applicationId "net.osmand.telegram"
minSdkVersion 15
targetSdkVersion 28
multiDexEnabled true
versionCode 1
versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
versionName "1.0"
@ -139,12 +140,10 @@ dependencies {
implementation project(path: ':OsmAnd-java', configuration: 'android')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation( "org.jetbrains.kotlin:kotlin-stdlib:1.2.71") {
exclude group: 'org.jetbrains', module: 'annotations'
}
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.11'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.annotation:annotation:1.1.0'
implementation 'commons-logging:commons-logging-api:1.1'
@ -153,5 +152,4 @@ dependencies {
implementation("com.github.HITGIF:TextFieldBoxes:1.4.5") {
exclude group: 'com.android.support'
}
implementation 'org.jetbrains:annotations-java5:15.0'
}

6
OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
View file

@ -193,7 +193,7 @@ class LoginDialogFragment : BaseDialogFragment() {
}
}
override fun onDismiss(dialog: DialogInterface?) {
override fun onDismiss(dialog: DialogInterface) {
super.onDismiss(dialog)
if (!dismissedManually) {
getMainActivity()?.closeTelegram()
@ -300,7 +300,7 @@ class LoginDialogFragment : BaseDialogFragment() {
view.findViewById<ImageView>(R.id.no_telegram_button)?.setImageResource(R.drawable.ic_arrow_forward)
noTelegramViewContainer?.setOnClickListener {
val focusedView = dialog.currentFocus
val focusedView = dialog?.currentFocus
val mainActivity = activity
if (focusedView != null && mainActivity != null) {
AndroidUtils.hideSoftKeyboard(mainActivity, focusedView)
@ -479,7 +479,7 @@ class LoginDialogFragment : BaseDialogFragment() {
when (loginDialogActiveType) {
LoginDialogType.ENTER_PHONE_NUMBER -> {
showWelcomeDialog = true
val focusedView = dialog.currentFocus
val focusedView = dialog?.currentFocus
val mainActivity = activity
if (focusedView != null && mainActivity != null) {
AndroidUtils.hideSoftKeyboard(mainActivity, focusedView)

2
OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
View file

@ -157,7 +157,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
}
}
override fun onAttachFragment(fragment: androidx.fragment.app.Fragment?) {
override fun onAttachFragment(fragment: androidx.fragment.app.Fragment) {
if (fragment is TelegramListener) {
listeners.add(WeakReference(fragment))
}

2
OsmAnd-telegram/src/net/osmand/telegram/ui/ProxySettingsDialogFragment.kt
View file

@ -34,7 +34,7 @@ class ProxySettingsDialogFragment : BaseDialogFragment() {
): View {
mainView = inflater.inflate(R.layout.fragment_proxy_settings_dialog, parent)
val window = dialog.window
val window = dialog?.window
if (window != null) {
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
if (Build.VERSION.SDK_INT >= 21) {

2
OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
View file

@ -70,7 +70,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back)
setNavigationOnClickListener { dismiss() }
}
val window = dialog.window
val window = dialog?.window
if (window != null && Build.VERSION.SDK_INT >= 21) {
window.statusBarColor = ContextCompat.getColor(app, R.color.card_bg_light)
}

2
OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
View file

@ -43,7 +43,7 @@ class SettingsDialogFragment : BaseDialogFragment() {
navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back)
setNavigationOnClickListener { dismiss() }
}
val window = dialog.window
val window = dialog?.window
if (window != null && Build.VERSION.SDK_INT >= 21) {
window.statusBarColor = ContextCompat.getColor(app, R.color.card_bg_light)
}