dm1sh/another-widget
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix #222

Browse Source
This commit is contained in:
Tommaso Berlose 2020-10-18 11:20:40 +02:00
parent 331d5772af
commit c95f9fb943
3 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt
View File

@ -66,7 +66,6 @@ object IntentHelper {
flags = Intent.FLAG_ACTIVITY_NEW_TASK flags = Intent.FLAG_ACTIVITY_NEW_TASK
} }
} catch (e: Exception) { } catch (e: Exception) {
context.toast(context.getString(R.string.error_opening_app))
Intent() Intent()
} }
} }
@ -96,7 +95,6 @@ object IntentHelper {
data = calendarUri data = calendarUri
} }
} catch (e: Exception) { } catch (e: Exception) {
context.toast(context.getString(R.string.error_opening_app))
Intent() Intent()
} }
} }
@ -181,7 +179,6 @@ object IntentHelper {
addCategory(Intent.CATEGORY_LAUNCHER) addCategory(Intent.CATEGORY_LAUNCHER)
} }
} catch (e: Exception) { } catch (e: Exception) {
context.toast(context.getString(R.string.error_opening_app))
Intent() Intent()
} }
} }
@ -204,7 +201,6 @@ object IntentHelper {
addCategory(Intent.CATEGORY_LAUNCHER) addCategory(Intent.CATEGORY_LAUNCHER)
} }
} catch (e: Exception) { } catch (e: Exception) {
context.toast(context.getString(R.string.error_opening_app))
Intent() Intent()
} }
} }
@ -218,7 +214,6 @@ object IntentHelper {
addCategory(Intent.CATEGORY_LAUNCHER) addCategory(Intent.CATEGORY_LAUNCHER)
} }
} catch (e: Exception) { } catch (e: Exception) {
context.toast(context.getString(R.string.error_opening_app))
Intent() Intent()
} }
} }
@ -230,7 +225,6 @@ object IntentHelper {
addCategory(Intent.CATEGORY_LAUNCHER) addCategory(Intent.CATEGORY_LAUNCHER)
} }
} catch (e: Exception) { } catch (e: Exception) {
context.toast(context.getString(R.string.error_opening_app))
Intent() Intent()
} }
} }

21
app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt
View File

@ -90,7 +90,7 @@ class CustomDateActivity : AppCompatActivity() {
ERROR_STRING ERROR_STRING
} }
} else { } else {
"__" ERROR_STRING
} }
if (viewModel.isDateCapitalize.value == true) { if (viewModel.isDateCapitalize.value == true) {
@ -102,7 +102,6 @@ class CustomDateActivity : AppCompatActivity() {
} }
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
action_save.isVisible = text != ERROR_STRING
loader.visibility = View.INVISIBLE loader.visibility = View.INVISIBLE
date_format_value.text = text date_format_value.text = text
} }
@ -143,15 +142,6 @@ class CustomDateActivity : AppCompatActivity() {
onBackPressed() onBackPressed()
} }
action_save.setOnClickListener {
Preferences.blockingBulk {
dateFormat = viewModel.dateInput.value ?: ""
isDateCapitalize = viewModel.isDateCapitalize.value ?: true
isDateUppercase = viewModel.isDateUppercase.value ?: false
}
finish()
}
action_capitalize.setOnClickListener { action_capitalize.setOnClickListener {
when { when {
viewModel.isDateUppercase.value == true -> { viewModel.isDateUppercase.value == true -> {
@ -179,6 +169,15 @@ class CustomDateActivity : AppCompatActivity() {
} }
} }
override fun onBackPressed() {
Preferences.blockingBulk {
dateFormat = viewModel.dateInput.value ?: ""
isDateCapitalize = viewModel.isDateCapitalize.value ?: true
isDateUppercase = viewModel.isDateUppercase.value ?: false
}
super.onBackPressed()
}
companion object { companion object {
const val ERROR_STRING = "--" const val ERROR_STRING = "--"
val DATE: Calendar = Calendar.getInstance().apply { val DATE: Calendar = Calendar.getInstance().apply {

38
app/src/main/res/layout/activity_custom_date.xml
View File

@ -29,7 +29,8 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:padding="12dp" android:padding="12dp"
android:layout_marginTop="2dp" android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:id="@+id/action_back" android:id="@+id/action_back"
app:tint="@color/colorPrimaryText" app:tint="@color/colorPrimaryText"
@ -39,6 +40,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/custom_date_format" android:text="@string/custom_date_format"
android:paddingStart="8dp"
android:layout_marginEnd="48dp" android:layout_marginEnd="48dp"
android:gravity="center" android:gravity="center"
style="@style/AnotherWidget.Main.Title"/> style="@style/AnotherWidget.Main.Title"/>
@ -102,11 +104,16 @@
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="0dp" app:cardCornerRadius="0dp"
app:cardBackgroundColor="@color/colorPrimary"> app:cardBackgroundColor="@color/colorPrimary">
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="48dp" android:layout_height="48dp"
android:id="@+id/date_format_value" android:id="@+id/date_format_value"
android:textAppearance="@style/AnotherWidget.Settings.Title" android:textAppearance="@style/AnotherWidget.Settings.Title"
@ -115,31 +122,25 @@
android:textSize="18sp" android:textSize="18sp"
app:textAllCaps="false" app:textAllCaps="false"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:paddingEnd="32dp"
android:layout_centerVertical="true"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:maxLines="1" android:maxLines="1"
android:lines="1" android:lines="1"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:layout_marginTop="8dp"
android:layout_marginLeft="32dp" android:layout_marginLeft="32dp"
android:layout_marginRight="32dp" android:layout_marginRight="32dp" />
android:layout_marginBottom="16dp" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:padding="5dp" android:padding="5dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_capitalize" android:src="@drawable/ic_capitalize"
android:layout_alignParentEnd="true"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
app:tint="@color/colorPrimaryText" app:tint="@color/colorPrimaryText"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:id="@+id/action_capitalize" /> android:id="@+id/action_capitalize" />
</RelativeLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -160,19 +161,6 @@
android:paddingTop="16dp" android:paddingTop="16dp"
android:clipToPadding="false" android:clipToPadding="false"
android:id="@+id/list_view" /> android:id="@+id/list_view" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:layout_margin="16dp"
app:backgroundTint="@color/colorAccent"
android:layout_alignParentBottom="true"
android:id="@+id/action_save"
android:layout_alignParentRight="true"
android:text="@string/action_save" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>