changed back to vera theme

app/src/main/java/com/vsoft/vera/ui/LoginScreen.java

@@ -178,18 +178,6 @@ public class LoginScreen extends Activity {
         }
         }
     }
     }
 
 
-    @OnClick({R.id.login_screen_login_text_view,R.id.login_screen_login_text_view_twillio})
-    void onLoginClicked(View mView) {
-
-        if(mView.getId()==R.id.login_screen_login_text_view){
-            callLoginAPI(false);
-        }else if(mView.getId()==R.id.login_screen_login_text_view_twillio){
-            callLoginAPI(true);
-        }
-
-
-    }
-
 
 
     private void launchOptValidationScreen(){
     private void launchOptValidationScreen(){
 
 

app/src/main/java/com/vsoft/vera/ui/SplashScreen.java

@@ -10,6 +10,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Log;
 import android.view.Window;
 import android.view.Window;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 
 
 import com.androidquery.AQuery;
 import com.androidquery.AQuery;
@@ -39,24 +40,26 @@ public class SplashScreen extends Activity {
 
 
 	// Splash screen timer
 	// Splash screen timer
 	private static int SPLASH_TIME_OUT = 3000;
 	private static int SPLASH_TIME_OUT = 3000;
-	private  LinearLayout mainLayt;
 
 
 	@Override
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 	protected void onCreate(Bundle savedInstanceState) {
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub
 		super.onCreate(savedInstanceState);
 		super.onCreate(savedInstanceState);
 
 
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		setContentView(R.layout.splash_screen);
+
 		AppCenter.start(getApplication(), "f7408b15-e0d4-4157-ab67-8bb5ba833bdb", Analytics.class,
 		AppCenter.start(getApplication(), "f7408b15-e0d4-4157-ab67-8bb5ba833bdb", Analytics.class,
 				 Crashes.class);
 				 Crashes.class);
 
 
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		setContentView(R.layout.splash_screen);
-		mainLayt = (LinearLayout) findViewById(R.id.splash_main_lyt);
-		Glide.with(this).load(R.drawable.splash_screen_bg).into(new SimpleTarget<Drawable>() {
+
+
+		final ImageView splashImageView = (ImageView) findViewById(R.id.splash_image);
+		Glide.with(this).load(R.drawable.logo_splash).into(new SimpleTarget<Drawable>() {
 			@Override
 			@Override
 			public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
 			public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-					mainLayt.setBackground(resource);
+					splashImageView.setBackground(resource);
 				}
 				}
 			}
 			}
 		});
 		});
@@ -73,7 +76,7 @@ public class SplashScreen extends Activity {
 			startActivity(new Intent(SplashScreen.this, HomeScreen.class));
 			startActivity(new Intent(SplashScreen.this, HomeScreen.class));
 
 
 		}else{
 		}else{
-			startActivity(new Intent(SplashScreen.this, ADALActivity.class));
+			startActivity(new Intent(SplashScreen.this, LoginScreen.class));
 		}
 		}
 	}
 	}
 	private void startThread() {
 	private void startThread() {

app/src/vportal/res/layout/activity_login_view.xml

@@ -107,24 +107,7 @@
                 android:text="@string/login_screen_login_string"
                 android:text="@string/login_screen_login_string"
                 android:textColor="@android:color/white"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/large_text_size" />
                 android:textSize="@dimen/large_text_size" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" android:text="(or)" android:gravity="center" android:textSize="30dp" android:textStyle="bold"/>
-            <TextView
-                android:id="@+id/login_screen_login_text_view_twillio"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/normal_margin"
-                android:layout_marginLeft="@dimen/extra_large_margin"
-                android:layout_marginRight="@dimen/extra_large_margin"
-                android:layout_marginTop="30dp"
-                android:background="@drawable/login_bg"
-                android:gravity="center"
-                android:paddingBottom="@dimen/normal_margin"
-                android:paddingTop="@dimen/normal_margin"
-                android:text="@string/login_screen_login_string_twillio"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/large_text_size" />
+
         </LinearLayout>
         </LinearLayout>
     </LinearLayout>
     </LinearLayout>
 </ScrollView>
 </ScrollView>
\ No newline at end of file

app/src/vportal/res/layout/splash_screen.xml

@@ -4,7 +4,15 @@
 	android:layout_height="match_parent"
 	android:layout_height="match_parent"
 	android:id="@+id/splash_main_lyt"
 	android:id="@+id/splash_main_lyt"
 	android:layout_gravity="center"
 	android:layout_gravity="center"
+	android:background="#000"
 	android:orientation="vertical">
 	android:orientation="vertical">
 
 
+	<ImageView
+		android:id="@+id/splash_image"
+		android:layout_gravity="center"
+		android:layout_width="200dp"
+		android:layout_height="150dp"
+
+		/>
 
 
 </LinearLayout>
 </LinearLayout>
\ No newline at end of file