Skip to content

Krishna Vemulavada / vera_2.1_app

Go to a project
Commit c5ee77ec by Simhachalam ch
Options

adal init

parents 7cd8ff8b 0a22e23d
Expand all
Inline Side-by-side
Showing with 29 additions and 27 deletions
app/src/main/AndroidManifest.xml
...@@ -41,6 +41,14 @@ ...@@ -41,6 +41,14 @@
android:name=".ui.LoginScreen" android:name=".ui.LoginScreen"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize|stateHidden" /> android:windowSoftInputMode="adjustResize|stateHidden" />
<activity
android:name=".ui.LoginChooseActivity"
android:screenOrientation="portrait"
/> <activity
android:name=".ui.ADALActivity"
android:screenOrientation="portrait"
/>
<activity android:name=".ui.ResetPasswordActivity" <activity android:name=".ui.ResetPasswordActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
......
app/src/main/java/com/vsoft/vera/ui/ADALActivity.java
...@@ -100,8 +100,8 @@ public class ADALActivity extends AppCompatActivity { ...@@ -100,8 +100,8 @@ public class ADALActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.adal_main); setContentView(R.layout.adal_main);
// callGraphButton = (Button) findViewById(R.id.callGraph); callGraphButton = (Button) findViewById(R.id.callGraph);
// signOutButton = (Button) findViewById(R.id.clearCache); signOutButton = (Button) findViewById(R.id.clearCache);
callGraphButton.setOnClickListener(new View.OnClickListener() { callGraphButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
......
app/src/main/java/com/vsoft/vera/ui/SplashScreen.java
...@@ -49,7 +49,7 @@ public class SplashScreen extends Activity { ...@@ -49,7 +49,7 @@ public class SplashScreen extends Activity {
public void run() { public void run() {
// This method will be executed once the timer is over // This method will be executed once the timer is over
// Start your app main activity // Start your app main activity
Intent i = new Intent(SplashScreen.this, LoginScreen.class); Intent i = new Intent(SplashScreen.this, LoginChooseActivity.class);
startActivity(i); startActivity(i);
// close this activity // close this activity
......
app/src/main/res/layout/activity_login.xml
...@@ -14,43 +14,37 @@ ...@@ -14,43 +14,37 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="visible"
android:background="@drawable/ic_login_banner" /> android:background="@drawable/ic_login_banner" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="50dp" android:layout_marginTop="100dp"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<EditText
android:id="@+id/login_screen_username_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/extra_large_margin"
android:layout_marginRight="@dimen/extra_large_margin"
android:background="@drawable/username_under_bg_box"
android:drawableLeft="@mipmap/ic_user_icon"
android:hint="@string/username_string"
android:lines="1"
android:padding="@dimen/normal_margin"
android:singleLine="true" />
<EditText
android:id="@+id/login_screen_password_edit_text" <TextView
android:id="@+id/login_with_sso"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/normal_margin"
android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginLeft="@dimen/extra_large_margin"
android:layout_marginRight="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin"
android:background="@drawable/username_under_bg_box" android:layout_marginTop="30dp"
android:drawableLeft="@mipmap/ic_password_icon" android:background="@drawable/login_bg"
android:hint="@string/password_string" android:gravity="center"
android:inputType="textPassword" android:paddingBottom="@dimen/normal_margin"
android:lines="1" android:paddingTop="@dimen/normal_margin"
android:padding="@dimen/normal_margin" android:text="Login with ADAL"
android:singleLine="true" /> android:textColor="@android:color/white"
android:textSize="@dimen/large_text_size" />
<TextView <TextView
android:id="@+id/login_screen_login_text_view" android:id="@+id/login_with_otp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/normal_margin" android:layout_marginBottom="@dimen/normal_margin"
...@@ -61,7 +55,7 @@ ...@@ -61,7 +55,7 @@
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/normal_margin" android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/login_screen_login_string" android:text="Login with otp"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/large_text_size" /> android:textSize="@dimen/large_text_size" />
</LinearLayout> </LinearLayout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment