diff options
Diffstat (limited to 'app/src/main')
9 files changed, 20 insertions, 71 deletions
diff --git a/app/src/main/assets/css/core/_colors_amoled.scss b/app/src/main/assets/css/core/_colors_amoled.scss deleted file mode 100644 index 8bbf6d10..00000000 --- a/app/src/main/assets/css/core/_colors_amoled.scss +++ /dev/null @@ -1,4 +0,0 @@ -$text: #fff; -$link: #eee; -$background: #000; -$bg_transparent: #000; diff --git a/app/src/main/assets/css/core/_colors_dark.scss b/app/src/main/assets/css/core/_colors_dark.scss deleted file mode 100644 index 5fb495df..00000000 --- a/app/src/main/assets/css/core/_colors_dark.scss +++ /dev/null @@ -1,4 +0,0 @@ -$text: #fff; -$link: #eee; -$background: #303030; -$bg_transparent: #303030; diff --git a/app/src/main/assets/css/core/_colors_glass.scss b/app/src/main/assets/css/core/_colors_glass.scss deleted file mode 100644 index fc71b99d..00000000 --- a/app/src/main/assets/css/core/_colors_glass.scss +++ /dev/null @@ -1,4 +0,0 @@ -$text: #fff; -$link: #eee; -$background: rgba(#000, 0.3); -$bg_transparent: transparent; diff --git a/app/src/main/assets/css/core/_colors_light.scss b/app/src/main/assets/css/core/_colors_light.scss deleted file mode 100644 index 3870ece0..00000000 --- a/app/src/main/assets/css/core/_colors_light.scss +++ /dev/null @@ -1,4 +0,0 @@ -$text: #000; -$link: #111; -$background: #fafafa; -$bg_transparent: #fafafa; diff --git a/app/src/main/assets/css/themes/material_amoled.scss b/app/src/main/assets/css/themes/material_amoled.scss index 20ac414c..a0f93c7a 100644 --- a/app/src/main/assets/css/themes/material_amoled.scss +++ b/app/src/main/assets/css/themes/material_amoled.scss @@ -1,2 +1,6 @@ -@import "../core/colors_amoled"; +$text: #fff; +$link: #eee; +$background: #000; +$bg_transparent: #000; + @import "../core/main"; diff --git a/app/src/main/assets/css/themes/material_dark.scss b/app/src/main/assets/css/themes/material_dark.scss index ad6263d5..7bbf7ad0 100644 --- a/app/src/main/assets/css/themes/material_dark.scss +++ b/app/src/main/assets/css/themes/material_dark.scss @@ -1,2 +1,6 @@ -@import "../core/colors_dark"; +$text: #fff; +$link: #eee; +$background: #303030; +$bg_transparent: #303030; + @import "../core/main"; diff --git a/app/src/main/assets/css/themes/material_glass.scss b/app/src/main/assets/css/themes/material_glass.scss index 273a66a6..ce341b0a 100644 --- a/app/src/main/assets/css/themes/material_glass.scss +++ b/app/src/main/assets/css/themes/material_glass.scss @@ -1,2 +1,6 @@ -@import "../core/colors_glass"; +$text: #fff; +$link: #eee; +$background: rgba(#000, 0.3); +$bg_transparent: transparent; + @import "../core/main"; diff --git a/app/src/main/assets/css/themes/material_light.scss b/app/src/main/assets/css/themes/material_light.scss index 624a57a4..f0b35a00 100644 --- a/app/src/main/assets/css/themes/material_light.scss +++ b/app/src/main/assets/css/themes/material_light.scss @@ -1,2 +1,6 @@ -@import "../core/colors_light"; +$text: #000; +$link: #111; +$background: #fafafa; +$bg_transparent: #fafafa; + @import "../core/main"; diff --git a/app/src/main/kotlin/com/pitchedapps/frost/WebExternalActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/WebExternalActivity.kt deleted file mode 100644 index 0f429252..00000000 --- a/app/src/main/kotlin/com/pitchedapps/frost/WebExternalActivity.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.pitchedapps.frost - -import android.content.Intent -import android.os.Bundle -import android.os.PersistableBundle -import android.support.v7.app.AppCompatActivity -import ca.allanwang.kau.utils.toast -import com.jude.swipbackhelper.SwipeBackHelper -import com.pitchedapps.frost.utils.L - -/** - * Created by Allan Wang on 2017-06-17. - */ -class WebExternalActivity : AppCompatActivity() { - - val url: String? - get() = intent?.dataString - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - L.d("Create wea") - L.d("URL $url") - toast(url!!) - SwipeBackHelper.onCreate(this) - SwipeBackHelper.getCurrentPage(this) - .setSwipeBackEnable(true) - .setSwipeSensitivity(0.5f) - .setSwipeRelateEnable(true) - .setSwipeRelateOffset(300) - } - - override fun onNewIntent(intent: Intent?) { - super.onNewIntent(intent) - L.d("Intent wea") - } - - override fun onStart() { - super.onStart() - L.d("Start") - } - - override fun onPostCreate(savedInstanceState: Bundle?) { - super.onPostCreate(savedInstanceState) - SwipeBackHelper.onPostCreate(this) - } - - override fun onDestroy() { - super.onDestroy() - SwipeBackHelper.onDestroy(this) - } -}
\ No newline at end of file |