From 899d0ca1936fa3c457c08eca09a52903b43fa121 Mon Sep 17 00:00:00 2001
From: pranavpandey1998official
<44601530+pranavpandey1998official@users.noreply.github.com>
Date: Sun, 3 Feb 2019 13:43:50 +0530
Subject: [PATCH 1/3] fix: Search view getting overflowed out of the screen
(#1011)
removed the extra parent linear-layout, removed the top margin give the parent linear-layout gravity centre and also layout_gravity centre
fix: #960 #931
---
app/src/main/res/layout/fragment_search.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index ac3a0bed27..993fd028cc 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -4,18 +4,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
@@ -89,7 +84,6 @@
-
Date: Sun, 3 Feb 2019 05:56:18 +0530
Subject: [PATCH 2/3] Event screen full size
---
.../org/fossasia/openevent/general/auth/LoginFragment.kt | 7 +++++++
.../java/org/fossasia/openevent/general/utils/Utils.kt | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt
index 7ad7e37fd8..f0ad223f64 100644
--- a/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt
@@ -14,6 +14,7 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.navigation.Navigation.findNavController
import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_login.email
import kotlinx.android.synthetic.main.fragment_login.loginButton
import kotlinx.android.synthetic.main.fragment_login.password
@@ -132,11 +133,17 @@ class LoginFragment : Fragment() {
rootView.tick.setOnClickListener {
rootView.sentEmailLayout.visibility = View.GONE
+ if (thisActivity is AppCompatActivity)
+ thisActivity.supportActionBar?.show()
+ Utils.navAnimVisible(thisActivity?.navigationAuth, context)
rootView.loginLayout.visibility = View.VISIBLE
}
rootView.forgotPassword.setOnClickListener {
hideSoftKeyboard(context, rootView)
+ if (thisActivity is AppCompatActivity)
+ thisActivity.supportActionBar?.hide()
+ Utils.navAnimGone(thisActivity?.navigationAuth, context)
loginViewModel.sendResetPasswordEmail(email.text.toString())
}
diff --git a/app/src/main/java/org/fossasia/openevent/general/utils/Utils.kt b/app/src/main/java/org/fossasia/openevent/general/utils/Utils.kt
index ff1da0c700..3c9e44db79 100644
--- a/app/src/main/java/org/fossasia/openevent/general/utils/Utils.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/utils/Utils.kt
@@ -103,14 +103,14 @@ object Utils {
return builder.build()
}
- fun navAnimVisible(navigation: BottomNavigationView?, context: Context) {
+ fun navAnimVisible(navigation: BottomNavigationView?, context: Context?) {
if (navigation?.visibility == View.GONE) {
navigation.visibility = View.VISIBLE
navigation.animation = AnimationUtils.loadAnimation(context, R.anim.slide_up)
}
}
- fun navAnimGone(navigation: BottomNavigationView?, context: Context) {
+ fun navAnimGone(navigation: BottomNavigationView?, context: Context?) {
if (navigation?.visibility == View.VISIBLE) {
navigation.visibility = View.GONE
navigation.animation = AnimationUtils.loadAnimation(context, R.anim.slide_down)
From 9bf6d5ce118c4bb0a5b5702603e78e71dcff91e4 Mon Sep 17 00:00:00 2001
From: pranavpandey1998official
<44601530+pranavpandey1998official@users.noreply.github.com>
Date: Sun, 3 Feb 2019 15:01:20 +0530
Subject: [PATCH 3/3] fix: not all option are available in search time fragment
in landscape mode (#1013)
---
.../main/res/layout/fragment_search_time.xml | 111 ++++++++++--------
1 file changed, 62 insertions(+), 49 deletions(-)
diff --git a/app/src/main/res/layout/fragment_search_time.xml b/app/src/main/res/layout/fragment_search_time.xml
index 66074cf6b0..90cb5da73f 100644
--- a/app/src/main/res/layout/fragment_search_time.xml
+++ b/app/src/main/res/layout/fragment_search_time.xml
@@ -3,7 +3,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_margin="@dimen/layout_margin_medium"
+ android:layout_marginTop="@dimen/layout_margin_medium"
+ android:layout_marginLeft="@dimen/layout_margin_medium"
+ android:layout_marginRight="@dimen/layout_margin_medium"
android:orientation="vertical"
tools:context="org.fossasia.openevent.general.search.SearchTimeFragment">
@@ -16,59 +18,70 @@
android:textSize="@dimen/text_size_extra_large"
android:textStyle="bold" />
-
-
+ android:layout_height="match_parent"
+ android:scrollbars="none"
+ android:overScrollMode="never">
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+