Merge branch 'release/1.2.3'

mouredev · Nov 12, 2021 · da59347 · da59347
2 parents 8cb8609 + 841e135
commit da59347
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 8 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.mouredev.twitimer"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 14
-        versionName "1.2.2"
+        versionCode 15
+        versionName "1.2.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/mouredev/twitimer/usecases/account/account/AccountViewModel.kt b/app/src/main/java/com/mouredev/twitimer/usecases/account/account/AccountViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.mouredev.twitimer.model.session.Session
 import com.mouredev.twitimer.provider.services.twitch.TwitchService
+import com.mouredev.twitimer.util.Constants
 import java.net.URL
 
 class AccountViewModel : ViewModel() {
@@ -36,7 +37,7 @@ class AccountViewModel : ViewModel() {
 
     fun selected(context: Context, uri: Uri, listener: AccountFragmentListener?) {
 
-        if (uri.host?.contains("localhost") == true) {
+        if (uri.host?.contains(Constants.TWITCH_REDIRECT_HOST) == true) {
             val authorizationCode = uri.getQueryParameter("code")
             authorizationCode?.let { authCode ->
                 loading.postValue(true)

diff --git a/app/src/main/java/com/mouredev/twitimer/usecases/common/rows/ScheduleRecyclerViewAdapter.kt b/app/src/main/java/com/mouredev/twitimer/usecases/common/rows/ScheduleRecyclerViewAdapter.kt
@@ -4,6 +4,7 @@ import android.app.DatePickerDialog
 import android.app.TimePickerDialog
 import android.content.Context
 import android.text.Editable
+import android.text.InputType
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
@@ -52,7 +53,7 @@ class ScheduleRecyclerViewAdapter(val context: Context, var schedules: MutableLi
 
             if (weekday == WeekdayType.CUSTOM) {
                 binding.imageViewClockIcon.visibility = View.GONE
-                binding.buttonDate.picker(ContextCompat.getColor(context, if (readOnly) R.color.light else R.color.primary))
+                binding.buttonDate.picker(ContextCompat.getColor(context, R.color.light))
                 binding.textViewWeekday.visibility = View.GONE
                 binding.imageViewCustom.visibility = View.VISIBLE
 
@@ -249,6 +250,8 @@ class ScheduleRecyclerViewAdapter(val context: Context, var schedules: MutableLi
             binding.editTextInfo.setBackgroundColor(ContextCompat.getColor(context, R.color.secondary))
             binding.editTextInfo.setTextColor(ContextCompat.getColor(context, R.color.light))
             binding.editTextInfo.isEnabled = false
+            binding.editTextInfo.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+            binding.editTextInfo.isSingleLine = false
         }
 
         return viewHolder

diff --git a/...rc/main/java/com/mouredev/twitimer/usecases/common/views/userheader/UserHeaderFragment.kt b/...rc/main/java/com/mouredev/twitimer/usecases/common/views/userheader/UserHeaderFragment.kt
@@ -142,7 +142,8 @@ class UserHeaderFragment : Fragment() {
                     if (settings.tiktok?.isNotBlank() == true) {
                         binding.imageButtonTikTok.visibility = View.VISIBLE
                         binding.imageButtonTikTok.setOnClickListener {
-                            Util.openBrowser(context, "${Constants.TIKTOK_URI}${settings.tiktok?.removeSocialInvalidCharacters()}")
+                            // Pasamos el user a minus ya que la App de TikTok es case sensitive
+                            Util.openBrowser(context, "${Constants.TIKTOK_URI}${settings.tiktok?.lowercase()?.removeSocialInvalidCharacters()}")
                         }
                     }
                 }

diff --git a/app/src/main/java/com/mouredev/twitimer/util/Constants.kt b/app/src/main/java/com/mouredev/twitimer/util/Constants.kt
@@ -12,7 +12,8 @@ object Constants {
     const val TWITCH_AUTH_URI = "https://id.twitch.tv/oauth2/"
     const val TWITCH_API_URI = "https://api.twitch.tv/helix/"
     const val TWITCH_PROFILE_URI = "https://www.twitch.tv/"
-    const val TWITCH_REDIRECT_URI = "http://localhost"
+    const val TWITCH_REDIRECT_URI = "https://twitimer.com"
+    const val TWITCH_REDIRECT_HOST = "twitimer.com"
 
     // Remote
     const val REMOTE_TWITCH_CLIENT_ID = "TwitchClientID"

diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml
@@ -195,7 +195,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:drawableEnd="@drawable/next"
-            android:drawableTint="@color/secondary"
+            android:drawableTint="@color/primary"
             android:letterSpacing="0"
             android:paddingLeft="0dp"
             android:paddingRight="0dp"
@@ -215,7 +215,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:drawableEnd="@drawable/next"
-            android:drawableTint="@color/secondary"
+            android:drawableTint="@color/primary"
             android:letterSpacing="0"
             android:paddingLeft="0dp"
             android:paddingRight="0dp"