diff options
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')
3 files changed, 7 insertions, 42 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt index ce306acc..9db1747b 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt @@ -18,6 +18,7 @@ import com.mikepenz.aboutlibraries.entity.License import com.mikepenz.community_material_typeface_library.CommunityMaterial import com.mikepenz.fastadapter.IItem import com.mikepenz.fastadapter.items.AbstractItem +import com.mikepenz.google_material_typeface_library.GoogleMaterial import com.mikepenz.iconics.typeface.IIcon import com.pitchedapps.frost.BuildConfig import com.pitchedapps.frost.R @@ -135,9 +136,10 @@ class AboutActivity : AboutActivityBase(null, { val c = itemView.context val size = c.dimenPixelSize(R.dimen.kau_avatar_bounds) images = arrayOf<Pair<IIcon, () -> Unit>>( -// GoogleMaterial.Icon.gmd_star to { c.startPlayStoreLink(R.string.play_store_package_id) }, + GoogleMaterial.Icon.gmd_star to { c.startLink(R.string.xda_labs_url) }, CommunityMaterial.Icon.cmd_reddit to { c.startLink(R.string.reddit_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.Icon.cmd_xda to { c.startLink(R.string.xda_url) } ).mapIndexed { i, (icon, onClick) -> ImageView(c).apply { diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt index 02f5bc49..237780b8 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -113,11 +113,6 @@ class SettingsActivity : KPrefActivity() { // iicon = GoogleMaterial.Icon.gmd_network_cell // } - subItems(R.string.experimental, getExperimentalPrefs()) { - descRes = R.string.experimental_desc - iicon = CommunityMaterial.Icon.cmd_flask_outline - } - // todo add donation? plainText(R.string.about_frost) { @@ -141,11 +136,10 @@ class SettingsActivity : KPrefActivity() { onClick = { launchNewTask<IntroActivity>(cookies(), true) } } -// plainText(R.string.updates) { -// descRes = R.string.updates_desc -// iicon = CommunityMaterial.Icon.cmd_github_circle -// onClick = { launchNewTask<UpdateActivity>() } -// } + subItems(R.string.experimental, getExperimentalPrefs()) { + descRes = R.string.experimental_desc + iicon = CommunityMaterial.Icon.cmd_flask_outline + } subItems(R.string.debug_frost, getDebugPrefs()) { descRes = R.string.debug_frost_desc diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/UpdateActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/UpdateActivity.kt deleted file mode 100644 index 28569e6d..00000000 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/UpdateActivity.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.pitchedapps.frost.activities - -import android.os.Bundle -import ca.allanwang.kau.ui.activities.SwipeRecyclerActivity -import ca.allanwang.kau.ui.views.SwipeRecyclerView -import com.mikepenz.fastadapter.FastAdapter -import com.pitchedapps.frost.iitems.ReleaseIItem -import com.pitchedapps.frost.services.UpdateManager -import org.jetbrains.anko.AnkoAsyncContext -import org.jetbrains.anko.uiThread - -/** - * Created by Allan Wang on 07/04/18. - */ -class UpdateActivity : SwipeRecyclerActivity<ReleaseIItem>() { - - override fun onCreate(savedInstanceState: Bundle?, fastAdapter: FastAdapter<ReleaseIItem>) { - fastAdapter.withOnClickListener { _, _, item, _ -> - if (item is ReleaseIItem) { - // todo download - } - true - } - } - - override fun AnkoAsyncContext<SwipeRecyclerView>.onRefresh() { - val release = UpdateManager.getLatestGithubRelease() ?: return - uiThread { adapter.set(listOf(ReleaseIItem(release))) } - } - -}
\ No newline at end of file |