set changes

ACM-student-chapter-UOM · Jun 20, 2020 · f3db33f · f3db33f
1 parent c2cf766
commit f3db33f
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 49 deletions.
diff --git a/mobile-app/.idea/misc.xml b/mobile-app/.idea/misc.xml
diff --git a/mobile-app/app/src/main/java/com/example/acmcovidapplication/Home.java b/mobile-app/app/src/main/java/com/example/acmcovidapplication/Home.java
@@ -26,10 +26,16 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
-    public void goToLogin(View view) {
-        Intent intent = new Intent(Home.this, login.class);
+    public void goToNext(View view) {
+        Intent intent = new Intent(Home.this, how_it_works.class);
         startActivity(intent);
+
     }
 
 
+    public void skip(View view) {
+        Intent intent = new Intent(Home.this, start_page.class);
+        startActivity(intent);
+    }
+
 }
diff --git a/mobile-app/app/src/main/java/com/example/acmcovidapplication/MainActivity.java b/mobile-app/app/src/main/java/com/example/acmcovidapplication/MainActivity.java
@@ -70,16 +70,6 @@ public void run() {
     }
 
 
-    public void goToNext(View view) {
-        Intent intent = new Intent(MainActivity.this, how_it_works.class);
-        startActivity(intent);
 
-    }
-
-
-    public void skip(View view) {
-        Intent intent = new Intent(MainActivity.this, start_page.class);
-        startActivity(intent);
-    }
 }
 
diff --git a/mobile-app/app/src/main/java/com/example/acmcovidapplication/appPermission.java b/mobile-app/app/src/main/java/com/example/acmcovidapplication/appPermission.java
@@ -60,7 +60,7 @@ public void allowAccess(View view) {
     @Override
     protected void onResume() {
         super.onResume();
-        allowButton.setEnabled(EasyPermissions.hasPermissions(this, permissions));
+        //allowButton.setEnabled(EasyPermissions.hasPermissions(this, permissions));
     }
 
     public void goToAbout(View view) {
@@ -79,7 +79,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     @Override
     public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
         String[] permissions = Util.getPermissions();
-        allowButton.setEnabled(EasyPermissions.hasPermissions(this, permissions));
+        //allowButton.setEnabled(EasyPermissions.hasPermissions(this, permissions));
         Button btn=findViewById(R.id.final_btn);
         Animation animFadeIn = AnimationUtils.loadAnimation(getApplicationContext(),R.anim.fade_in);
         btn.startAnimation(animFadeIn);

diff --git a/mobile-app/app/src/main/res/drawable/light_blue_round_background.xml b/mobile-app/app/src/main/res/drawable/light_blue_round_background.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="#6680D8FF"/>
-            <stroke android:color="#fff" android:width="2dp" />
+            <solid android:color="#B5CBD5"/>
+            <stroke android:color="@android:color/transparent" android:width="2dp" />
             <!--corners allow us to make the rounded corners button-->
             <corners android:radius="15dp" />
         </shape>

diff --git a/mobile-app/app/src/main/res/drawable/square_background.xml b/mobile-app/app/src/main/res/drawable/square_background.xml
@@ -1,4 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@android:color/white" />
-    <stroke android:width="1dip" android:color="#4fa5d5"/>
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dip" android:color="@android:color/transparent"/>
 </shape>
diff --git a/mobile-app/app/src/main/res/drawable/transparent_light_curved.xml b/mobile-app/app/src/main/res/drawable/transparent_light_curved.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="#ffffff"/>
-            <stroke android:color="@color/colorAccent" android:width="2dp" />
+            <solid android:color="@android:color/transparent"/>
+            <stroke android:color="@color/colorPrimaryDark" android:width="2dp" />
             <!--corners allow us to make the rounded corners button-->
             <corners android:radius="15dp" />
         </shape>

diff --git a/mobile-app/app/src/main/res/layout/activity_about.xml b/mobile-app/app/src/main/res/layout/activity_about.xml
@@ -105,12 +105,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginHorizontal="8dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginHorizontal="30dp"
         android:layout_marginBottom="30dp"
+        android:layout_marginTop="10dp"
         android:background="@drawable/round_button"
-        android:text="back"
-        android:textColor="#ffffff"/>
+        android:text="Back"
+        android:textColor="#ffffff" />
 
 </RelativeLayout>
diff --git a/mobile-app/app/src/main/res/layout/activity_login.xml b/mobile-app/app/src/main/res/layout/activity_login.xml
@@ -126,13 +126,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginHorizontal="8dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginHorizontal="30dp"
         android:layout_marginBottom="30dp"
+        android:layout_marginTop="10dp"
         android:background="@drawable/round_button"
         android:onClick="OTPEnter"
-        android:text="@string/login_2_btn"
+        android:text="Join goSAFE"
         android:textColor="#ffffff" />
 
 </RelativeLayout>
diff --git a/mobile-app/app/src/main/res/layout/activity_main.xml b/mobile-app/app/src/main/res/layout/activity_main.xml
@@ -17,18 +17,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="50dp"
+        android:layout_marginBottom="50dp"
         android:gravity="center"
         android:layout_alignParentBottom="true">
         <ImageView
             android:id="@+id/img"
             android:layout_width="40dp"
+            android:layout_centerVertical="true"
             android:layout_height="40dp"
             android:src="@drawable/acm" />
         <LinearLayout
             android:layout_toEndOf="@+id/img"
             android:layout_marginHorizontal="10dp"
             android:layout_width="wrap_content"
+            android:layout_centerVertical="true"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:orientation="vertical"

diff --git a/mobile-app/app/src/main/res/layout/activity_permission_list.xml b/mobile-app/app/src/main/res/layout/activity_permission_list.xml
@@ -183,18 +183,16 @@
             android:textColor="@color/colorPrimaryDark"></TextView>
     </LinearLayout>
     </ScrollView>
-        <Button
-            android:id="@+id/final_btn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="8dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="30dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/round_button"
-            android:onClick="goToShare"
-            android:text="Share This App"
-            android:textColor="#ffffff" />
+    <Button
+        android:id="@+id/final_btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginHorizontal="30dp"
+        android:layout_marginBottom="30dp"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/round_button"
+        android:onClick="goToShare"
+        android:text="Share this app"
+        android:textColor="#ffffff" />
 </RelativeLayout>
diff --git a/mobile-app/app/src/main/res/layout/activity_share.xml b/mobile-app/app/src/main/res/layout/activity_share.xml
@@ -98,13 +98,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginHorizontal="8dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginHorizontal="30dp"
         android:layout_marginBottom="30dp"
+        android:layout_marginTop="10dp"
         android:background="@drawable/round_button"
         android:onClick="shareApp"
-        android:text="share this application"
+        android:text="Join goSAFE"
         android:textColor="#ffffff" />
 
 </RelativeLayout>