From 597c884d88b8716d49e0abb00674ce44699df08b Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 29 Dec 2019 15:43:20 -0800
Subject: Clean up obsolete usages

---
 app/build.gradle                                         |  2 --
 app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt    | 16 ----------------
 .../com/pitchedapps/frost/activities/AboutActivity.kt    |  1 -
 .../com/pitchedapps/frost/activities/DebugActivity.kt    |  1 -
 app/src/main/res/layout/activity_debug.xml               |  4 +++-
 app/src/main/res/layout/view_main_fab.xml                |  7 -------
 app/src/main/res/layout/view_main_tab_layout.xml         | 10 ----------
 app/src/main/res/layout/view_main_toolbar.xml            |  8 --------
 app/src/main/res/layout/view_main_viewpager.xml          |  7 -------
 9 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 app/src/main/res/layout/view_main_fab.xml
 delete mode 100644 app/src/main/res/layout/view_main_tab_layout.xml
 delete mode 100644 app/src/main/res/layout/view_main_toolbar.xml
 delete mode 100644 app/src/main/res/layout/view_main_viewpager.xml

(limited to 'app')

diff --git a/app/build.gradle b/app/build.gradle
index f9e916ba..3fab8853 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -289,8 +289,6 @@ dependencies {
     testImplementation "com.squareup.okhttp3:mockwebserver:${Versions.okhttp}"
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:${Versions.okhttp}"
 
-//    implementation "co.zsmb:materialdrawer-kt:${Versions.materialDrawerKt}"
-
     implementation kau.Dependencies.bugsnag
 
     implementation "com.davemorrissey.labs:subsampling-scale-image-view:${Versions.scaleImageView}"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 75efe637..b33f00e2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -67,22 +67,6 @@ class FrostApp : Application() {
 
         scheduleNotificationsFromPrefs()
 
-        /**
-         * Drawer profile loading logic
-         * Reload the image on every version update
-         */
-//        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-//            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-//                val c = imageView.context
-//                val request = GlideApp.with(c)
-//                val old = request.load(uri).apply(RequestOptions().placeholder(placeholder))
-//                request.load(uri).apply(
-//                    RequestOptions()
-//                        .signature(ApplicationVersionSignature.obtain(c))
-//                )
-//                    .thumbnail(old).into(imageView)
-//            }
-//        })
         if (BuildConfig.DEBUG) {
             registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
                 override fun onActivityPaused(activity: Activity) {}
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 0ef70bcd..17b475da 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -74,7 +74,6 @@ class AboutActivity : AboutActivityBase(null, {
             "kau",
             "kotterknife",
             "materialdialogs",
-            "materialdrawer",
             "subsamplingscaleimageview"
         )
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
index e0dc409b..c8177604 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
@@ -34,7 +34,6 @@ import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.createFreshDir
 import com.pitchedapps.frost.utils.setFrostColors
 import kotlinx.android.synthetic.main.activity_debug.*
-import kotlinx.android.synthetic.main.view_main_fab.*
 import kotlinx.coroutines.CoroutineExceptionHandler
 import java.io.File
 import kotlin.coroutines.resume
diff --git a/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_debug.xml
index c3818749..d2f9a397 100644
--- a/app/src/main/res/layout/activity_debug.xml
+++ b/app/src/main/res/layout/activity_debug.xml
@@ -31,6 +31,8 @@
 
     </com.pitchedapps.frost.views.SwipeRefreshLayout>
 
-    <include layout="@layout/view_main_fab" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        style="@style/Main.Fab" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/view_main_fab.xml b/app/src/main/res/layout/view_main_fab.xml
deleted file mode 100644
index e9fe9981..00000000
--- a/app/src/main/res/layout/view_main_fab.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fab"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="end|bottom"
-    android:layout_margin="@dimen/kau_fab_margin" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_main_tab_layout.xml b/app/src/main/res/layout/view_main_tab_layout.xml
deleted file mode 100644
index 1218b4f7..00000000
--- a/app/src/main/res/layout/view_main_tab_layout.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.tabs.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/tabs"
-    style="@style/Widget.Design.TabLayout"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/tab_bar_height"
-    app:tabGravity="fill"
-    app:tabIndicatorHeight="0dp"
-    app:tabMode="fixed" />
diff --git a/app/src/main/res/layout/view_main_toolbar.xml b/app/src/main/res/layout/view_main_toolbar.xml
deleted file mode 100644
index 054eaac3..00000000
--- a/app/src/main/res/layout/view_main_toolbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    app:layout_scrollFlags="scroll|enterAlways|snap"
-    app:popupTheme="@style/AppTheme.PopupOverlay" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_main_viewpager.xml b/app/src/main/res/layout/view_main_viewpager.xml
deleted file mode 100644
index 0c3f314c..00000000
--- a/app/src/main/res/layout/view_main_viewpager.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.pitchedapps.frost.views.FrostViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
\ No newline at end of file
-- 
cgit v1.2.3