Issue related to animations on home theme 1 fragment

Scaling animation on press of view
Hindi texts for sidebar

Differentiating side bar between signed in and guest user

logout api integration
guest api integration on login page

completed flow of login and logout from inside screens
This commit is contained in:
2024-05-28 20:57:12 +05:30
parent de09dd3406
commit 31964a64dc
38 changed files with 401 additions and 68 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@@ -16,6 +16,25 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.woka.home.PressableImageView
android:id="@+id/notifications"
android:visibility="visible"
android:layout_width="@dimen/_35sdp"
android:layout_height="@dimen/_35sdp"
app:layout_constraintEnd_toStartOf="@id/side_menu"
app:layout_constraintBottom_toBottomOf="@id/side_menu"
app:layout_constraintTop_toTopOf="@id/side_menu"
android:layout_margin="15dp"
android:elevation="5dp"
android:contentDescription="@string/image"
android:src="@drawable/img_notification"
android:scaleType="fitXY"
/>
<com.woka.home.PressableImageView
android:id="@+id/side_menu"
android:layout_width="@dimen/_35sdp"
@@ -30,6 +49,7 @@
android:contentDescription="@string/image"
android:src="@drawable/ic_menu"
android:scaleType="fitXY"
/>
<androidx.fragment.app.FragmentContainerView
@@ -37,6 +57,8 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="-15dp"
app:layout_constraintBottom_toTopOf="@id/bottom_nav"
app:layout_constraintTop_toTopOf="parent"
/>
@@ -95,25 +117,49 @@
android:layout_marginTop="15dp"
/>
<TextView
android:id="@+id/sb_user_name"
<LinearLayout
android:id="@+id/user_name_LL"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Aditya Gaikwad"
android:textColor="@color/white"
android:fontFamily="@font/exo_2_bold"
android:textSize="@dimen/_14ssp"
android:textAlignment="center"
android:layout_gravity="center_horizontal"
android:layout_gravity="center"
android:orientation="horizontal">
android:maxLines="1"
android:ellipsize="end"
<TextView
android:id="@+id/hello_txt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/hello"
android:layout_marginTop="3dp"
android:fontFamily="@font/exo_2_bold"
android:textAlignment="center"
android:textColor="@color/white"
/>
android:textSize="@dimen/_14ssp"
/>
<TextView
android:id="@+id/sb_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text=", Aditya"
android:layout_marginTop="3dp"
android:fontFamily="@font/exo_2_bold"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="@dimen/_14ssp"
android:maxLines="1"
android:ellipsize="end"
/>
</LinearLayout>
<Button
android:id="@+id/sb_btn"
@@ -135,6 +181,7 @@
/>
<TextView
android:id="@+id/theme_txt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -319,6 +366,7 @@
/>
<TextView
android:id="@+id/sb_about_woka"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -337,6 +385,7 @@
/>
<TextView
android:id="@+id/sb_faq"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -355,6 +404,7 @@
/>
<TextView
android:id="@+id/sb_woka_support"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -373,6 +423,7 @@
/>
<TextView
android:id="@+id/sb_my_profile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -393,6 +444,7 @@
/>
<TextView
android:id="@+id/sb_my_orders"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -413,6 +465,7 @@
/>
<TextView
android:id="@+id/sb_de_activate_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@@ -261,11 +261,14 @@
/>
<LinearLayout
android:id="@+id/linearLayout"
android:id="@+id/web_series_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:scaleX="0.5"
android:scaleY="0.5"
android:translationZ="2dp"
android:orientation="vertical"
@@ -301,11 +304,13 @@
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayout2"
android:id="@+id/live_tv_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:scaleY="0.5"
android:scaleX="0.5"
android:translationZ="2dp"
android:orientation="vertical"
@@ -342,11 +347,13 @@
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayout3"
android:id="@+id/shop_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:scaleY="0.5"
android:scaleX="0.5"
android:translationZ="2dp"
android:orientation="vertical"
@@ -388,6 +395,8 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:scaleY="0.5"
android:scaleX="0.5"
android:translationZ="2dp"
android:orientation="vertical"
@@ -424,11 +433,13 @@
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayout5"
android:id="@+id/audio_books_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:scaleY="0.5"
android:scaleX="0.5"
android:translationZ="2dp"
android:orientation="vertical"
@@ -470,6 +481,8 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:scaleY="0.5"
android:scaleX="0.5"
android:translationZ="2dp"
android:orientation="vertical"

View File

@@ -82,7 +82,7 @@
android:layout_width="@dimen/_25sdp"
android:layout_height="@dimen/_15sdp"
android:contentDescription="@string/image"
android:src="@drawable/ic_woka"
android:src="@drawable/img_woka_w"
android:scaleType="fitXY"
/>

View File

@@ -49,6 +49,7 @@
android:textColor="@color/color_primary"
tools:text="This is message that will be shown as subtitle"
android:layout_gravity="center_horizontal"
/>

View File

@@ -99,6 +99,8 @@
<string name="home">घर</string>
<string name="explore_woka">वोका का अन्वेषण करें</string>
<string name="my_list">मेरी सूची</string>
<string name="logout">लॉग आउट</string>
<string name="theme">थीम</string>
<string name="hello">नमस्ते</string>
<string name="web_series">वेब सीरीज</string>
<string name="audio_books">ऑडियो-किताबें</string>
@@ -108,4 +110,7 @@
<string name="more">और</string>
<string name="live_tv">लाइव टीवी</string>
<string name="welcome_to_wokaland">वोकलैंड में आपका स्वागत है</string>
<string name="login_register">लॉगइन / रजिस्टर करें</string>
<string name="logging_you_out">लॉग आउट कर रहे हैं</string>
<string name="do_you_want_to_log_out">क्या आप Woka ऐप से लॉग आउट करना चाहते हैं?</string>
</resources>

View File

@@ -106,8 +106,8 @@
<string name="home">Home</string>
<string name="explore_woka">Explore Woka</string>
<string name="my_list">My List</string>
<string name="logout" translatable="false">Logout</string>
<string name="theme" translatable="false">THEME</string>
<string name="logout">Logout</string>
<string name="theme">THEME</string>
<string name="about_woka" translatable="false">About WOKA</string>
<string name="faqs" translatable="false">FAQs</string>
<string name="woka_support" translatable="false">WOKA Support</string>
@@ -127,4 +127,8 @@
<string name="more">MORE</string>
<string name="live_tv">LIVE TV</string>
<string name="welcome_to_wokaland">Welcome to WOKALAND</string>
<string name="login_register">Login / Register</string>
<string name="logging_you_out">Logging you out</string>
<string name="woka" translatable="false">Woka</string>
<string name="do_you_want_to_log_out">Do you want to log out of Woka app?</string>
</resources>