Merge remote-tracking branch 'origin/develop'

Oztechan · Oct 25, 2021 · 2c7c7d2 · 2c7c7d2
2 parents a1892c0 + 6a36ba4
commit 2c7c7d2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/android/src/main/java/com/github/mustafaozhan/ccc/android/ui/slider/SliderFragment.kt b/android/src/main/java/com/github/mustafaozhan/ccc/android/ui/slider/SliderFragment.kt
@@ -70,6 +70,7 @@ class SliderFragment : BaseVBFragment<FragmentSliderBinding>() {
                 .whether { it < layouts.size }
                 ?.let { binding.viewPager.currentItem = it }
                 ?: run {
+                    binding.bottomBarSeparator.gone()
                     binding.progressBar.visible()
                     navigate(
                         R.id.sliderFragment,

diff --git a/android/src/main/res/layout/fragment_slider.xml b/android/src/main/res/layout/fragment_slider.xml
@@ -17,10 +17,11 @@
 
     <ProgressBar
         android:id="@+id/progress_bar"
-        style="@style/SlideProgressBar"
+        style="@style/SliderProgressBarStyle"
         android:layout_above="@id/layout_dots" />
 
     <View
+        android:id="@+id/bottom_bar_separator"
         style="@style/SlideViewLayout"
         android:layout_above="@id/layout_dots" />
 

diff --git a/android/src/main/res/values/dimens.xml b/android/src/main/res/values/dimens.xml
@@ -37,8 +37,8 @@
     <dimen name="snack_icon_size">56dp</dimen>
 
     <!--ProgressBar-->
-    <dimen name="progress_bar_height_width">72dp</dimen>
-    <dimen name="progress_bar_margin_top">24dp</dimen>
+    <dimen name="progress_bar_height">6dp</dimen>
+    <dimen name="progress_bar_margin_top_bottom">-1dp</dimen>
 
     <dimen name="dots_height">30dp</dimen>
     <dimen name="dots_margin_bottom">20dp</dimen>

diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
@@ -182,12 +182,6 @@
         <item name="android:orientation">horizontal</item>
     </style>
 
-    <style name="SlideProgressBar" parent="WrapStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_marginBottom">@dimen/dots_margin_bottom</item>
-        <item name="android:visibility">gone</item>
-    </style>
-
     <style name="SlideViewLayout">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/height_separator</item>
@@ -272,10 +266,19 @@
         <item name="android:textAppearance">@style/BaseTextStyle</item>
     </style>
 
-    <style name="ProgressBarStyle">
-        <item name="android:paddingTop">@dimen/progress_bar_margin_top</item>
-        <item name="android:layout_width">@dimen/progress_bar_height_width</item>
-        <item name="android:layout_height">@dimen/progress_bar_height_width</item>
+    <style name="ProgressBarStyle" parent="Widget.AppCompat.ProgressBar.Horizontal">
+        <item name="android:theme">@style/AppTheme</item>
+        <item name="android:scaleY">3</item>
+        <item name="android:indeterminate">true</item>
+        <item name="android:layout_width">@dimen/margin_zero</item>
+        <item name="android:layout_height">@dimen/progress_bar_height</item>
+        <item name="android:layout_marginTop">@dimen/progress_bar_margin_top_bottom</item>
+    </style>
+
+    <style name="SliderProgressBarStyle" parent="ProgressBarStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:visibility">gone</item>
+        <item name="android:layout_marginBottom">@dimen/progress_bar_margin_top_bottom</item>
     </style>
 
     <style name="DataStateStyle" parent="WrapStyle">

diff --git a/logmob b/logmob
+4 −4		buildSrc/src/main/kotlin/Versions.kt
+1 −1		gradle/wrapper/gradle-wrapper.properties
+0 −2		logmob/src/androidMain/kotlin/com/github/mustafaozhan/logmob/LogMobLogger.kt