two d bug fixed. build apk error fixed.

Author: kyawhtut-cu

2d/src/main/java/com/kyawhut/atsycast/twod/ui/components/TwoDView.kt

@@ -28,10 +28,10 @@ class TwoDView @JvmOverloads constructor(
     }
 
     private val isTwelveHour: Boolean
-        get() = getCurrentHours() <= 12
+        get() = getCurrentHours() >= 12
 
     private val isFourHour: Boolean
-        get() = getCurrentHours() >= 12
+        get() = getCurrentHours() >= 16
 
     private val vb: View2dBinding by lazy {
         View2dBinding.inflate(LayoutInflater.from(context), this, true)

free2air/src/main/res/drawable/bg_live.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="#b31c22" />
 </shape>

free2air/src/main/res/drawable/ic_f2a_card_play.xml

@@ -5,10 +5,10 @@
     android:viewportHeight="24">
     <path
         android:fillAlpha="0.3"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="#b31c22"
         android:pathData="M12,20c4.41,0 8,-3.59 8,-8s-3.59,-8 -8,-8 -8,3.59 -8,8 3.59,8 8,8zM10,7.5l6,4.5 -6,4.5v-9z"
         android:strokeAlpha="0.3" />
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="#b31c22"
         android:pathData="M12,22c5.52,0 10,-4.48 10,-10S17.52,2 12,2 2,6.48 2,12s4.48,10 10,10zM12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8 -8,-3.59 -8,-8 3.59,-8 8,-8zM10,7.5v9l6,-4.5z" />
 </vector>

free2air/src/main/res/layout/activity_f2a_home.xml

@@ -83,7 +83,7 @@
                 style="@style/TvDefaultText"
                 android:paddingHorizontal="@dimen/margin_medium"
                 android:text="@string/lblLive"
-                android:textColor="@color/colorPrimary"
+                android:textColor="#b31c22"
                 android:textSize="@dimen/text_regular"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"

share/src/main/res/drawable/atsy_detail_bg_left_shape.xml

@@ -7,7 +7,7 @@
 
     <path
         android:fillAlpha="0.75"
-        android:fillColor="@color/colorPrimaryDark"
+        android:fillColor="#7A1317"
         android:pathData="M 0,10 L 80,100 0,100 z" />
 
 </vector>

share/src/main/res/drawable/bg_search.xml

@@ -145,7 +145,7 @@
                 android:id="@+id/view_buffered_percent"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:background="@color/colorPrimaryDark"
+                android:background="#b31c22"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -155,7 +155,7 @@
                 android:id="@+id/view_progress_percent"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:background="@color/colorPrimary"
+                android:background="#b31c22"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"

share/src/main/res/layout/atsy_player.xml

@@ -113,13 +113,13 @@
             android:layout_height="wrap_content"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            app:buffered_color="@color/colorPrimaryDark"
+            app:buffered_color="#7A1317"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:played_color="@color/colorPrimary"
-            app:scrubber_color="@color/colorPrimary"
+            app:played_color="#b31c22"
+            app:scrubber_color="#b31c22"
             app:unplayed_color="#C3C3C3" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

share/src/main/res/layout/atsy_player_controller.xml

@@ -41,7 +41,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/thumbnail_horizontal" />
+            tools:src="@drawable/ic_thumbnail" />
 
         <com.kyawhut.atsycast.share.components.RoundedConstraintLayout
             android:id="@+id/view_progress"
@@ -59,7 +59,7 @@
                 android:id="@+id/view_progress_percent"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:background="@color/colorPrimary"
+                android:background="#b31c22"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"

share/src/main/res/layout/card_recently_watch.xml

@@ -19,7 +19,7 @@
     </style>
 
     <style name="ProgressTheme">
-        <item name="colorAccent">@color/colorPrimary</item>
+        <item name="colorAccent">#b31c22</item>
     </style>
 
     <style name="FullScreenDialogTransparent" parent="BaseTvTheme">