From f90de4ec6702ed56a7c24c88da50e8266f735816 Mon Sep 17 00:00:00 2001 From: Tushant Date: Wed, 1 Nov 2023 01:39:30 +0530 Subject: [PATCH 1/3] Updated fragment_dashboard.xml --- .../example/votingapp/DashboardActivity.java | 14 +++++---- .../main/res/layout/activity_dashboard.xml | 28 +++++++++-------- .../main/res/layout/fragment_dashboard.xml | 30 ++++++++----------- .../res/layout/fragment_election_list.xml | 3 +- app/src/main/res/menu/bottom_nav.xml | 20 +++++++++++++ app/src/main/res/menu/layout_nav.xml | 21 ------------- 6 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 app/src/main/res/menu/bottom_nav.xml delete mode 100644 app/src/main/res/menu/layout_nav.xml diff --git a/app/src/main/java/com/example/votingapp/DashboardActivity.java b/app/src/main/java/com/example/votingapp/DashboardActivity.java index 75aab42..eb581e8 100644 --- a/app/src/main/java/com/example/votingapp/DashboardActivity.java +++ b/app/src/main/java/com/example/votingapp/DashboardActivity.java @@ -1,6 +1,8 @@ package com.example.votingapp; import androidx.appcompat.app.AppCompatActivity; + +import android.annotation.SuppressLint; import android.os.Bundle; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; @@ -17,19 +19,19 @@ protected void onCreate(Bundle savedInstanceState) { getSupportActionBar().hide(); setContentView(R.layout.activity_dashboard); - bottomNavigationView = findViewById(R.id.bottom_navigation); + bottomNavigationView = findViewById(R.id.bottom_navigation_view); bottomNavigationView.setOnNavigationItemSelectedListener(item -> { switch (item.getItemId()) { - case R.id.home_screen: + case R.id.homeFragment: loadFragment(new HomeFragment()); return true; - case R.id.candidate_list: + case R.id.candidateListFragment: loadFragment(new CandidateListFragment()); return true; - case R.id.election_list: + case R.id.electionListFragment: loadFragment(new ElectionListFragment()); return true; - case R.id.dashboard: + case R.id.dashboardFragment: loadFragment(new DashboardFragment()); return true; default: @@ -43,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) { private void loadFragment(Fragment fragment) { FragmentManager fragmentManager = getSupportFragmentManager(); FragmentTransaction transaction = fragmentManager.beginTransaction(); - transaction.replace(R.id.fragment_holder, fragment); + transaction.replace(R.id.nav_fragment, fragment); transaction.addToBackStack(null); transaction.commit(); } diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml index fc0a76f..920b252 100644 --- a/app/src/main/res/layout/activity_dashboard.xml +++ b/app/src/main/res/layout/activity_dashboard.xml @@ -6,24 +6,28 @@ android:layout_height="match_parent" tools:context=".DashboardActivity"> + + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@+id/bottom_navigation_view" /> + - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:itemIconTint="@color/white" + app:menu="@menu/bottom_nav"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 211887a..275f775 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -69,41 +69,37 @@ android:id="@+id/kedarDashboard" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="86dp" + android:layout_marginStart="15dp" android:layout_marginTop="20dp" - android:layout_marginEnd="139dp" - android:layout_marginBottom="600dp" + android:layout_marginEnd="180dp" + android:layout_marginBottom="2dp" android:text="@string/kedar" android:textColor="#000000" android:textFontWeight="800" android:textSize="18sp" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/timePeriod" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/constLayoutDashboard" - app:layout_constraintVertical_bias="0.0" /> + app:layout_constraintStart_toEndOf="@+id/circleDashboard" + app:layout_constraintTop_toBottomOf="@+id/constLayoutDashboard" /> + app:layout_constraintStart_toEndOf="@+id/circleDashboard" + app:layout_constraintTop_toBottomOf="@+id/kedarDashboard" /> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/layout_nav.xml b/app/src/main/res/menu/layout_nav.xml deleted file mode 100644 index 1c740cf..0000000 --- a/app/src/main/res/menu/layout_nav.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - \ No newline at end of file From 280cd7ee7ad60d6a779e15a9a9c383af7c49b819 Mon Sep 17 00:00:00 2001 From: Tushant Date: Sat, 4 Nov 2023 05:14:06 +0530 Subject: [PATCH 2/3] Updated the Verification_page.java --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 6 +- .../example/votingapp/Verification_page.java | 72 ++++++++----------- 3 files changed, 34 insertions(+), 48 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 63f2fb8..8d55521 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,10 +28,12 @@ android { } dependencies { - + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.navigation:navigation-fragment:2.7.4' + implementation 'androidx.navigation:navigation-ui:2.7.4' testImplementation 'junit:junit:4.13.2' implementation 'io.github.chaosleung:pinview:1.4.4' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2530f21..4e6b714 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,14 +15,10 @@ tools:targetApi="31" > - - @@ -30,6 +26,8 @@ android:name=".Verification_page" android:exported="true" android:windowSoftInputMode="adjustResize" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/example/votingapp/Verification_page.java b/app/src/main/java/com/example/votingapp/Verification_page.java index d5da905..47d7880 100644 --- a/app/src/main/java/com/example/votingapp/Verification_page.java +++ b/app/src/main/java/com/example/votingapp/Verification_page.java @@ -18,74 +18,60 @@ public class Verification_page extends AppCompatActivity { PinView pinView; - Button button; - + Button verifyButton; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_verification_page); - - Intent intent=getIntent(); + Intent intent = getIntent(); getSupportActionBar().hide(); - - pinView=findViewById(R.id.pinView); - button=findViewById(R.id.button1); + pinView = findViewById(R.id.pinView); + verifyButton = findViewById(R.id.button1); pinView.requestFocus(); - InputMethodManager inputMethodManager=(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,InputMethodManager.HIDE_IMPLICIT_ONLY); + InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY); + + verifyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showDialog(); + } + }); pinView.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { - } @Override public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { - if(charSequence.toString().length()==6 ){ - button.setOnClickListener(this::btn_click); - - } - else{ - button.setOnClickListener(this::show); - } - - - + // Remove showDialog() call here } - private void btn_click(View view) { - click(view); - } - private void show(View view){ - Toast.makeText(Verification_page.this, "Please enter the pin", Toast.LENGTH_SHORT).show(); - } - - @Override - public void afterTextChanged(Editable editable){ - - + public void afterTextChanged(Editable editable) { } - - }); - - } - private void click(View view) { - Dialog dialog=new Dialog(this); + private void showDialog() { + Dialog dialog = new Dialog(this); dialog.setContentView(R.layout.custom_dialog); - dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT); + Button button1 = dialog.findViewById(R.id.button); // Use dialog's view + button1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + navigate(); + } + }); + dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); dialog.setCancelable(true); dialog.show(); } - - - - - + private void navigate() { + Intent intent = new Intent(this, DashboardActivity.class); + startActivity(intent); + } } \ No newline at end of file From 6725e1cb215b4e04aefbf1d05a5a89aa8ae577a8 Mon Sep 17 00:00:00 2001 From: Tushant Date: Sat, 4 Nov 2023 05:16:09 +0530 Subject: [PATCH 3/3] Updated the AndroidManifest.xml --- app/src/main/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4e6b714..4b9120d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,7 +27,6 @@ android:exported="true" android:windowSoftInputMode="adjustResize" /> - \ No newline at end of file