diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt index 039ba78..6a4865f 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt @@ -63,8 +63,8 @@ class MainFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true) - reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false) + enterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, true) + reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false) } override fun onCreateView( @@ -103,7 +103,7 @@ class MainFragment : Fragment() { binding.actionSettings.setOnClickListener { Navigation.findNavController(it).navigate(R.id.action_appMainFragment_to_appSettingsFragment, null, null, FragmentNavigatorExtras( - binding.actionBack to "action_back" +// binding.fragmentTitle to "fragment_title" )) } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt index a7ffa9b..a6fc9e5 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt @@ -52,9 +52,9 @@ class SettingsFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move) - enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true) -// returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false) +// sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move) + enterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, true) + returnTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false) } override fun onCreateView( diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/TypographyFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/TypographyFragment.kt index 25c347b..a4e23ac 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/TypographyFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/TypographyFragment.kt @@ -6,7 +6,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -29,7 +28,6 @@ import com.tommasoberlose.anotherwidget.ui.activities.tabs.CustomFontActivity import com.tommasoberlose.anotherwidget.ui.activities.MainActivity import com.tommasoberlose.anotherwidget.ui.activities.tabs.CustomDateActivity import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel -import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget import com.tommasoberlose.anotherwidget.utils.isDarkTheme import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt index 1b5792f..42dab9d 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt @@ -96,7 +96,6 @@ class MainViewModel(context: Application) : AndroidViewModel(context) { val showWallpaper = Preferences.asLiveData(Preferences::showWallpaper) val showPreview = Preferences.asLiveData(Preferences::showPreview) val installedIntegrations = Preferences.asLiveData(Preferences::installedIntegrations) - var colorClipboard: ArrayList = ArrayList() // UI val fragmentScrollY = MutableLiveData() @@ -169,19 +168,4 @@ class MainViewModel(context: Application) : AndroidViewModel(context) { addSource(Preferences.asLiveData(Preferences::installedIntegrations)) { value = true } } - - init { - with(context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager) { - if (hasPrimaryClip()) { - (0..primaryClip!!.itemCount).forEach { - try { - val color = primaryClip!!.getItemAt(it).text.toString() - if (color.isColor()) { - colorClipboard.add(color) - } - } catch (ex: Exception) {} - } - } - } - } } diff --git a/app/src/main/res/drawable-night-hdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-hdpi/round_content_copy_24.png new file mode 100644 index 0000000..ce479f3 Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_content_copy_24.png differ diff --git a/app/src/main/res/drawable-night-hdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-hdpi/round_content_paste_24.png new file mode 100644 index 0000000..5de0c69 Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_content_paste_24.png differ diff --git a/app/src/main/res/drawable-night-hdpi/round_switch_left_24.png b/app/src/main/res/drawable-night-hdpi/round_switch_left_24.png index 35fd797..fbbff23 100644 Binary files a/app/src/main/res/drawable-night-hdpi/round_switch_left_24.png and b/app/src/main/res/drawable-night-hdpi/round_switch_left_24.png differ diff --git a/app/src/main/res/drawable-night-mdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-mdpi/round_content_copy_24.png new file mode 100644 index 0000000..6eace2c Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_content_copy_24.png differ diff --git a/app/src/main/res/drawable-night-mdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-mdpi/round_content_paste_24.png new file mode 100644 index 0000000..e78d603 Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_content_paste_24.png differ diff --git a/app/src/main/res/drawable-night-xhdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-xhdpi/round_content_copy_24.png new file mode 100644 index 0000000..22b4be1 Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_content_copy_24.png differ diff --git a/app/src/main/res/drawable-night-xhdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-xhdpi/round_content_paste_24.png new file mode 100644 index 0000000..dd3c7ec Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_content_paste_24.png differ diff --git a/app/src/main/res/drawable-night-xxhdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-xxhdpi/round_content_copy_24.png new file mode 100644 index 0000000..3ac8aac Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_content_copy_24.png differ diff --git a/app/src/main/res/drawable-night-xxhdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-xxhdpi/round_content_paste_24.png new file mode 100644 index 0000000..aa760a4 Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_content_paste_24.png differ diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_content_copy_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_content_copy_24.png new file mode 100644 index 0000000..e3a8ccb Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_content_copy_24.png differ diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_content_paste_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_content_paste_24.png new file mode 100644 index 0000000..df9248d Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_content_paste_24.png differ diff --git a/app/src/main/res/drawable/round_content_copy_24.xml b/app/src/main/res/drawable/round_content_copy_24.xml new file mode 100644 index 0000000..fbc19ab --- /dev/null +++ b/app/src/main/res/drawable/round_content_copy_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/round_content_paste_24.xml b/app/src/main/res/drawable/round_content_paste_24.xml new file mode 100644 index 0000000..e95fdde --- /dev/null +++ b/app/src/main/res/drawable/round_content_paste_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/bottom_sheet_dialog.xml b/app/src/main/res/layout/bottom_sheet_dialog.xml index 7180ec6..a770b91 100644 --- a/app/src/main/res/layout/bottom_sheet_dialog.xml +++ b/app/src/main/res/layout/bottom_sheet_dialog.xml @@ -38,7 +38,7 @@ android:id="@+id/message" android:gravity="start" android:textAlignment="viewStart" - android:text="Messaggio molto lungo di cui voirre akjcbasaskdask flasdas fashbdfjah fahsbd ajsbd " + android:text="" android:textColor="@color/colorPrimaryText"/> - + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="center_vertical"> + +