diff --git a/app/build.gradle b/app/build.gradle index ad6e0cd..723f6b7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { applicationId "com.denizk0461.textbasic" minSdk 23 targetSdk 33 - versionCode 6 + versionCode 7 versionName "2.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/release/2 (1.0.0).aab b/app/release/2 (1.0.0).aab deleted file mode 100644 index 4ed0992..0000000 Binary files a/app/release/2 (1.0.0).aab and /dev/null differ diff --git a/app/release/3 (1.1.0).aab b/app/release/3 (1.1.0).aab deleted file mode 100644 index c2b191e..0000000 Binary files a/app/release/3 (1.1.0).aab and /dev/null differ diff --git a/app/release/4 (1.2.0).aab b/app/release/4 (1.2.0).aab deleted file mode 100644 index 4727a01..0000000 Binary files a/app/release/4 (1.2.0).aab and /dev/null differ diff --git a/app/release/5 (1.2.1).aab b/app/release/5 (1.2.1).aab deleted file mode 100644 index 1285f7f..0000000 Binary files a/app/release/5 (1.2.1).aab and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..f390b6c --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.denizk0461.textbasic", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 6, + "versionName": "2.0.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/main/java/com/denizd/textbasic/adapter/DropdownAdapter.kt b/app/src/main/java/com/denizd/textbasic/adapter/DropdownAdapter.kt new file mode 100644 index 0000000..9b7f220 --- /dev/null +++ b/app/src/main/java/com/denizd/textbasic/adapter/DropdownAdapter.kt @@ -0,0 +1,18 @@ +package com.denizd.textbasic.adapter + +import android.content.Context +import android.widget.ArrayAdapter +import android.widget.Filter +import com.denizd.textbasic.R + +class DropdownAdapter(context: Context, items: List) + : ArrayAdapter(context, R.layout.item_dropdown, items) { + + private val noOpFilter = object : Filter() { + private val noOpResult = FilterResults() + override fun performFiltering(constraint: CharSequence?) = noOpResult + override fun publishResults(constraint: CharSequence?, results: FilterResults?) {} + } + + override fun getFilter() = noOpFilter +} \ No newline at end of file diff --git a/app/src/main/java/com/denizd/textbasic/fragment/SettingsNewFragment.kt b/app/src/main/java/com/denizd/textbasic/fragment/SettingsNewFragment.kt index e6ea15b..7512035 100644 --- a/app/src/main/java/com/denizd/textbasic/fragment/SettingsNewFragment.kt +++ b/app/src/main/java/com/denizd/textbasic/fragment/SettingsNewFragment.kt @@ -8,7 +8,6 @@ import android.os.Bundle import android.util.TypedValue import android.view.View import android.view.ViewGroup -import android.widget.ArrayAdapter import android.widget.ImageButton import android.widget.TextView import androidx.annotation.ColorInt @@ -16,6 +15,7 @@ import androidx.annotation.StringRes import androidx.transition.TransitionManager import com.denizd.textbasic.BuildConfig import com.denizd.textbasic.R +import com.denizd.textbasic.adapter.DropdownAdapter import com.denizd.textbasic.databinding.FragmentSettingsNewBinding import com.denizd.textbasic.db.QuoteStorage import com.denizd.textbasic.sheet.TextSheet @@ -41,10 +41,9 @@ class SettingsNewFragment : BaseFragment(R.layout.fragment_settings_new) { storage = QuoteStorage.getInstance(context) // --- text font --- // - val fontAdapter = ArrayAdapter.createFromResource( + val fontAdapter = DropdownAdapter( context, - R.array.text_fonts, - R.layout.item_dropdown, + context.resources.getStringArray(R.array.text_fonts).toList(), ) binding.autoCompleteFont.setAdapter(fontAdapter) diff --git a/app/src/main/java/com/denizd/textbasic/view/ExposedDropdownMenu.kt b/app/src/main/java/com/denizd/textbasic/view/ExposedDropdownMenu.kt new file mode 100644 index 0000000..0a9ebc7 --- /dev/null +++ b/app/src/main/java/com/denizd/textbasic/view/ExposedDropdownMenu.kt @@ -0,0 +1,16 @@ +package com.denizd.textbasic.view + +import android.content.Context +import android.util.AttributeSet +import com.google.android.material.textfield.MaterialAutoCompleteTextView + +class ExposedDropdownMenu @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, +) : MaterialAutoCompleteTextView(context, attrs, defStyleAttr) { + + override fun getFreezesText(): Boolean { + return false + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8f92b1f..889d921 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -41,5 +41,6 @@ ads:layout_constraintBottom_toBottomOf="parent" ads:layout_constraintStart_toStartOf="parent" ads:layout_constraintEnd_toEndOf="parent"/> + \ No newline at end of file