left->start

lizongying · Apr 27, 2024 · fe888c3 · fe888c3
1 parent 5aa08f5
commit fe888c3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/app/src/main/cpp/arm64-v8a/libnative.so b/app/src/main/cpp/arm64-v8a/libnative.so
diff --git a/app/src/main/cpp/armeabi-v7a/libnative.so b/app/src/main/cpp/armeabi-v7a/libnative.so
diff --git a/app/src/main/java/com/lizongying/mytv/ChannelFragment.kt b/app/src/main/java/com/lizongying/mytv/ChannelFragment.kt
@@ -6,7 +6,7 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginRight
+import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.databinding.ChannelBinding
@@ -40,7 +40,7 @@ class ChannelFragment : Fragment() {
                 ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
             val originalLayoutParams =
                 binding.channel.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.rightMargin += x
+            originalLayoutParams.marginEnd += x
             binding.channel.layoutParams = originalLayoutParams
         }
 
@@ -57,7 +57,7 @@ class ChannelFragment : Fragment() {
         binding.channel.layoutParams.height = application.px2Px(binding.channel.layoutParams.height)
         val layoutParams = binding.channel.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.topMargin = application.px2Px(binding.channel.marginTop)
-        layoutParams.rightMargin = application.px2Px(binding.channel.marginRight)
+        layoutParams.marginEnd = application.px2Px(binding.channel.marginEnd)
         binding.channel.layoutParams = layoutParams
         binding.content.textSize = application.px2PxFont(binding.content.textSize)
 

diff --git a/app/src/main/java/com/lizongying/mytv/ErrorFragment.kt b/app/src/main/java/com/lizongying/mytv/ErrorFragment.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginLeft
+import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.databinding.ErrorBinding
@@ -24,10 +24,6 @@ class ErrorFragment : Fragment() {
         binding.logo.layoutParams.width = application.px2Px(binding.logo.layoutParams.width)
         binding.logo.layoutParams.height = application.px2Px(binding.logo.layoutParams.height)
 
-        val layoutParamsMain = binding.main.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsMain.leftMargin = application.px2Px(binding.main.marginLeft)
-        binding.main.layoutParams = layoutParamsMain
-
         val layoutParams = binding.msg.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.topMargin = application.px2Px(binding.msg.marginTop)
         binding.msg.layoutParams = layoutParams

diff --git a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt
@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.marginBottom
-import androidx.core.view.marginLeft
+import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import androidx.core.view.setPadding
 import androidx.fragment.app.Fragment
@@ -54,7 +54,7 @@ class InfoFragment : Fragment() {
         binding.main.setPadding(application.px2Px(binding.main.paddingTop))
 
         val layoutParamsMain = binding.main.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsMain.leftMargin = application.px2Px(binding.main.marginLeft)
+        layoutParamsMain.marginStart = application.px2Px(binding.main.marginStart)
         binding.main.layoutParams = layoutParamsMain
 
         val layoutParamsDesc = binding.desc.layoutParams as ViewGroup.MarginLayoutParams

diff --git a/app/src/main/java/com/lizongying/mytv/MainFragment.kt b/app/src/main/java/com/lizongying/mytv/MainFragment.kt
@@ -9,7 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.view.marginBottom
-import androidx.core.view.marginLeft
+import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
@@ -61,8 +61,8 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
             val originalLayoutParams =
                 binding.scroll.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.leftMargin += x
-            originalLayoutParams.rightMargin += x
+            originalLayoutParams.marginStart += x
+            originalLayoutParams.marginEnd += x
             binding.scroll.layoutParams = originalLayoutParams
 
             Log.i(
@@ -166,7 +166,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     itemBinding.header.layoutParams as ViewGroup.MarginLayoutParams
                 layoutParamsHeader.topMargin = application.px2Px(itemBinding.header.marginTop)
                 layoutParamsHeader.bottomMargin = application.px2Px(itemBinding.header.marginBottom)
-                layoutParamsHeader.leftMargin = application.px2Px(itemBinding.header.marginLeft)
+                layoutParamsHeader.marginStart = application.px2Px(itemBinding.header.marginStart)
                 itemBinding.header.layoutParams = layoutParamsHeader
                 itemBinding.header.textSize = application.px2PxFont(itemBinding.header.textSize)
 

diff --git a/app/src/main/java/com/lizongying/mytv/TimeFragment.kt b/app/src/main/java/com/lizongying/mytv/TimeFragment.kt
@@ -6,7 +6,7 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginRight
+import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.Utils.getDateFormat
@@ -36,7 +36,7 @@ class TimeFragment : Fragment() {
             val x =
                 ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
             val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.rightMargin += x
+            originalLayoutParams.marginEnd += x
             binding.time.layoutParams = originalLayoutParams
         }
 
@@ -52,7 +52,7 @@ class TimeFragment : Fragment() {
         binding.time.layoutParams.height = application.px2Px(binding.time.layoutParams.height)
         val layoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.topMargin = application.px2Px(binding.time.marginTop)
-        layoutParams.rightMargin = application.px2Px(binding.time.marginRight)
+        layoutParams.marginEnd = application.px2Px(binding.time.marginEnd)
         binding.time.layoutParams = layoutParams
         binding.content.textSize = application.px2PxFont(binding.content.textSize)