diff --git a/app/src/main/java/com/denizd/textbasic/ColorTransparentUtils.kt b/app/src/main/java/com/denizd/textbasic/ColorTransparentUtils.kt index 779eb0a..1557aa2 100644 --- a/app/src/main/java/com/denizd/textbasic/ColorTransparentUtils.kt +++ b/app/src/main/java/com/denizd/textbasic/ColorTransparentUtils.kt @@ -1,6 +1,5 @@ package com.denizd.textbasic -import android.R import java.util.* import kotlin.math.roundToInt @@ -9,15 +8,14 @@ import kotlin.math.roundToInt */ object ColorTransparentUtils { // This default color int - const val defaultColorID = R.color.black + const val defaultColorID = android.R.color.black const val defaultColor = "000000" - const val TAG = "ColorTransparentUtils" /** - * This method convert numver into hexa number or we can say transparent code + * This method convert number into hex number or we can say transparent code * * @param trans number of transparency you want - * @return it return hex decimal number or transparency code + * @return hex decimal number or transparency code */ fun convert(trans: Int): String { val hexString = Integer.toHexString((255 * trans / 100.0).roundToInt()) @@ -33,10 +31,10 @@ object ColorTransparentUtils { * * @param colorCode color code * @param transCode transparent number - * @return transparent color code + * @return transparent color code */ fun convertIntoColor(colorCode: Int, transCode: Int): String { - // convert color code into hexa string and remove starting 2 digit + // convert color code into hex string and remove starting 2 digit var color = defaultColor try { color = Integer.toHexString(colorCode).uppercase(Locale.getDefault()).substring(2) diff --git a/app/src/main/java/com/denizd/textbasic/MainActivity.kt b/app/src/main/java/com/denizd/textbasic/MainActivity.kt index 323f3d5..5be5223 100644 --- a/app/src/main/java/com/denizd/textbasic/MainActivity.kt +++ b/app/src/main/java/com/denizd/textbasic/MainActivity.kt @@ -6,7 +6,6 @@ import android.content.ComponentName import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import androidx.fragment.app.FragmentTransaction import androidx.lifecycle.Lifecycle import com.denizd.textbasic.databinding.ActivityMainBinding import com.denizd.textbasic.fragment.GuideFragment @@ -24,11 +23,6 @@ class MainActivity : AppCompatActivity() { binding = ActivityMainBinding.inflate(this.layoutInflater) setContentView(binding.root) -// binding.buttonBackupDownload.setOnClickListener { -// -// Snackbar.make(binding.rootLayout, R.string.snack_backup_download, Snackbar.LENGTH_LONG).show() -// } - binding.buttonBackupUpload.setOnClickListener { BackupManager(this).dataChanged() Snackbar.make(binding.rootLayout, R.string.snack_backup_upload, Snackbar.LENGTH_LONG).show() diff --git a/app/src/main/java/com/denizd/textbasic/Quote.kt b/app/src/main/java/com/denizd/textbasic/Quote.kt index 0008b09..492d03e 100644 --- a/app/src/main/java/com/denizd/textbasic/Quote.kt +++ b/app/src/main/java/com/denizd/textbasic/Quote.kt @@ -1,3 +1,6 @@ package com.denizd.textbasic +/** + * Stores a single quote. For potential use with a Room database. + */ data class Quote(val id: Int, var text: String) \ No newline at end of file diff --git a/app/src/main/java/com/denizd/textbasic/QuoteAdapter.kt b/app/src/main/java/com/denizd/textbasic/QuoteAdapter.kt index 9d693f1..571582e 100644 --- a/app/src/main/java/com/denizd/textbasic/QuoteAdapter.kt +++ b/app/src/main/java/com/denizd/textbasic/QuoteAdapter.kt @@ -8,13 +8,12 @@ import android.view.ViewGroup import android.widget.ImageButton import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.button.MaterialButton class QuoteAdapter(quotes: List) : RecyclerView.Adapter() { private var mutableQuotes: MutableList = quotes.toMutableList() - class QuoteViewHolder(view: View) : RecyclerView.ViewHolder(view)/*, View.OnClickListener, View.OnLongClickListener*/ { + class QuoteViewHolder(view: View) : RecyclerView.ViewHolder(view) { val quote: TextView = view.findViewById(R.id.quote) val delete: ImageButton = view.findViewById(R.id.delete_button) @@ -63,9 +62,4 @@ class QuoteAdapter(quotes: List) : RecyclerView.Adapter { return mutableQuotes.filter { s -> s.isNotBlank() }.toTypedArray() } - - interface QuoteClickListener { - fun onQuoteClick(quotes: String) - fun onQuoteLongClick(quoteId: Int) - } } \ No newline at end of file diff --git a/app/src/main/java/com/denizd/textbasic/QuoteStorage.kt b/app/src/main/java/com/denizd/textbasic/QuoteStorage.kt index 7b05dbe..ec6c081 100644 --- a/app/src/main/java/com/denizd/textbasic/QuoteStorage.kt +++ b/app/src/main/java/com/denizd/textbasic/QuoteStorage.kt @@ -1,11 +1,8 @@ package com.denizd.textbasic import android.content.Context -import android.content.SharedPreferences import android.graphics.Color import android.graphics.Typeface -import android.util.Log -import androidx.preference.PreferenceManager class QuoteStorage(context: Context) { @@ -29,17 +26,6 @@ class QuoteStorage(context: Context) { private const val KEY_AVG_WIDTH = "avgwidth" private const val KEY_AVG_HEIGHT = "avgheight" private const val KEY_OUTLINE_SIZE = "outlinesize" - - val prefGroups = arrayOf( - KEY_QUOTES, KEY_QUOTE_COUNTER, KEY_TEXT_SIZE, KEY_INVERTED, KEY_HIGH_CONTRAST, - KEY_TRANSPARENCY, KEY_RANDOM, KEY_WIDGET_POSITION - ) - - -// val transparencyValues = arrayOf( -// "0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", -// "55", "60", "65", "70", "75", "80", "85", "90", "95", "100", -// ) } private val prefs = context.getSharedPreferences(PREF_NAME, 0) @@ -65,6 +51,8 @@ class QuoteStorage(context: Context) { fun getTextSize() = prefs.getInt(KEY_TEXT_SIZE, 18) fun isInvertedEnabled(): Boolean = prefs.getBoolean(KEY_INVERTED, false) + + // TODO remove high contrast option once custom colours have been implemented fun isHighContrastEnabled(): Boolean = prefs.getBoolean(KEY_HIGH_CONTRAST, false) fun getTransparency(): Int = prefs.getInt(KEY_TRANSPARENCY, 100) fun isOrderRandom(): Boolean = prefs.getBoolean(KEY_RANDOM, false) diff --git a/app/src/main/java/com/denizd/textbasic/TextWidget.kt b/app/src/main/java/com/denizd/textbasic/TextWidget.kt index 2d99001..c211bf5 100644 --- a/app/src/main/java/com/denizd/textbasic/TextWidget.kt +++ b/app/src/main/java/com/denizd/textbasic/TextWidget.kt @@ -5,11 +5,9 @@ import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetProvider import android.content.Context import android.content.Intent -import android.graphics.Typeface import android.util.TypedValue import android.view.Gravity import android.widget.RemoteViews -import android.widget.TextView class TextWidget : AppWidgetProvider() { diff --git a/app/src/main/java/com/denizd/textbasic/fragment/BaseFragment.kt b/app/src/main/java/com/denizd/textbasic/fragment/BaseFragment.kt index b9a84c6..4d28c80 100644 --- a/app/src/main/java/com/denizd/textbasic/fragment/BaseFragment.kt +++ b/app/src/main/java/com/denizd/textbasic/fragment/BaseFragment.kt @@ -2,9 +2,7 @@ package com.denizd.textbasic.fragment import android.content.Context import androidx.annotation.LayoutRes -import androidx.core.widget.NestedScrollView import androidx.fragment.app.Fragment -import androidx.recyclerview.widget.RecyclerView open class BaseFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { @@ -16,24 +14,4 @@ open class BaseFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { } override fun getContext(): Context = _context - -// protected fun RecyclerView.addFabScrollListener() { -// addOnScrollListener(object : RecyclerView.OnScrollListener() { -// override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { -// when { -// dy > 0 -> fab.hide() -// dy < 0 -> fab.show() -// } -// } -// }) -// } -// -// protected fun NestedScrollView.addFabScrollListener() { -// setOnScrollChangeListener { _, _, dy, _, doy -> -// when { -// dy > doy -> fab.hide() -// dy < doy -> fab.show() -// } -// } -// } } \ No newline at end of file diff --git a/app/src/main/java/com/denizd/textbasic/fragment/SettingsFragment.kt b/app/src/main/java/com/denizd/textbasic/fragment/SettingsFragment.kt index 5334712..9fa9041 100644 --- a/app/src/main/java/com/denizd/textbasic/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/denizd/textbasic/fragment/SettingsFragment.kt @@ -1,9 +1,7 @@ package com.denizd.textbasic.fragment -import android.graphics.Bitmap import android.graphics.Color import android.os.Bundle -import android.util.Log import android.util.TypedValue import android.view.View import android.view.ViewGroup diff --git a/app/src/main/java/com/denizd/textbasic/util/ActivityViewBindingDelegate.kt b/app/src/main/java/com/denizd/textbasic/util/ActivityViewBindingDelegate.kt index cadd9a6..55cdaf4 100644 --- a/app/src/main/java/com/denizd/textbasic/util/ActivityViewBindingDelegate.kt +++ b/app/src/main/java/com/denizd/textbasic/util/ActivityViewBindingDelegate.kt @@ -1,7 +1,6 @@ package com.denizd.textbasic.util import android.view.LayoutInflater -import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentActivity import androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/denizd/textbasic/util/FragmentViewBindingDelegate.kt b/app/src/main/java/com/denizd/textbasic/util/FragmentViewBindingDelegate.kt index 32535df..49ab289 100644 --- a/app/src/main/java/com/denizd/textbasic/util/FragmentViewBindingDelegate.kt +++ b/app/src/main/java/com/denizd/textbasic/util/FragmentViewBindingDelegate.kt @@ -5,7 +5,6 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.observe import androidx.viewbinding.ViewBinding import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/denizd/textbasic/widget/CanvasText.kt b/app/src/main/java/com/denizd/textbasic/widget/CanvasText.kt index 2580824..ca6abcd 100644 --- a/app/src/main/java/com/denizd/textbasic/widget/CanvasText.kt +++ b/app/src/main/java/com/denizd/textbasic/widget/CanvasText.kt @@ -4,7 +4,6 @@ import android.content.Context import android.graphics.* import android.text.StaticLayout import android.text.TextPaint -import android.util.Log import com.denizd.textbasic.QuoteStorage import com.denizd.textbasic.R @@ -20,7 +19,6 @@ class CanvasText { size?.let { storage.setSize(size) -// Log.d("ASDF", "${size.first} + ${size.second}") } val widgetSize = storage.getSize() diff --git a/app/src/main/java/com/denizd/textbasic/widget/TextCanvasWidget.kt b/app/src/main/java/com/denizd/textbasic/widget/TextCanvasWidget.kt index d75a516..39fc40d 100644 --- a/app/src/main/java/com/denizd/textbasic/widget/TextCanvasWidget.kt +++ b/app/src/main/java/com/denizd/textbasic/widget/TextCanvasWidget.kt @@ -3,12 +3,9 @@ package com.denizd.textbasic.widget import android.app.PendingIntent import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetProvider -import android.content.ComponentName import android.content.Context import android.content.Intent -import android.graphics.* import android.os.Bundle -import android.util.Log import android.widget.RemoteViews import com.denizd.textbasic.R import kotlin.random.Random @@ -56,9 +53,6 @@ class TextCanvasWidget : AppWidgetProvider() { val width = (newOptions?.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH) ?: 0) val height = (newOptions?.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT) ?: 0) -// Log.d("ASDFF", (newOptions?.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH)).toString()) - - context?.let { val remoteViews = configureViews(context, intArrayOf(appWidgetId), Pair(width, height)) // Tell the AppWidgetManager to perform an update on the current app widget diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 86747f6..60d9177 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -364,8 +364,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:gravity="center" - android:visibility="gone"> + android:gravity="center"> Text Basic - Gib etwas ein... + Gib etwas ein… Dies ist ein Beispieltext Textgröße Opazität @@ -11,7 +11,7 @@ Zufällige Reihenfolge Kontrast erhöhen Füg etwas hinzu! - Daten werden wiederhergestellt... + Daten werden wiederhergestellt… Deine Daten werden innerhalb der nächsten Stunde gesichert Text bearbeiten diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index f19c78d..948db55 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,5 +1,5 @@ - +