Mirrors/Frost-for-Facebook
1
0
Fork 0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-09 20:42:34 +01:00
Code Issues Releases Activity

Migrate to androidx (#1257)

Browse Source 
* Initial migration

* Update gradle wrapper

* Update iconics and revert progressanimator api

* Clean up imports

* Update dependencies and address some lint issues

* Update constants

* Remove extra import
This commit is contained in:
Allan Wang 2018-12-23 20:04:08 -05:00 committed by GitHub
parent 813be84a51
commit 88b4073687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 192 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/build.gradle
View File

@ -23,7 +23,7 @@ android {
versionCode androidGitVersion.code() versionCode androidGitVersion.code()
versionName androidGitVersion.name() versionName androidGitVersion.name()
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
applicationVariants.all { variant -> applicationVariants.all { variant ->
@ -148,14 +148,13 @@ repositories {
} }
dependencies { dependencies {
androidTestImplementation("com.android.support.test:runner:${kau.testRunner}") { implementation 'androidx.exifinterface:exifinterface:1.0.0'
exclude group: 'com.android.support', module: 'support-annotations'
}
implementation "com.android.support:exifinterface:${kau.supportLibs}"
androidTestImplementation kauDependency.kotlinTest androidTestImplementation kauDependency.kotlinTest
androidTestImplementation "com.android.support.test:rules:${TEST_RULE}" androidTestImplementation kauDependency.espresso
androidTestImplementation kauDependency.testRules
androidTestImplementation kauDependency.testRunner
testImplementation kauDependency.kotlinTest testImplementation kauDependency.kotlinTest
testImplementation "org.jetbrains.kotlin:kotlin-reflect:${KOTLIN}" testImplementation "org.jetbrains.kotlin:kotlin-reflect:${KOTLIN}"
testImplementation kauDependency.junit testImplementation kauDependency.junit

2
app/src/main/AndroidManifest.xml
View File

@ -156,7 +156,7 @@
</receiver> </receiver>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider" android:authorities="${applicationId}.provider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">

14
app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
View File

@ -1,8 +1,8 @@
package com.pitchedapps.frost.activities package com.pitchedapps.frost.activities
import android.support.constraint.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import android.support.constraint.ConstraintSet import androidx.constraintlayout.widget.ConstraintSet
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
@ -34,7 +34,7 @@ class AboutActivity : AboutActivityBase(null, {
accentColor = Prefs.accentColor accentColor = Prefs.accentColor
backgroundColor = Prefs.bgColor.withMinAlpha(200) backgroundColor = Prefs.bgColor.withMinAlpha(200)
cutoutForeground = Prefs.accentColor cutoutForeground = Prefs.accentColor
cutoutDrawableRes = R.drawable.frost_f_256 cutoutDrawableRes = R.drawable.frost_f_200
faqPageTitleRes = R.string.faq_title faqPageTitleRes = R.string.faq_title
faqXmlRes = R.xml.frost_faq faqXmlRes = R.xml.frost_faq
faqParseNewLine = false faqParseNewLine = false
@ -137,10 +137,10 @@ class AboutActivity : AboutActivityBase(null, {
val size = c.dimenPixelSize(R.dimen.kau_avatar_bounds) val size = c.dimenPixelSize(R.dimen.kau_avatar_bounds)
images = arrayOf<Pair<IIcon, () -> Unit>>( images = arrayOf<Pair<IIcon, () -> Unit>>(
GoogleMaterial.Icon.gmd_arrow_downward to { c.startLink(R.string.github_downloads_url) }, GoogleMaterial.Icon.gmd_arrow_downward to { c.startLink(R.string.github_downloads_url) },
CommunityMaterial.Icon.cmd_reddit to { c.startLink(R.string.reddit_url) }, CommunityMaterial.Icon2.cmd_reddit to { c.startLink(R.string.reddit_url) },
CommunityMaterial.Icon.cmd_github_circle to { c.startLink(R.string.github_url) }, CommunityMaterial.Icon.cmd_github_circle to { c.startLink(R.string.github_url) },
CommunityMaterial.Icon.cmd_slack to { c.startLink(R.string.slack_url) }, CommunityMaterial.Icon2.cmd_slack to { c.startLink(R.string.slack_url) },
CommunityMaterial.Icon.cmd_xda to { c.startLink(R.string.xda_url) } CommunityMaterial.Icon2.cmd_xda to { c.startLink(R.string.xda_url) }
).mapIndexed { i, (icon, onClick) -> ).mapIndexed { i, (icon, onClick) ->
ImageView(c).apply { ImageView(c).apply {
layoutParams = ViewGroup.LayoutParams(size, size) layoutParams = ViewGroup.LayoutParams(size, size)

16
app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
View File

@ -8,14 +8,14 @@ import android.graphics.PointF
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.support.annotation.StringRes import androidx.annotation.StringRes
import android.support.design.widget.AppBarLayout import com.google.android.material.appbar.AppBarLayout
import android.support.design.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import android.support.design.widget.FloatingActionButton import com.google.android.material.floatingactionbutton.FloatingActionButton
import android.support.design.widget.TabLayout import com.google.android.material.tabs.TabLayout
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.support.v4.app.FragmentPagerAdapter import androidx.fragment.app.FragmentPagerAdapter
import android.support.v7.widget.Toolbar import androidx.appcompat.widget.Toolbar
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.webkit.ValueCallback import android.webkit.ValueCallback

6
app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
View File

@ -5,9 +5,9 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.os.Bundle import android.os.Bundle
import android.support.design.widget.FloatingActionButton import com.google.android.material.floatingactionbutton.FloatingActionButton
import android.support.v4.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import android.support.v7.widget.Toolbar import androidx.appcompat.widget.Toolbar
import ca.allanwang.kau.internal.KauBaseActivity import ca.allanwang.kau.internal.KauBaseActivity
import ca.allanwang.kau.utils.bindView import ca.allanwang.kau.utils.bindView
import ca.allanwang.kau.utils.setIcon import ca.allanwang.kau.utils.setIcon

2
app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
View File

@ -5,7 +5,7 @@ import android.content.res.ColorStateList
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.os.Environment import android.os.Environment
import android.support.design.widget.FloatingActionButton import com.google.android.material.floatingactionbutton.FloatingActionButton
import android.view.View import android.view.View
import ca.allanwang.kau.internal.KauBaseActivity import ca.allanwang.kau.internal.KauBaseActivity
import ca.allanwang.kau.logging.KauLoggerExtension import ca.allanwang.kau.logging.KauLoggerExtension

8
app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
View File

@ -4,10 +4,10 @@ import android.animation.ValueAnimator
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.support.v4.app.FragmentManager import androidx.fragment.app.FragmentManager
import android.support.v4.app.FragmentPagerAdapter import androidx.fragment.app.FragmentPagerAdapter
import android.support.v4.view.ViewPager import androidx.viewpager.widget.ViewPager
import android.view.View import android.view.View
import android.view.WindowManager import android.view.WindowManager
import android.widget.Button import android.widget.Button

6
app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
View File

@ -3,9 +3,9 @@ package com.pitchedapps.frost.activities
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.support.v4.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import android.support.v7.widget.AppCompatTextView import androidx.appcompat.widget.AppCompatTextView
import android.support.v7.widget.Toolbar import androidx.appcompat.widget.Toolbar
import android.widget.ImageView import android.widget.ImageView
import ca.allanwang.kau.utils.bindView import ca.allanwang.kau.utils.bindView
import ca.allanwang.kau.utils.fadeIn import ca.allanwang.kau.utils.fadeIn

4
app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
View File

@ -1,8 +1,8 @@
package com.pitchedapps.frost.activities package com.pitchedapps.frost.activities
import android.os.Bundle import android.os.Bundle
import android.support.design.widget.TabLayout import com.google.android.material.tabs.TabLayout
import android.support.v4.view.ViewPager import androidx.viewpager.widget.ViewPager
import com.pitchedapps.frost.facebook.FbItem import com.pitchedapps.frost.facebook.FbItem
import com.pitchedapps.frost.views.BadgedIcon import com.pitchedapps.frost.views.BadgedIcon
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers

8
app/src/main/kotlin/com/pitchedapps/frost/activities/SelectorActivity.kt
View File

@ -1,10 +1,10 @@
package com.pitchedapps.frost.activities package com.pitchedapps.frost.activities
import android.os.Bundle import android.os.Bundle
import android.support.constraint.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import android.support.v7.widget.AppCompatTextView import androidx.appcompat.widget.AppCompatTextView
import android.support.v7.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.view.View import android.view.View
import ca.allanwang.kau.utils.bindView import ca.allanwang.kau.utils.bindView
import com.mikepenz.fastadapter.FastAdapter import com.mikepenz.fastadapter.FastAdapter

2
app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
View File

@ -100,7 +100,7 @@ class SettingsActivity : KPrefActivity() {
subItems(R.string.newsfeed, getFeedPrefs()) { subItems(R.string.newsfeed, getFeedPrefs()) {
descRes = R.string.newsfeed_desc descRes = R.string.newsfeed_desc
iicon = CommunityMaterial.Icon.cmd_newspaper iicon = CommunityMaterial.Icon2.cmd_newspaper
} }
subItems(R.string.notifications, getNotificationPrefs()) { subItems(R.string.notifications, getNotificationPrefs()) {

10
app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
View File

@ -3,10 +3,10 @@ package com.pitchedapps.frost.activities
import android.app.Activity import android.app.Activity
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.os.Bundle import android.os.Bundle
import android.support.design.widget.FloatingActionButton import com.google.android.material.floatingactionbutton.FloatingActionButton
import android.support.v7.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.support.v7.widget.helper.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
import android.view.View import android.view.View
import android.view.animation.AnimationUtils import android.view.animation.AnimationUtils
import android.widget.TextView import android.widget.TextView
@ -50,7 +50,7 @@ class TabCustomizerActivity : BaseActivity() {
toolbar.setBackgroundColor(Prefs.headerColor) toolbar.setBackgroundColor(Prefs.headerColor)
recycler.layoutManager = GridLayoutManager(this, TAB_COUNT, GridLayoutManager.VERTICAL, false) recycler.layoutManager = GridLayoutManager(this, TAB_COUNT, RecyclerView.VERTICAL, false)
recycler.adapter = adapter recycler.adapter = adapter
recycler.setHasFixedSize(true) recycler.setHasFixedSize(true)

10
app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
View File

@ -5,9 +5,8 @@ import android.content.Intent
import android.graphics.PointF import android.graphics.PointF
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.support.design.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import android.support.design.widget.Snackbar import androidx.appcompat.widget.Toolbar
import android.support.v7.widget.Toolbar
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.webkit.ValueCallback import android.webkit.ValueCallback
@ -16,6 +15,7 @@ import android.widget.FrameLayout
import ca.allanwang.kau.swipe.kauSwipeOnCreate import ca.allanwang.kau.swipe.kauSwipeOnCreate
import ca.allanwang.kau.swipe.kauSwipeOnDestroy import ca.allanwang.kau.swipe.kauSwipeOnDestroy
import ca.allanwang.kau.utils.* import ca.allanwang.kau.utils.*
import com.google.android.material.snackbar.BaseTransientBottomBar
import com.mikepenz.community_material_typeface_library.CommunityMaterial import com.mikepenz.community_material_typeface_library.CommunityMaterial
import com.mikepenz.google_material_typeface_library.GoogleMaterial import com.mikepenz.google_material_typeface_library.GoogleMaterial
import com.pitchedapps.frost.R import com.pitchedapps.frost.R
@ -168,7 +168,7 @@ open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : BaseAc
else reloadBase(true) else reloadBase(true)
if (Showcase.firstWebOverlay) { if (Showcase.firstWebOverlay) {
coordinator.frostSnackbar(R.string.web_overlay_swipe_hint) { coordinator.frostSnackbar(R.string.web_overlay_swipe_hint) {
duration = Snackbar.LENGTH_INDEFINITE duration = BaseTransientBottomBar.LENGTH_INDEFINITE
setAction(R.string.kau_got_it) { _ -> this.dismiss() } setAction(R.string.kau_got_it) { _ -> this.dismiss() }
} }
} }
@ -248,7 +248,7 @@ open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : BaseAc
overlayContext?.onMenuCreate(this, menu) overlayContext?.onMenuCreate(this, menu)
toolbar.tint(Prefs.iconColor) toolbar.tint(Prefs.iconColor)
setMenuIcons(menu, Prefs.iconColor, setMenuIcons(menu, Prefs.iconColor,
R.id.action_share to CommunityMaterial.Icon.cmd_share, R.id.action_share to CommunityMaterial.Icon2.cmd_share,
R.id.action_copy_link to GoogleMaterial.Icon.gmd_content_copy) R.id.action_copy_link to GoogleMaterial.Icon.gmd_content_copy)
return true return true
} }

2
app/src/main/kotlin/com/pitchedapps/frost/enums/FeedSort.kt
View File

@ -1,6 +1,6 @@
package com.pitchedapps.frost.enums package com.pitchedapps.frost.enums
import android.support.annotation.StringRes import androidx.annotation.StringRes
import com.pitchedapps.frost.R import com.pitchedapps.frost.R
import com.pitchedapps.frost.facebook.FbItem import com.pitchedapps.frost.facebook.FbItem

2
app/src/main/kotlin/com/pitchedapps/frost/enums/Support.kt
View File

@ -1,7 +1,7 @@
package com.pitchedapps.frost.enums package com.pitchedapps.frost.enums
import android.content.Context import android.content.Context
import android.support.annotation.StringRes import androidx.annotation.StringRes
import ca.allanwang.kau.utils.string import ca.allanwang.kau.utils.string
import com.pitchedapps.frost.R import com.pitchedapps.frost.R
import com.pitchedapps.frost.utils.sendFrostEmail import com.pitchedapps.frost.utils.sendFrostEmail

2
app/src/main/kotlin/com/pitchedapps/frost/enums/Theme.kt
View File

@ -1,7 +1,7 @@
package com.pitchedapps.frost.enums package com.pitchedapps.frost.enums
import android.graphics.Color import android.graphics.Color
import android.support.annotation.StringRes import androidx.annotation.StringRes
import com.pitchedapps.frost.R import com.pitchedapps.frost.R
import com.pitchedapps.frost.injectors.CssAssets import com.pitchedapps.frost.injectors.CssAssets
import com.pitchedapps.frost.injectors.InjectorContract import com.pitchedapps.frost.injectors.InjectorContract

6
app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
View File

@ -1,6 +1,6 @@
package com.pitchedapps.frost.facebook package com.pitchedapps.frost.facebook
import android.support.annotation.StringRes import androidx.annotation.StringRes
import com.mikepenz.community_material_typeface_library.CommunityMaterial import com.mikepenz.community_material_typeface_library.CommunityMaterial
import com.mikepenz.google_material_typeface_library.GoogleMaterial import com.mikepenz.google_material_typeface_library.GoogleMaterial
import com.mikepenz.iconics.typeface.IIcon import com.mikepenz.iconics.typeface.IIcon
@ -25,14 +25,14 @@ enum class FbItem(
BIRTHDAYS(R.string.birthdays, GoogleMaterial.Icon.gmd_cake, "events/birthdays"), BIRTHDAYS(R.string.birthdays, GoogleMaterial.Icon.gmd_cake, "events/birthdays"),
CHAT(R.string.chat, GoogleMaterial.Icon.gmd_chat, "buddylist"), CHAT(R.string.chat, GoogleMaterial.Icon.gmd_chat, "buddylist"),
EVENTS(R.string.events, GoogleMaterial.Icon.gmd_event_note, "events/upcoming"), EVENTS(R.string.events, GoogleMaterial.Icon.gmd_event_note, "events/upcoming"),
FEED(R.string.feed, CommunityMaterial.Icon.cmd_newspaper, ""), FEED(R.string.feed, CommunityMaterial.Icon2.cmd_newspaper, ""),
FEED_MOST_RECENT(R.string.most_recent, GoogleMaterial.Icon.gmd_history, "home.php?sk=h_chr"), FEED_MOST_RECENT(R.string.most_recent, GoogleMaterial.Icon.gmd_history, "home.php?sk=h_chr"),
FEED_TOP_STORIES(R.string.top_stories, GoogleMaterial.Icon.gmd_star, "home.php?sk=h_nor"), FEED_TOP_STORIES(R.string.top_stories, GoogleMaterial.Icon.gmd_star, "home.php?sk=h_nor"),
FRIENDS(R.string.friends, GoogleMaterial.Icon.gmd_person_add, "friends/center/requests"), FRIENDS(R.string.friends, GoogleMaterial.Icon.gmd_person_add, "friends/center/requests"),
GROUPS(R.string.groups, GoogleMaterial.Icon.gmd_group, "groups"), GROUPS(R.string.groups, GoogleMaterial.Icon.gmd_group, "groups"),
MENU(R.string.menu, GoogleMaterial.Icon.gmd_menu, "settings", ::MenuFragment), MENU(R.string.menu, GoogleMaterial.Icon.gmd_menu, "settings", ::MenuFragment),
MESSAGES(R.string.messages, MaterialDesignIconic.Icon.gmi_comments, "messages"), MESSAGES(R.string.messages, MaterialDesignIconic.Icon.gmi_comments, "messages"),
NOTES(R.string.notes, CommunityMaterial.Icon.cmd_note, "notes"), NOTES(R.string.notes, CommunityMaterial.Icon2.cmd_note, "notes"),
NOTIFICATIONS(R.string.notifications, MaterialDesignIconic.Icon.gmi_globe, "notifications", ::NotificationFragment), NOTIFICATIONS(R.string.notifications, MaterialDesignIconic.Icon.gmi_globe, "notifications", ::NotificationFragment),
ON_THIS_DAY(R.string.on_this_day, GoogleMaterial.Icon.gmd_today, "onthisday"), ON_THIS_DAY(R.string.on_this_day, GoogleMaterial.Icon.gmd_today, "onthisday"),
PAGES(R.string.pages, GoogleMaterial.Icon.gmd_flag, "pages"), PAGES(R.string.pages, GoogleMaterial.Icon.gmd_flag, "pages"),

4
app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
View File

@ -2,8 +2,8 @@ package com.pitchedapps.frost.fragments
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.support.design.widget.FloatingActionButton import com.google.android.material.floatingactionbutton.FloatingActionButton
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup

4
app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
View File

@ -3,8 +3,8 @@ package com.pitchedapps.frost.intro
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.os.Bundle import android.os.Bundle
import android.support.constraint.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup

6
app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
View File

@ -8,8 +8,8 @@ import android.net.Uri
import android.os.BaseBundle import android.os.BaseBundle
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.NotificationCompat import androidx.core.app.NotificationCompat
import android.support.v4.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import ca.allanwang.kau.utils.dpToPx import ca.allanwang.kau.utils.dpToPx
import ca.allanwang.kau.utils.string import ca.allanwang.kau.utils.string
import com.pitchedapps.frost.BuildConfig import com.pitchedapps.frost.BuildConfig
@ -206,7 +206,7 @@ enum class NotificationType(
.setCategory(Notification.CATEGORY_SOCIAL) .setCategory(Notification.CATEGORY_SOCIAL)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
notifBuilder.setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN) notifBuilder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
} }
return FrostNotification(group, 1, notifBuilder) return FrostNotification(group, 1, notifBuilder)

2
app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
View File

@ -2,7 +2,7 @@ package com.pitchedapps.frost.services
import android.app.job.JobParameters import android.app.job.JobParameters
import android.app.job.JobService import android.app.job.JobService
import android.support.v4.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import ca.allanwang.kau.utils.string import ca.allanwang.kau.utils.string
import com.pitchedapps.frost.BuildConfig import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.R import com.pitchedapps.frost.R

8
app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt
View File

@ -11,8 +11,8 @@ import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.PersistableBundle import android.os.PersistableBundle
import android.support.annotation.RequiresApi import androidx.annotation.RequiresApi
import android.support.v4.app.NotificationCompat import androidx.core.app.NotificationCompat
import ca.allanwang.kau.utils.color import ca.allanwang.kau.utils.color
import ca.allanwang.kau.utils.string import ca.allanwang.kau.utils.string
import com.pitchedapps.frost.R import com.pitchedapps.frost.R
@ -70,8 +70,8 @@ fun Context.frostNotification(id: String) =
fun NotificationCompat.Builder.setFrostAlert(enable: Boolean, ringtone: String): NotificationCompat.Builder { fun NotificationCompat.Builder.setFrostAlert(enable: Boolean, ringtone: String): NotificationCompat.Builder {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
setGroupAlertBehavior( setGroupAlertBehavior(
if (enable) Notification.GROUP_ALERT_CHILDREN if (enable) NotificationCompat.GROUP_ALERT_CHILDREN
else Notification.GROUP_ALERT_SUMMARY) else NotificationCompat.GROUP_ALERT_SUMMARY)
} else if (!enable) { } else if (!enable) {
setDefaults(0) setDefaults(0)
} else { } else {

2
app/src/main/kotlin/com/pitchedapps/frost/utils/AnimatedVectorDelegate.kt
View File

@ -1,7 +1,7 @@
package com.pitchedapps.frost.utils package com.pitchedapps.frost.utils
import android.graphics.drawable.AnimatedVectorDrawable import android.graphics.drawable.AnimatedVectorDrawable
import android.support.annotation.DrawableRes import androidx.annotation.DrawableRes
import android.widget.ImageView import android.widget.ImageView
import ca.allanwang.kau.utils.drawable import ca.allanwang.kau.utils.drawable

10
app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
View File

@ -8,11 +8,10 @@ import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.net.Uri import android.net.Uri
import android.support.annotation.StringRes import androidx.annotation.StringRes
import android.support.design.widget.Snackbar import com.google.android.material.snackbar.Snackbar
import android.support.design.widget.SnackbarContentLayout import androidx.core.content.FileProvider
import android.support.v4.content.FileProvider import androidx.appcompat.widget.Toolbar
import android.support.v7.widget.Toolbar
import android.view.View import android.view.View
import android.widget.FrameLayout import android.widget.FrameLayout
import android.widget.TextView import android.widget.TextView
@ -23,6 +22,7 @@ import ca.allanwang.kau.mediapicker.createPrivateMediaFile
import ca.allanwang.kau.utils.* import ca.allanwang.kau.utils.*
import ca.allanwang.kau.xml.showChangelog import ca.allanwang.kau.xml.showChangelog
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.google.android.material.snackbar.SnackbarContentLayout
import com.pitchedapps.frost.BuildConfig import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.R import com.pitchedapps.frost.R
import com.pitchedapps.frost.activities.* import com.pitchedapps.frost.activities.*

4
app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
View File

@ -1,8 +1,8 @@
package com.pitchedapps.frost.views package com.pitchedapps.frost.views
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.support.v7.widget.AppCompatTextView import androidx.appcompat.widget.AppCompatTextView
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView
import ca.allanwang.kau.iitems.KauIItem import ca.allanwang.kau.iitems.KauIItem

2
app/src/main/kotlin/com/pitchedapps/frost/views/BadgedIcon.kt
View File

@ -2,7 +2,7 @@ package com.pitchedapps.frost.views
import android.content.Context import android.content.Context
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.support.constraint.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import android.util.AttributeSet import android.util.AttributeSet
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView

2
app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt
View File

@ -2,7 +2,7 @@ package com.pitchedapps.frost.views
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
import android.support.v4.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import android.widget.FrameLayout import android.widget.FrameLayout

4
app/src/main/kotlin/com/pitchedapps/frost/views/FrostRecyclerView.kt
View File

@ -1,8 +1,8 @@
package com.pitchedapps.frost.views package com.pitchedapps.frost.views
import android.content.Context import android.content.Context
import android.support.v7.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import ca.allanwang.kau.utils.circularReveal import ca.allanwang.kau.utils.circularReveal

6
app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt
View File

@ -79,7 +79,7 @@ class FrostVideoView @JvmOverloads constructor(
if (!isPlaying) showControls() if (!isPlaying) showControls()
else viewerContract.onControlsHidden() else viewerContract.onControlsHidden()
} }
}.start() }
} else { } else {
hideControls() hideControls()
val (scale, tX, tY) = mapBounds() val (scale, tX, tY) = mapBounds()
@ -90,7 +90,7 @@ class FrostVideoView @JvmOverloads constructor(
withAnimator(origScale, scale) { scaleXY = it } withAnimator(origScale, scale) { scaleXY = it }
withAnimator(origX, tX) { translationX = it } withAnimator(origX, tX) { translationX = it }
withAnimator(origY, tY) { translationY = it } withAnimator(origY, tY) { translationY = it }
}.start() }
} }
} }
@ -210,7 +210,7 @@ class FrostVideoView @JvmOverloads constructor(
duration = FAST_ANIMATION_DURATION duration = FAST_ANIMATION_DURATION
withAnimator(alpha, 0f) { alpha = it } withAnimator(alpha, 0f) { alpha = it }
withEndAction { onFinishedListener() } withEndAction { onFinishedListener() }
}.start() }
else else
onFinishedListener() onFinishedListener()
} }

2
app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt
View File

@ -4,7 +4,7 @@ import android.content.Context
import android.graphics.Color import android.graphics.Color
import android.graphics.PointF import android.graphics.PointF
import android.net.Uri import android.net.Uri
import android.support.v7.widget.Toolbar import androidx.appcompat.widget.Toolbar
import android.util.AttributeSet import android.util.AttributeSet
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View

2
app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
View File

@ -2,7 +2,7 @@ package com.pitchedapps.frost.views
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.support.v4.view.ViewPager import androidx.viewpager.widget.ViewPager
import android.util.AttributeSet import android.util.AttributeSet
import android.view.MotionEvent import android.view.MotionEvent
import com.pitchedapps.frost.utils.Prefs import com.pitchedapps.frost.utils.Prefs

10
app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt
View File

@ -2,11 +2,11 @@ package com.pitchedapps.frost.views
import android.content.Context import android.content.Context
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.support.constraint.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import android.support.v7.widget.AppCompatEditText import androidx.appcompat.widget.AppCompatEditText
import android.support.v7.widget.AppCompatTextView import androidx.appcompat.widget.AppCompatTextView
import android.support.v7.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView

2
app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
View File

@ -4,7 +4,7 @@ import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.Color import android.graphics.Color
import android.support.annotation.WorkerThread import androidx.annotation.WorkerThread
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import android.webkit.WebView import android.webkit.WebView

6
app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt
View File

@ -2,9 +2,9 @@ package com.pitchedapps.frost.web
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.support.v4.view.NestedScrollingChild import androidx.core.view.NestedScrollingChild
import android.support.v4.view.NestedScrollingChildHelper import androidx.core.view.NestedScrollingChildHelper
import android.support.v4.view.ViewCompat import androidx.core.view.ViewCompat
import android.util.AttributeSet import android.util.AttributeSet
import android.view.MotionEvent import android.view.MotionEvent
import android.webkit.WebView import android.webkit.WebView

4
app/src/main/res/drawable/frost_f_256.xml → app/src/main/res/drawable/frost_f_200.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="256dp" android:width="200dp"
android:height="256dp" android:height="200dp"
android:viewportHeight="177.16534" android:viewportHeight="177.16534"
android:viewportWidth="177.16534"> android:viewportWidth="177.16534">

10
app/src/main/res/layout/activity_debug.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -7,7 +7,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".activities.DebugActivity"> tools:context=".activities.DebugActivity">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
@ -16,7 +16,7 @@
app:layout_scrollFlags="scroll|enterAlways" app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay" /> app:popupTheme="@style/AppTheme.PopupOverlay" />
<android.support.v4.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh" android:id="@+id/swipe_refresh"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -29,8 +29,8 @@
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" /> android:focusableInTouchMode="true" />
</android.support.v4.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<include layout="@layout/view_main_fab" /> <include layout="@layout/view_main_fab" />
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

6
app/src/main/res/layout/activity_image.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/image_container" android:id="@+id/image_container"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -37,7 +37,7 @@
</com.sothree.slidinguppanel.SlidingUpPanelLayout> </com.sothree.slidinguppanel.SlidingUpPanelLayout>
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/image_fab" android:id="@+id/image_fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -45,4 +45,4 @@
android:layout_margin="@dimen/kau_fab_margin" android:layout_margin="@dimen/kau_fab_margin"
android:visibility="invisible" /> android:visibility="invisible" />
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

6
app/src/main/res/layout/activity_image_textless.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/image_container" android:id="@+id/image_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -19,7 +19,7 @@
android:scaleX="0.9" android:scaleX="0.9"
android:scaleY="0.9" /> android:scaleY="0.9" />
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/image_fab" android:id="@+id/image_fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -27,4 +27,4 @@
android:layout_margin="@dimen/kau_fab_margin" android:layout_margin="@dimen/kau_fab_margin"
android:visibility="invisible" /> android:visibility="invisible" />
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

8
app/src/main/res/layout/activity_intro.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -14,14 +14,14 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<android.support.constraint.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/intro_bar_guide" android:id="@+id/intro_bar_guide"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/intro_bar_height" /> app:layout_constraintGuide_end="@dimen/intro_bar_height" />
<android.support.v4.view.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/intro_viewpager" android:id="@+id/intro_viewpager"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -60,4 +60,4 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/intro_bar_guide" /> app:layout_constraintTop_toBottomOf="@id/intro_bar_guide" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/activity_invalid.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -31,4 +31,4 @@
app:layout_constraintTop_toBottomOf="@id/invalid_icon" app:layout_constraintTop_toBottomOf="@id/invalid_icon"
app:layout_constraintVertical_bias="0.25" /> app:layout_constraintVertical_bias="0.25" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/activity_login.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -7,7 +7,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".activities.LoginActivity"> tools:context=".activities.LoginActivity">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
@ -25,4 +25,4 @@
</FrameLayout> </FrameLayout>
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

8
app/src/main/res/layout/activity_main.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_content" android:id="@+id/main_content"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -7,7 +7,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".activities.MainActivity"> tools:context=".activities.MainActivity">
<android.support.design.widget.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -17,10 +17,10 @@
<include layout="@layout/view_main_tab_layout" /> <include layout="@layout/view_main_tab_layout" />
</android.support.design.widget.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/view_main_viewpager" /> <include layout="@layout/view_main_viewpager" />
<include layout="@layout/view_main_fab" /> <include layout="@layout/view_main_fab" />
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

8
app/src/main/res/layout/activity_main_bottom_tabs.xml
View File

@ -5,7 +5,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.design.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/main_content" android:id="@+id/main_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
@ -13,7 +13,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".activities.MainActivity"> tools:context=".activities.MainActivity">
<android.support.design.widget.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -21,13 +21,13 @@
<include layout="@layout/view_main_toolbar" /> <include layout="@layout/view_main_toolbar" />
</android.support.design.widget.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/view_main_viewpager" /> <include layout="@layout/view_main_viewpager" />
<include layout="@layout/view_main_fab" /> <include layout="@layout/view_main_fab" />
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
<include layout="@layout/view_main_tab_layout" /> <include layout="@layout/view_main_tab_layout" />

8
app/src/main/res/layout/activity_selector.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
@ -10,7 +10,7 @@
android:paddingStart="@dimen/kau_activity_horizontal_margin" android:paddingStart="@dimen/kau_activity_horizontal_margin"
android:paddingTop="@dimen/kau_activity_vertical_margin"> android:paddingTop="@dimen/kau_activity_vertical_margin">
<android.support.v7.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_select_account" android:id="@+id/text_select_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -24,7 +24,7 @@
tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="0dp" /> tools:layout_editor_absoluteY="0dp" />
<android.support.v7.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/selector_recycler" android:id="@+id/selector_recycler"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -37,4 +37,4 @@
tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="0dp" /> tools:layout_editor_absoluteY="0dp" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/activity_tab_customizer.xml
View File

@ -16,7 +16,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/tab_recycler" android:id="@+id/tab_recycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
@ -36,14 +36,14 @@
</LinearLayout> </LinearLayout>
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_cancel" android:id="@+id/fab_cancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|bottom" android:layout_gravity="start|bottom"
android:layout_margin="@dimen/kau_fab_margin" /> android:layout_margin="@dimen/kau_fab_margin" />
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_save" android:id="@+id/fab_save"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

6
app/src/main/res/layout/activity_web_overlay.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/overlay_main_content" android:id="@+id/overlay_main_content"
@ -8,7 +8,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".activities.WebOverlayActivity"> tools:context=".activities.WebOverlayActivity">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/overlay_toolbar" android:id="@+id/overlay_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
@ -23,4 +23,4 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize" /> android:layout_marginTop="?attr/actionBarSize" />
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/iitem_menu.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/item_frame" android:id="@+id/item_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -39,4 +39,4 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5" /> app:layout_constraintVertical_bias="0.5" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/iitem_notification.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/item_frame" android:id="@+id/item_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -57,4 +57,4 @@
app:layout_constraintVertical_bias="1.0" /> app:layout_constraintVertical_bias="1.0" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/intro_end.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -23,7 +23,7 @@
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="120dp" android:layout_height="120dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/frost_f_256" android:src="@drawable/frost_f_200"
app:layout_constraintBottom_toTopOf="@id/intro_desc" app:layout_constraintBottom_toTopOf="@id/intro_desc"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -41,4 +41,4 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/intro_image" /> app:layout_constraintTop_toBottomOf="@id/intro_image" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/intro_image.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -53,4 +53,4 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/intro_image" /> app:layout_constraintTop_toBottomOf="@id/intro_image" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/intro_theme.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -75,4 +75,4 @@
tools:layout_editor_absoluteX="112dp" /> tools:layout_editor_absoluteX="112dp" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/intro_welcome.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -22,7 +22,7 @@
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="120dp" android:layout_height="120dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/frost_f_256" android:src="@drawable/frost_f_200"
app:layout_constraintBottom_toTopOf="@id/intro_desc" app:layout_constraintBottom_toTopOf="@id/intro_desc"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -40,4 +40,4 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/intro_image" /> app:layout_constraintTop_toBottomOf="@id/intro_image" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/item_about_links.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--Just the container core so we can bind it to an AdapterItem--> <!--Just the container core so we can bind it to an AdapterItem-->
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/about_icons_container" android:id="@+id/about_icons_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
app/src/main/res/layout/item_keyword.xml
View File

@ -7,7 +7,7 @@
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingTop="8dp"> android:paddingTop="8dp">
<android.support.v7.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/keyword_text" android:id="@+id/keyword_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

6
app/src/main/res/layout/login_webview.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swipe_refresh" android:id="@+id/swipe_refresh"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -18,7 +18,7 @@
android:scaleType="centerInside" android:scaleType="centerInside"
android:visibility="invisible" /> android:visibility="invisible" />
<android.support.v7.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/textview" android:id="@+id/textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -36,4 +36,4 @@
</RelativeLayout> </RelativeLayout>
</android.support.v4.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

4
app/src/main/res/layout/material_drawer_header.xml
View File

@ -92,7 +92,7 @@
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:lines="1" android:lines="1"
android:maxLines="1" android:maxLines="1"
android:textSize="@dimen/material_drawer_account_header_text" /> android:textSize="@dimen/material_drawer_account_header_title" />
<TextView <TextView
android:id="@+id/material_drawer_account_header_email" android:id="@+id/material_drawer_account_header_email"
@ -102,7 +102,7 @@
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:lines="1" android:lines="1"
android:maxLines="1" android:maxLines="1"
android:textSize="@dimen/material_drawer_account_header_text" /> android:textSize="@dimen/material_drawer_account_header_subtext" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/layout/view_account.xml
View File

@ -10,11 +10,11 @@
android:layout_width="@dimen/account_image_size" android:layout_width="@dimen/account_image_size"
android:layout_height="@dimen/account_image_size" /> android:layout_height="@dimen/account_image_size" />
<android.support.v4.widget.Space <androidx.legacy.widget.Space
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="20dp" /> android:layout_height="20dp" />
<android.support.v7.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/account_text" android:id="@+id/account_text"
android:layout_width="@dimen/account_image_size" android:layout_width="@dimen/account_image_size"
android:layout_height="wrap_content" android:layout_height="wrap_content"

8
app/src/main/res/layout/view_badged_icon.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tab_bar_height" android:layout_height="@dimen/tab_bar_height"
android:minWidth="@dimen/tab_bar_height"> android:minWidth="@dimen/tab_bar_height">
<android.support.constraint.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/g_v_c" android:id="@+id/g_v_c"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -15,7 +15,7 @@
tools:layout_editor_absoluteX="192dp" tools:layout_editor_absoluteX="192dp"
tools:layout_editor_absoluteY="0dp" /> tools:layout_editor_absoluteY="0dp" />
<android.support.constraint.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/g_h_c" android:id="@+id/g_h_c"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -52,4 +52,4 @@
app:layout_constraintVertical_bias="1" app:layout_constraintVertical_bias="1"
tools:layout_editor_absoluteX="8dp" /> tools:layout_editor_absoluteX="8dp" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/view_content_base_recycler.xml
View File

@ -6,7 +6,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v4.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@id/content_refresh" android:id="@id/content_refresh"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -19,7 +19,7 @@
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</android.support.v4.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<ProgressBar <ProgressBar
android:id="@id/content_progress" android:id="@id/content_progress"

4
app/src/main/res/layout/view_content_base_web.xml
View File

@ -6,7 +6,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v4.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@id/content_refresh" android:id="@id/content_refresh"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -19,7 +19,7 @@
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</android.support.v4.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<ProgressBar <ProgressBar
android:id="@id/content_progress" android:id="@id/content_progress"

8
app/src/main/res/layout/view_keywords.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -7,7 +7,7 @@
android:paddingEnd="@dimen/kau_dialog_margin" android:paddingEnd="@dimen/kau_dialog_margin"
android:paddingStart="@dimen/kau_dialog_margin"> android:paddingStart="@dimen/kau_dialog_margin">
<android.support.v7.widget.AppCompatEditText <androidx.appcompat.widget.AppCompatEditText
android:id="@+id/edit_text" android:id="@+id/edit_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="48dp" android:layout_height="48dp"
@ -31,7 +31,7 @@
app:layout_constraintStart_toEndOf="@id/edit_text" app:layout_constraintStart_toEndOf="@id/edit_text"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<android.support.v7.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler" android:id="@+id/recycler"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -41,4 +41,4 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/edit_text" /> app:layout_constraintTop_toBottomOf="@id/edit_text" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/view_main_fab.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fab" android:id="@+id/fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
app/src/main/res/layout/view_main_tab_layout.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.tabs.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tabs" android:id="@+id/tabs"
style="@style/Widget.Design.TabLayout" style="@style/Widget.Design.TabLayout"

2
app/src/main/res/layout/view_main_toolbar.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/view_video.xml
View File

@ -32,7 +32,7 @@
</com.pitchedapps.frost.views.FrostVideoView> </com.pitchedapps.frost.views.FrostVideoView>
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/video_toolbar" android:id="@+id/video_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@drawable/exomedia_default_controls_interactive_background" android:background="@drawable/exomedia_default_controls_interactive_background"

2
build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
dependencies { dependencies {
classpath "ca.allanwang:kau:${KAU}" classpath "ca.allanwang:kau:${KAU}"
classpath 'com.android.tools.build:gradle:3.2.1' classpath "com.android.tools.build:gradle:${ANDROID_GRADLE}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN}"
classpath "com.bugsnag:bugsnag-android-gradle-plugin:${BUGSNAG_PLUGIN}" classpath "com.bugsnag:bugsnag-android-gradle-plugin:${BUGSNAG_PLUGIN}"
classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${DEX_PLUGIN}" classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${DEX_PLUGIN}"

28
gradle.properties
View File

@ -14,17 +14,20 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
APP_ID=Frost APP_ID=Frost
APP_GROUP=com.pitchedapps APP_GROUP=com.pitchedapps
KAU=572d470 KAU=0d24880
KOTLIN=1.3.10 KOTLIN=1.3.11
# https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
ANDROID_GRADLE=3.3.0-rc02
# https://github.com/bugsnag/bugsnag-android/releases # https://github.com/bugsnag/bugsnag-android/releases
BUGSNAG=4.9.2 BUGSNAG=4.9.3
# https://github.com/bugsnag/bugsnag-android-gradle-plugin/releases # https://github.com/bugsnag/bugsnag-android-gradle-plugin/releases
BUGSNAG_PLUGIN=3.5.0 BUGSNAG_PLUGIN=3.6.0
# https://github.com/KeepSafe/dexcount-gradle-plugin/releases # https://github.com/KeepSafe/dexcount-gradle-plugin/releases
DEX_PLUGIN=0.8.4 DEX_PLUGIN=0.8.4
# https://github.com/gladed/gradle-android-git-version/releases # https://github.com/gladed/gradle-android-git-version/releases
GIT_PLUGIN=0.4.5 GIT_PLUGIN=0.4.7
# https://mvnrepository.com/artifact/org.apache.commons/commons-text # https://mvnrepository.com/artifact/org.apache.commons/commons-text
# Updates blocked due to javax.script dependency # Updates blocked due to javax.script dependency
COMMONS_TEXT=1.4 COMMONS_TEXT=1.4
@ -34,25 +37,25 @@ DBFLOW=4.2.4
EXOMEDIA=4.3.0 EXOMEDIA=4.3.0
# https://github.com/FasterXML/jackson-core/releases # https://github.com/FasterXML/jackson-core/releases
JACKSON=2.9.7 JACKSON=2.9.8
# https://github.com/jhy/jsoup/releases # https://github.com/jhy/jsoup/releases
JSOUP=1.11.3 JSOUP=1.11.3
# https://github.com/square/leakcanary/releases # https://github.com/square/leakcanary/releases
LEAK_CANARY=1.6.2 LEAK_CANARY=1.6.2
# https://github.com/zsmb13/MaterialDrawerKt/releases # https://github.com/zsmb13/MaterialDrawerKt/releases
MATERIAL_DRAWER_KT=1.3.7 MATERIAL_DRAWER_KT=2.0.1
# https://github.com/square/okhttp/releases # https://github.com/square/okhttp/releases
OKHTTP=3.12.0 OKHTTP=3.12.1
# https://github.com/grandstaish/paperparcel/releases # https://github.com/grandstaish/paperparcel/releases
PAPER_PARCEL=2.0.6 PAPER_PARCEL=2.0.6
# http://robolectric.org/getting-started/ # http://robolectric.org/getting-started/
ROBOELECTRIC=4.0.2 ROBOELECTRIC=4.1
# https://github.com/ReactiveX/RxAndroid/releases # https://github.com/ReactiveX/RxAndroid/releases
RX_ANDROID=2.1.0 RX_ANDROID=2.1.0
# https://github.com/JakeWharton/RxBinding/releases # https://github.com/JakeWharton/RxBinding/releases
RX_BINDING=2.2.0 RX_BINDING=2.2.0
# https://github.com/ReactiveX/RxJava/releases # https://github.com/ReactiveX/RxJava/releases
RX_JAVA=2.2.3 RX_JAVA=2.2.4
# https://github.com/ReactiveX/RxKotlin/releases # https://github.com/ReactiveX/RxKotlin/releases
RX_KOTLIN=2.3.0 RX_KOTLIN=2.3.0
# https://github.com/pwittchen/ReactiveNetwork/releases # https://github.com/pwittchen/ReactiveNetwork/releases
@ -61,5 +64,6 @@ RX_NETWORK=2.1.0
SCALE_IMAGE_VIEW=3.10.0 SCALE_IMAGE_VIEW=3.10.0
# https://github.com/umano/AndroidSlidingUpPanel#importing-the-library # https://github.com/umano/AndroidSlidingUpPanel#importing-the-library
SLIDING_PANEL=3.4.0 SLIDING_PANEL=3.4.0
# https://developer.android.com/training/testing/set-up-project#gradle-dependencies
TEST_RULE=1.0.2 android.useAndroidX=true
android.enableJetifier=true

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,6 @@
#Sun Dec 23 17:28:36 EST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip