Merge branch 'tirth5828:master' into master

ani14kay · Oct 16, 2021 · 64c0682 · 64c0682
2 parents 03980ec + 1478e12
commit 64c0682
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/app/src/main/java/com/example/us_2_0/LandingPage.java b/app/src/main/java/com/example/us_2_0/LandingPage.java
@@ -14,6 +14,7 @@
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.method.LinkMovementMethod;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -29,6 +30,7 @@
 public class LandingPage extends AppCompatActivity {
 
     private ActionBarDrawerToggle actionBarDrawerToggle;
+    TextView textView;
 
 
     @RequiresApi(api = Build.VERSION_CODES.O)
@@ -37,6 +39,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_landing_page);
 
+        textView = findViewById(R.id.textView12);
+        textView.setMovementMethod(LinkMovementMethod.getInstance());
 
 
 
@@ -127,8 +131,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater menuInflater = getMenuInflater();
         menuInflater.inflate(R.menu.action_bar_menu,menu);
         return super.onCreateOptionsMenu(menu);
-    }
 
+
+    }
 }
 
 
diff --git a/app/src/main/res/layout/activity_landing_page.xml b/app/src/main/res/layout/activity_landing_page.xml
@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#5BB4BA"
+        android:background="#000000"
         android:orientation="vertical">
 
         <androidx.appcompat.widget.Toolbar
@@ -27,6 +27,29 @@
 
             />
 
+        <TextView
+            android:id="@+id/textView12"
+            android:layout_width="match_parent"
+            android:layout_height="207dp"
+            android:foregroundGravity="bottom|center"
+            android:gravity="bottom|center"
+            android:text="@string/Now"
+            android:textAllCaps="true"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp" />
+
+        <TextView
+            android:id="@+id/textView13"
+            android:layout_width="match_parent"
+            android:layout_height="207dp"
+            android:foregroundGravity="bottom|center"
+            android:gravity="bottom|center"
+            android:text="@string/Next"
+            android:textAllCaps="true"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"/>
+
+
     </LinearLayout>
 
     <com.google.android.material.navigation.NavigationView

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -9,22 +9,22 @@
 
     <com.spark.submitbutton.SubmitButton
 
-        android:text="Login"
-        android:textColor="@color/gray"
-        android:layout_height="50sp"
         android:layout_width="match_parent"
+        android:layout_height="50sp"
         android:onClick="Log"
+        android:text="Login"
+        android:textColor="@color/gray"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.959"
+        app:layout_constraintVertical_bias="0.954"
         app:sub_btn_background="@color/white"
         app:sub_btn_duration="3000"
         app:sub_btn_line_color="@color/black"
         app:sub_btn_ripple_color="#0000FF"
-        app:sub_btn_tick_color="@color/white"
-        />
+        app:sub_btn_tick_color="@color/white" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,4 +3,6 @@
     <string name="drawer_open">Drawer Open</string>
     <string name="drawer_close">Drawer Close</string>
     <string name="N1">Changed</string>
+    <string name="Now"><a href="https://meet.google.com/vdt-gysa-bxs">Now -  CS201 Class</a></string>
+    <string name="Next"><a href="https://meet.google.com/cso-hyuj-xuq">Next -  MA201 Class</a></string>
 </resources>