From 24c59ec1fca1a5d1470119a02d62073fae1b6a57 Mon Sep 17 00:00:00 2001 From: nosipho legodi Date: Tue, 16 May 2023 12:50:45 +0200 Subject: [PATCH 1/2] The institution routing has been added. --- app/src/main/AndroidManifest.xml | 7 ++- .../com/example/project1/DashboardActivity.kt | 12 ++++-- .../example/project1/InsitutionsActivity2.kt | 16 +++++++ .../main/res/layout/activity_insitutions2.xml | 43 +++++++++++++++++++ 4 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/example/project1/InsitutionsActivity2.kt create mode 100644 app/src/main/res/layout/activity_insitutions2.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4e93b98..1dcd7d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,8 +14,11 @@ android:supportsRtl="true" android:theme="@style/Theme.Project1" android:usesCleartextTraffic="true" - tools:targetApi="31"> - + tools:targetApi="31" + android:enableOnBackInvokedCallback="true"> + diff --git a/app/src/main/java/com/example/project1/DashboardActivity.kt b/app/src/main/java/com/example/project1/DashboardActivity.kt index 4ee5256..89fe8d3 100644 --- a/app/src/main/java/com/example/project1/DashboardActivity.kt +++ b/app/src/main/java/com/example/project1/DashboardActivity.kt @@ -4,10 +4,12 @@ import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.widget.Button +import android.widget.ImageView import android.widget.TextView class DashboardActivity : AppCompatActivity() { - lateinit var BtnLogout: Button + private lateinit var BtnLogout: Button + private lateinit var institution: ImageView override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -20,8 +22,13 @@ class DashboardActivity : AppCompatActivity() { tvWelcome = this.findViewById(R.id.tvWelcome); tvWelcome.setText(welcomeText); + institution=findViewById(R.id.image_view1) + institution.setOnClickListener { + val intent = Intent(this, InsitutionsActivity2::class.java) + startActivity(intent) + } - BtnLogout=findViewById(R.id.btn_logout) + BtnLogout=findViewById(R.id.btn_logout) BtnLogout.setOnClickListener { val intent = Intent(this, LoginActvity::class.java) startActivity(intent) @@ -31,6 +38,5 @@ class DashboardActivity : AppCompatActivity() { - } } \ No newline at end of file diff --git a/app/src/main/java/com/example/project1/InsitutionsActivity2.kt b/app/src/main/java/com/example/project1/InsitutionsActivity2.kt new file mode 100644 index 0000000..fad337f --- /dev/null +++ b/app/src/main/java/com/example/project1/InsitutionsActivity2.kt @@ -0,0 +1,16 @@ +package com.example.project1 + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.widget.TextView +import android.content.Intent + +class InsitutionsActivity2 : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_insitutions2) + + + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_insitutions2.xml b/app/src/main/res/layout/activity_insitutions2.xml new file mode 100644 index 0000000..2fa33ea --- /dev/null +++ b/app/src/main/res/layout/activity_insitutions2.xml @@ -0,0 +1,43 @@ + + + + + + + + \ No newline at end of file From b2fe0b6779dc019754a1ee50bcbbe8bdd9e95466 Mon Sep 17 00:00:00 2001 From: nosipho legodi Date: Tue, 16 May 2023 16:27:19 +0200 Subject: [PATCH 2/2] The institution routing has been added. The institution names has been added --- app/src/main/AndroidManifest.xml | 1 + .../example/project1/InsitutionsActivity2.kt | 76 +++++- .../main/res/layout/activity_insitutions2.xml | 249 +++++++++++++++++- app/src/main/res/values/strings.xml | 17 ++ 4 files changed, 336 insertions(+), 7 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1dcd7d0..e95aaae 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ + diff --git a/app/src/main/java/com/example/project1/InsitutionsActivity2.kt b/app/src/main/java/com/example/project1/InsitutionsActivity2.kt index fad337f..fc7d09d 100644 --- a/app/src/main/java/com/example/project1/InsitutionsActivity2.kt +++ b/app/src/main/java/com/example/project1/InsitutionsActivity2.kt @@ -1,16 +1,90 @@ package com.example.project1 +import android.content.Intent +import android.graphics.Color import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.text.method.LinkMovementMethod import android.widget.TextView -import android.content.Intent +import android.widget.Button class InsitutionsActivity2 : AppCompatActivity() { + private lateinit var BtnLogout: Button override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_insitutions2) + setupHyperlink() + } + fun setupHyperlink() { + val linkTextView = findViewById(R.id.uj) + linkTextView.setMovementMethod(LinkMovementMethod.getInstance()); + linkTextView.setLinkTextColor(Color.BLUE) + + val unizulu = findViewById(R.id.unizulu) + unizulu.setMovementMethod(LinkMovementMethod.getInstance()); + unizulu.setLinkTextColor(Color.BLUE) + + val wits = findViewById(R.id.wits) + wits.setMovementMethod(LinkMovementMethod.getInstance()); + wits.setLinkTextColor(Color.BLUE) + + val tut = findViewById(R.id.tut) + tut.setMovementMethod(LinkMovementMethod.getInstance()); + tut.setLinkTextColor(Color.BLUE) + + val sbu = findViewById(R.id.sbu) + sbu.setMovementMethod(LinkMovementMethod.getInstance()); + sbu.setLinkTextColor(Color.BLUE) + + val ul = findViewById(R.id.ul) + ul.setMovementMethod(LinkMovementMethod.getInstance()); + ul.setLinkTextColor(Color.BLUE) + + val uwc = findViewById(R.id.uwc) + uwc.setMovementMethod(LinkMovementMethod.getInstance()); + uwc.setLinkTextColor(Color.BLUE) + + val nwu = findViewById(R.id.nwu) + nwu.setMovementMethod(LinkMovementMethod.getInstance()); + nwu.setLinkTextColor(Color.BLUE) + + val unisa= findViewById(R.id.unisa) + unisa.setMovementMethod(LinkMovementMethod.getInstance()); + unisa.setLinkTextColor(Color.BLUE) + + val uct = findViewById(R.id.uct) + uct.setMovementMethod(LinkMovementMethod.getInstance()); + uct.setLinkTextColor(Color.BLUE) + + val ru = findViewById(R.id.ru) + ru.setMovementMethod(LinkMovementMethod.getInstance()); + ru.setLinkTextColor(Color.BLUE) + + val up = findViewById(R.id.up) + up.setMovementMethod(LinkMovementMethod.getInstance()); + up.setLinkTextColor(Color.BLUE) + + val ufs = findViewById(R.id.ufs) + ufs.setMovementMethod(LinkMovementMethod.getInstance()); + ufs.setLinkTextColor(Color.BLUE) + + val nmmu = findViewById(R.id.nmmu) + nmmu.setMovementMethod(LinkMovementMethod.getInstance()); + nmmu.setLinkTextColor(Color.BLUE) + + val cput = findViewById(R.id.cput) + cput.setMovementMethod(LinkMovementMethod.getInstance()); + cput.setLinkTextColor(Color.BLUE) + val ukzn = findViewById(R.id.ukzn) + ukzn.setMovementMethod(LinkMovementMethod.getInstance()); + ukzn.setLinkTextColor(Color.BLUE) + BtnLogout=findViewById(R.id.btn_logout) + BtnLogout.setOnClickListener { + val intent = Intent(this, DashboardActivity::class.java) + startActivity(intent) + } } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_insitutions2.xml b/app/src/main/res/layout/activity_insitutions2.xml index 2fa33ea..1eadbf1 100644 --- a/app/src/main/res/layout/activity_insitutions2.xml +++ b/app/src/main/res/layout/activity_insitutions2.xml @@ -23,21 +23,258 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.026" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +