diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-03 22:21:51 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-03 22:21:51 -0700 |
commit | 7746e63373c905faa6d7e45e45fffc48d3ffff85 (patch) | |
tree | 5d1bd4338a722619bb892abb308b369abc61f396 /app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt | |
parent | 5583f519dd7c4843f045029b0e48fd882dd79c71 (diff) | |
download | frost-7746e63373c905faa6d7e45e45fffc48d3ffff85.tar.gz frost-7746e63373c905faa6d7e45e45fffc48d3ffff85.tar.bz2 frost-7746e63373c905faa6d7e45e45fffc48d3ffff85.zip |
Add IM notifications, FAQ, video uploading, and geolocations (#107)
* Test canary
* Update activities to use kau base
* Update dependencies
* Cherry pick faq
* Update kau and add faq
* Add readme badges
* Add im notifications and video uploading
* Update theme
* Update and fix unit tests
* Add geolocation
* Prepare alpha test
* Remove explicit nonnull request
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt index a6396b1b..df1228bd 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt @@ -23,12 +23,11 @@ import android.view.Menu import android.view.MenuItem import android.webkit.ValueCallback import android.webkit.WebChromeClient -import ca.allanwang.kau.changelog.showChangelog -import ca.allanwang.kau.permissions.kauOnRequestPermissionsResult import ca.allanwang.kau.searchview.SearchItem import ca.allanwang.kau.searchview.SearchView import ca.allanwang.kau.searchview.bindSearchView import ca.allanwang.kau.utils.* +import ca.allanwang.kau.xml.showChangelog import co.zsmb.materialdrawerkt.builders.Builder import co.zsmb.materialdrawerkt.builders.accountHeader import co.zsmb.materialdrawerkt.builders.drawer @@ -57,6 +56,7 @@ import com.pitchedapps.frost.fragments.WebFragment import com.pitchedapps.frost.utils.* import com.pitchedapps.frost.utils.iab.FrostBilling import com.pitchedapps.frost.utils.iab.IABMain +import com.pitchedapps.frost.utils.iab.IS_FROST_PRO import com.pitchedapps.frost.views.BadgedIcon import com.pitchedapps.frost.views.FrostViewPager import com.pitchedapps.frost.web.SearchWebView @@ -117,12 +117,11 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract, Prefs.versionCode = BuildConfig.VERSION_CODE if (!BuildConfig.DEBUG) { showChangelog(R.xml.frost_changelog, Prefs.textColor) { theme() } - frostAnswersCustom("Version") { - putCustomAttribute("Version code", BuildConfig.VERSION_CODE) - putCustomAttribute("Version name", BuildConfig.VERSION_NAME) - putCustomAttribute("Build type", BuildConfig.BUILD_TYPE) - putCustomAttribute("Frost id", Prefs.frostId) - } + frostAnswersCustom("Version", + "Version code" to BuildConfig.VERSION_CODE, + "Version name" to BuildConfig.VERSION_NAME, + "Build type" to BuildConfig.BUILD_TYPE, + "Frost id" to Prefs.frostId) } } setContentView(R.layout.activity_main) @@ -388,6 +387,7 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract, return true } + @SuppressLint("RestrictedApi") override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.action_settings -> { @@ -402,7 +402,7 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract, } override fun openFileChooser(filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams) { - openImagePicker(filePathCallback, fileChooserParams) + openMediaPicker(filePathCallback, fileChooserParams) } @SuppressLint("NewApi") @@ -435,11 +435,6 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract, } } - override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults) - kauOnRequestPermissionsResult(permissions, grantResults) - } - override fun onResume() { super.onResume() FbCookie.switchBackUser { } @@ -447,7 +442,7 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract, override fun onStart() { //validate some pro features - if (!Prefs.pro) { + if (!IS_FROST_PRO) { if (Prefs.theme == Theme.CUSTOM.ordinal) Prefs.theme = Theme.DEFAULT.ordinal } super.onStart() |