From 3b8421d2b6854a07bd149a5097e73cef7577435b Mon Sep 17 00:00:00 2001 From: Aman kumar gupta <75511608+codecraft26@users.noreply.github.com> Date: Sat, 5 Mar 2022 22:47:55 +0530 Subject: [PATCH 001/132] commit for No action in themes --- app/src/main/res/values-night/themes.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index ec3aab2..4d561ea 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -12,5 +12,6 @@ ?attr/colorPrimaryVariant + - \ No newline at end of file + From 210b0c1b221d1474e8d53f229f5488d1c250d191 Mon Sep 17 00:00:00 2001 From: Aman kumar gupta <75511608+codecraft26@users.noreply.github.com> Date: Tue, 15 Mar 2022 21:14:00 +0530 Subject: [PATCH 002/132] update of organisation.kt --- .../dev/aman/inquire/organisation/OrganisationMainActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/dev/aman/inquire/organisation/OrganisationMainActivity.kt b/app/src/main/java/dev/aman/inquire/organisation/OrganisationMainActivity.kt index f3152e0..edc4918 100644 --- a/app/src/main/java/dev/aman/inquire/organisation/OrganisationMainActivity.kt +++ b/app/src/main/java/dev/aman/inquire/organisation/OrganisationMainActivity.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import dev.aman.inquire.R import dev.aman.inquire.databinding.ActivityOrganisationMainBinding import dev.aman.inquire.databinding.ActivityOrganisationSplashBinding +// this activity for refencing that it is aorgniastaion activity class OrganisationMainActivity : AppCompatActivity() { private lateinit var binding: ActivityOrganisationMainBinding @@ -15,4 +16,4 @@ class OrganisationMainActivity : AppCompatActivity() { setContentView(binding.root) } -} \ No newline at end of file +} From 430d4dd03c011197292d0ff031433212abffde2c Mon Sep 17 00:00:00 2001 From: Aman kumar gupta <75511608+codecraft26@users.noreply.github.com> Date: Wed, 16 Mar 2022 21:45:57 +0530 Subject: [PATCH 003/132] update of individual.kt --- .../aman/inquire/individual/login/IndividualLoginActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/dev/aman/inquire/individual/login/IndividualLoginActivity.kt b/app/src/main/java/dev/aman/inquire/individual/login/IndividualLoginActivity.kt index 62a6950..b50bee5 100644 --- a/app/src/main/java/dev/aman/inquire/individual/login/IndividualLoginActivity.kt +++ b/app/src/main/java/dev/aman/inquire/individual/login/IndividualLoginActivity.kt @@ -17,6 +17,7 @@ class IndividualLoginActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(binding.root) binding.signInButton.setOnClickListener{ + // line code for opening a signin intent of google signInLauncher.launch(signInIntent) } } @@ -49,4 +50,4 @@ class IndividualLoginActivity : AppCompatActivity() { } } -} \ No newline at end of file +} From f7925d650ae7753a3d4459b44f4ffb54a52da256 Mon Sep 17 00:00:00 2001 From: Aman kumar gupta <75511608+codecraft26@users.noreply.github.com> Date: Wed, 16 Mar 2022 21:46:45 +0530 Subject: [PATCH 004/132] Update IndividualLoginActivity.kt --- .../aman/inquire/individual/login/IndividualLoginActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/dev/aman/inquire/individual/login/IndividualLoginActivity.kt b/app/src/main/java/dev/aman/inquire/individual/login/IndividualLoginActivity.kt index b50bee5..89ca372 100644 --- a/app/src/main/java/dev/aman/inquire/individual/login/IndividualLoginActivity.kt +++ b/app/src/main/java/dev/aman/inquire/individual/login/IndividualLoginActivity.kt @@ -28,7 +28,7 @@ class IndividualLoginActivity : AppCompatActivity() { } private val signInIntent = AuthUI.getInstance() .createSignInIntentBuilder() - .setAvailableProviders(listOf(AuthUI.IdpConfig.GoogleBuilder().build())) + .setAvailableProviders(listOf(AuthUI.IdpConfig.GoogleBuilder().build())) // choosing only auth for google .build() private fun onSignInResult(result: FirebaseAuthUIAuthenticationResult) { val response = result.idpResponse From 6f8aa2a12f3ab32ea00754c86257f7ad7536b5b0 Mon Sep 17 00:00:00 2001 From: codecraft26 Date: Sat, 26 Mar 2022 00:10:27 +0530 Subject: [PATCH 005/132] adjusting the splash activity and font --- app/src/main/res/layout/activity_splash.xml | 36 ++++++++++++++------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index f7ec3f3..a5e07e7 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -12,27 +12,41 @@ android:id="@+id/splash_view" android:layout_width="342dp" android:layout_height="297dp" - android:layout_marginTop="240dp" + android:layout_marginTop="120dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.623" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" + app:layout_constraintHorizontal_bias="0.492" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:lottie_autoPlay="true" app:lottie_loop="true" app:lottie_rawRes="@raw/splashanimation" /> + + + app:layout_constraintTop_toBottomOf="@+id/textView" + app:layout_constraintVertical_bias="0.0" /> \ No newline at end of file From 941083cd0f5dac5451a211a38bdc2dea3ffd7b99 Mon Sep 17 00:00:00 2001 From: codecraft26 Date: Sat, 26 Mar 2022 00:10:53 +0530 Subject: [PATCH 006/132] change the duration of spalsh --- .../main/java/dev/aman/inquire/splashScreen/SplashActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/dev/aman/inquire/splashScreen/SplashActivity.kt b/app/src/main/java/dev/aman/inquire/splashScreen/SplashActivity.kt index 0d7d9d3..bcaf605 100644 --- a/app/src/main/java/dev/aman/inquire/splashScreen/SplashActivity.kt +++ b/app/src/main/java/dev/aman/inquire/splashScreen/SplashActivity.kt @@ -26,7 +26,7 @@ class SplashActivity : AppCompatActivity() { val mIntent = Intent(this@SplashActivity, IndividualMainActivity::class.java) startActivity(mIntent) finish() - }, 2000) + }, 6000) } else{ val mIntent = Intent(this@SplashActivity, ChoosingActivity::class.java) From 5a72235cb230cd8d8c8e8d5cdc47c4098b5e82e6 Mon Sep 17 00:00:00 2001 From: codecraft26 Date: Sat, 26 Mar 2022 00:10:58 +0530 Subject: [PATCH 007/132] change the duration of spalsh --- .idea/misc.xml | 2 +- app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 3636ffa..c871219 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,7 @@ - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55dbbbb..b3260f9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,4 +10,5 @@ ORGANISATION Individual Welcome to community version + what you Require \ No newline at end of file From 069758b17f668ec259a5e3d4d87b5d3b61b3a54b Mon Sep 17 00:00:00 2001 From: codecraft26 Date: Sat, 26 Mar 2022 00:20:54 +0530 Subject: [PATCH 008/132] making button round in choosing_activity --- .idea/misc.xml | 3 ++- app/src/main/res/font/sloganfont.ttf | Bin 0 -> 55416 bytes app/src/main/res/font/splashfont.ttf | Bin 0 -> 57676 bytes app/src/main/res/layout/activity_choosing.xml | 8 ++++++-- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/font/sloganfont.ttf create mode 100644 app/src/main/res/font/splashfont.ttf diff --git a/.idea/misc.xml b/.idea/misc.xml index c871219..962bf24 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,9 +3,10 @@