From 2dc3d8fae4c3a6ac025728a167872608dc73e7d5 Mon Sep 17 00:00:00 2001
From: machiav3lli <antonios.hazim@tutanota.com>
Date: Sun, 24 Oct 2021 17:02:29 +0200
Subject: [PATCH] Clean up

---
 .../looker/droidify/screen/ScreenActivity.kt  |  4 +--
 .../droidify/screen/SettingsFragment.kt       |  1 -
 .../droidify/widget/FragmentLinearLayout.kt   | 26 ---------------
 .../com/looker/droidify/widget/Toolbar.kt     | 33 -------------------
 4 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 src/main/kotlin/com/looker/droidify/widget/FragmentLinearLayout.kt
 delete mode 100644 src/main/kotlin/com/looker/droidify/widget/Toolbar.kt

diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
index f642f60f..f76e1bf4 100644
--- a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
@@ -6,9 +6,9 @@ import android.os.Parcel
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
 import com.looker.droidify.R
 import com.looker.droidify.content.Preferences
 import com.looker.droidify.database.CursorOwner
@@ -17,7 +17,7 @@ import com.looker.droidify.utility.KParcelable
 import com.looker.droidify.utility.extension.resources.getDrawableFromAttr
 import com.looker.droidify.utility.extension.text.nullIfEmpty
 
-abstract class ScreenActivity : FragmentActivity() {
+abstract class ScreenActivity : AppCompatActivity() {
     companion object {
         private const val STATE_FRAGMENT_STACK = "fragmentStack"
     }
diff --git a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
index 0747fc29..07a2254c 100644
--- a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
@@ -31,7 +31,6 @@ class SettingsFragment : ScreenFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val toolbar = view.findViewById<Toolbar>(R.id.toolbar)!!
         screenActivity.onToolbarCreated(toolbar)
         toolbar.setTitle(R.string.settings)
 
diff --git a/src/main/kotlin/com/looker/droidify/widget/FragmentLinearLayout.kt b/src/main/kotlin/com/looker/droidify/widget/FragmentLinearLayout.kt
deleted file mode 100644
index 7dfdda91..00000000
--- a/src/main/kotlin/com/looker/droidify/widget/FragmentLinearLayout.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.looker.droidify.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.LinearLayout
-
-class FragmentLinearLayout : LinearLayout {
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
-
-    init {
-        fitsSystemWindows = true
-    }
-
-    @Suppress("unused")
-    var percentTranslationY: Float
-        get() = height.let { if (it > 0) translationY / it else 0f }
-        set(value) {
-            translationY = value * height
-        }
-}
diff --git a/src/main/kotlin/com/looker/droidify/widget/Toolbar.kt b/src/main/kotlin/com/looker/droidify/widget/Toolbar.kt
deleted file mode 100644
index 5cbfa1a6..00000000
--- a/src/main/kotlin/com/looker/droidify/widget/Toolbar.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.looker.droidify.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.Toolbar
-
-class Toolbar : Toolbar {
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
-
-    private var initalized = false
-    private var layoutDirectionChanged: Int? = null
-
-    init {
-        initalized = true
-        val layoutDirection = layoutDirectionChanged
-        layoutDirectionChanged = null
-        if (layoutDirection != null) onRtlPropertiesChanged(layoutDirection)
-    }
-
-    override fun onRtlPropertiesChanged(layoutDirection: Int) {
-        if (initalized) {
-            super.onRtlPropertiesChanged(layoutDirection)
-        } else {
-            layoutDirectionChanged = layoutDirection
-        }
-    }
-}