Aditya.Gaikwad/Woka_Native_Android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI bugs solving and improvements in FmActivity and onboard flow next buttons.

Browse Source
This commit is contained in:
Aditya Gaikwad
2024-08-27 20:53:47 +05:30
parent dc6bdbf6db
commit 234d0af32e
22 changed files with 298 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/deploymentTargetDropDown.xml generated
View File

@@ -4,13 +4,26 @@
<value>
<entry key="app">
<State>
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="adb-RZCW41EJRPN-wiByj3._adb-tls-connect._tcp." />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-08-27T13:50:53.152663Z" />
<multipleDevicesSelectedInDropDown value="true" />
<targetsSelectedWithDialog>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="$PROJECT_DIR$/../.android/avd/6.7_Horizontal_Fold-in_API_34.avd" />
<value value="$PROJECT_DIR$/../.android/avd/Small_Phone_API_34.avd" />
</Key>
</deviceKey>
</Target>

BIN
app/src/main/res/drawable-hdpi/img_volume_down.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
app/src/main/res/drawable-hdpi/img_volume_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 269 B

After

Width:  |  Height:  |  Size: 15 KiB

BIN
app/src/main/res/drawable-ldpi/img_volume_down.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/drawable-ldpi/img_volume_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 163 B

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
app/src/main/res/drawable-mdpi/img_volume_down.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
app/src/main/res/drawable-mdpi/img_volume_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
app/src/main/res/drawable-xhdpi/img_volume_down.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
app/src/main/res/drawable-xhdpi/img_volume_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/drawable-xxhdpi/img_volume_down.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 389 B

After

Width:  |  Height:  |  Size: 19 KiB

BIN
app/src/main/res/drawable-xxhdpi/img_volume_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 39 KiB

BIN
app/src/main/res/drawable-xxxhdpi/img_volume_down.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 541 B

After

Width:  |  Height:  |  Size: 35 KiB

BIN
app/src/main/res/drawable-xxxhdpi/img_volume_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 627 B

After

Width:  |  Height:  |  Size: 70 KiB

543
app/src/main/res/layout/dialog_module_shower.xml
View File

@@ -20,296 +20,299 @@
android:layout_marginEnd="15dp"
/>
<androidx.cardview.widget.CardView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:cardBackgroundColor="@color/white"
app:cardElevation="3dp"
app:cardCornerRadius="15dp"
android:layout_marginHorizontal="15dp"
>
android:layout_height="wrap_content">
<com.woka.utils.AdiImageView
android:id="@+id/image"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/_120sdp"
android:src="@android:color/darker_gray"
android:contentDescription="@string/image"
android:scaleType="fitXY"
app:imageCornerRadius="15dp"
android:layout_margin="10dp"
/>
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="The title of the blog will be displayed here"
android:fontFamily="@font/exo_2_bold"
android:textColor="@color/color_primary"
android:layout_marginTop="15dp"
android:layout_marginHorizontal="15dp"
android:maxLines="2"
android:ellipsize="end"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="2dp">
<TextView
android:id="@+id/year"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="2022"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="3dp"
/>
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:contentDescription="@string/image"
android:src="@drawable/ic_like_filled"
app:layout_constraintTop_toTopOf="@id/like_count"
app:layout_constraintBottom_toBottomOf="@id/like_count"
app:layout_constraintEnd_toStartOf="@id/like_count"
android:layout_marginBottom="3dp"
android:layout_marginEnd="3dp"
/>
<TextView
android:id="@+id/like_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="10"
android:fontFamily="@font/exo_2_semibold"
android:textColor="@color/color_primary"
android:includeFontPadding="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<ScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
>
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Description is here"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary"
android:layout_marginHorizontal="15dp"
/>
</ScrollView>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:orientation="horizontal">
<Button
android:id="@+id/watch_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/round_bg_25"
android:backgroundTint="@color/audio_grad_one"
android:drawableStart="@drawable/ic_play_filled"
android:drawablePadding="15dp"
android:fontFamily="@font/exo_2_extrabold"
android:paddingVertical="10dp"
android:paddingStart="15dp"
android:paddingEnd="20dp"
android:text="@string/listen_now"
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/fav_season_LL"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/rate_season_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:id="@+id/like"
android:layout_width="@dimen/_24sdp"
android:layout_height="@dimen/_24sdp"
android:contentDescription="@string/image"
android:src="@drawable/ic_like_selector"
android:padding="3dp"
/>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:cardBackgroundColor="@color/white"
app:cardElevation="3dp"
app:cardCornerRadius="15dp"
android:layout_marginHorizontal="15dp"
>
<com.woka.utils.AdiImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="@dimen/_120sdp"
android:src="@android:color/darker_gray"
android:contentDescription="@string/image"
android:scaleType="fitXY"
app:imageCornerRadius="15dp"
android:layout_margin="10dp"
/>
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="The title of the blog will be displayed here"
android:fontFamily="@font/exo_2_bold"
android:textColor="@color/color_primary"
android:layout_marginTop="15dp"
android:layout_marginHorizontal="15dp"
android:maxLines="2"
android:ellipsize="end"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="2dp">
<TextView
android:id="@+id/year"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="2022"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="3dp"
/>
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:contentDescription="@string/image"
android:src="@drawable/ic_like_filled"
app:layout_constraintTop_toTopOf="@id/like_count"
app:layout_constraintBottom_toBottomOf="@id/like_count"
app:layout_constraintEnd_toStartOf="@id/like_count"
android:layout_marginBottom="3dp"
android:layout_marginEnd="3dp"
/>
<TextView
android:id="@+id/like_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="10"
android:fontFamily="@font/exo_2_semibold"
android:textColor="@color/color_primary"
android:includeFontPadding="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:textSize="11sp"
android:text="@string/rate"
tools:text="Description is here"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary" />
android:textColor="@color/color_primary"
</LinearLayout>
<View
android:id="@+id/divider_1"
android:layout_width="0.5dp"
android:layout_height="40dp"
android:background="@color/color_primary"
android:layout_marginEnd="5dp"
app:layout_constraintEnd_toStartOf="@id/rate_season_ll"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
/>
<LinearLayout
android:id="@+id/share_season_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/divider_1"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
android:gravity="center_horizontal"
android:layout_marginEnd="5dp"
android:orientation="vertical">
<ImageView
android:id="@+id/share"
android:layout_width="@dimen/_24sdp"
android:layout_height="@dimen/_23sdp"
android:contentDescription="@string/image"
android:src="@drawable/ic_share"
android:padding="3dp"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="5dp"
/>
<TextView
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:orientation="horizontal">
android:layout_marginTop="5dp"
<Button
android:id="@+id/watch_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/share"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary" />
android:background="@drawable/round_bg_25"
android:backgroundTint="@color/audio_grad_one"
android:drawableStart="@drawable/ic_play_filled"
android:drawablePadding="15dp"
android:fontFamily="@font/exo_2_extrabold"
android:paddingVertical="10dp"
android:paddingStart="15dp"
android:paddingEnd="20dp"
android:text="@string/listen_now"
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/fav_season_LL"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/rate_season_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:id="@+id/like"
android:layout_width="@dimen/_24sdp"
android:layout_height="@dimen/_24sdp"
android:contentDescription="@string/image"
android:src="@drawable/ic_like_selector"
android:padding="3dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:textSize="11sp"
android:text="@string/rate"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary" />
</LinearLayout>
<View
android:id="@+id/divider_1"
android:layout_width="0.5dp"
android:layout_height="40dp"
android:background="@color/color_primary"
android:layout_marginEnd="5dp"
app:layout_constraintEnd_toStartOf="@id/rate_season_ll"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
/>
<LinearLayout
android:id="@+id/share_season_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/divider_1"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
android:gravity="center_horizontal"
android:layout_marginEnd="5dp"
android:orientation="vertical">
<ImageView
android:id="@+id/share"
android:layout_width="@dimen/_24sdp"
android:layout_height="@dimen/_23sdp"
android:contentDescription="@string/image"
android:src="@drawable/ic_share"
android:padding="3dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textSize="11sp"
android:text="@string/share"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary" />
</LinearLayout>
<View
android:id="@+id/divider_2"
android:layout_width="0.5dp"
android:layout_height="40dp"
android:background="@color/color_primary"
android:layout_marginEnd="5dp"
app:layout_constraintEnd_toStartOf="@id/share_season_ll"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
/>
<LinearLayout
android:id="@+id/fav_season_LL"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/divider_2"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
android:gravity="center_horizontal"
android:layout_marginEnd="5dp"
android:orientation="vertical">
<ImageView
android:id="@+id/fav"
android:layout_width="@dimen/_24sdp"
android:layout_height="@dimen/_24sdp"
android:contentDescription="@string/image"
android:src="@drawable/ic_heart_select"
android:padding="3dp"
/>
<TextView
android:id="@+id/fav_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:textSize="11sp"
android:text="@string/add"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<View
android:id="@+id/divider_2"
android:layout_width="0.5dp"
android:layout_height="40dp"
android:background="@color/color_primary"
android:layout_marginEnd="5dp"
app:layout_constraintEnd_toStartOf="@id/share_season_ll"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
/>
<LinearLayout
android:id="@+id/fav_season_LL"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/divider_2"
app:layout_constraintTop_toTopOf="@id/watch_card"
app:layout_constraintBottom_toBottomOf="@id/watch_card"
android:gravity="center_horizontal"
android:layout_marginEnd="5dp"
android:orientation="vertical">
<ImageView
android:id="@+id/fav"
android:layout_width="@dimen/_24sdp"
android:layout_height="@dimen/_24sdp"
android:contentDescription="@string/image"
android:src="@drawable/ic_heart_select"
android:padding="3dp"
/>
<TextView
android:id="@+id/fav_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:textSize="11sp"
android:text="@string/add"
android:fontFamily="@font/exo_2"
android:textColor="@color/color_primary" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

2
app/src/main/res/layout/fragment_child_list.xml
View File

@@ -104,7 +104,7 @@
android:background="@drawable/grad_btn_bg_4"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="@dimen/_25sdp"
android:layout_marginBottom="15dp"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/fragment_get_code.xml
View File

@@ -292,7 +292,7 @@
android:background="@drawable/grad_btn_bg_4"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="@dimen/_25sdp"
android:layout_marginBottom="15dp"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/fragment_get_email.xml
View File

@@ -195,7 +195,7 @@
android:background="@drawable/grad_btn_bg_4"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="@dimen/_25sdp"
android:layout_marginBottom="15dp"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/fragment_get_more_info.xml
View File

@@ -263,7 +263,7 @@
android:background="@drawable/grad_btn_bg_4"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="@dimen/_20sdp"
android:layout_marginBottom="15dp"
android:layout_alignParentBottom="true"

4
app/src/main/res/layout/fragment_home_1.xml
View File

@@ -200,7 +200,7 @@
<ImageView
android:id="@+id/black_image"
android:layout_width="@dimen/_120sdp"
android:layout_width="@dimen/_121sdp"
android:layout_height="@dimen/_81sdp"
android:contentDescription="@string/image"
@@ -218,7 +218,7 @@
<androidx.media3.ui.PlayerView
android:id="@+id/player_view"
android:layout_width="@dimen/_120sdp"
android:layout_width="@dimen/_121sdp"
android:layout_height="@dimen/_81sdp"
app:resize_mode="fill"

2
app/src/main/res/layout/fragment_new_password.xml
View File

@@ -208,7 +208,7 @@
android:background="@drawable/grad_btn_bg_4"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="@dimen/_25sdp"
android:layout_marginBottom="15dp"
app:layout_constraintBottom_toBottomOf="parent"

5
app/src/main/res/layout/fragment_select_avatar.xml
View File

@@ -47,7 +47,8 @@
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toTopOf="@id/next"
android:layout_marginVertical="25dp"
android:layout_marginTop="25dp"
android:layout_marginBottom="10dp"
android:layout_marginHorizontal="15dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
@@ -68,7 +69,7 @@
android:background="@drawable/grad_btn_bg_4"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="@dimen/_25sdp"
android:layout_marginBottom="15dp"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/fragment_sign_up.xml
View File

@@ -260,7 +260,7 @@
android:background="@drawable/grad_btn_bg_4"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="@dimen/_25sdp"
android:layout_marginBottom="15dp"
app:layout_constraintBottom_toBottomOf="parent"