Added splash screen, started app intro

Lots of small changes due to renaming colors
Improved Login activity, better UI spacing, ability to skip in intro
Improved language changing and tested, change language in settings then restart activty
Logout moved to user info

app/src/main/AndroidManifest.xml

@@ -20,36 +20,51 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:screenOrientation="portrait"
         android:theme="@style/AppThemeLight">
+
         <activity
-            android:name=".core.SettingsActivity"
-            android:configChanges="layoutDirection|locale"
-            android:label=""
-            android:parentActivityName=".core.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="ch.amiv.android_app.core.MainActivity" />
-        </activity>
-        <activity
-            android:name=".core.MainActivity"
-            android:configChanges="keyboardHidden|orientation|layoutDirection|screenSize|locale"
+            android:name=".core.SplashActivity"
+            android:theme="@style/SplashTheme"
             android:label="@string/app_name"
-            android:theme="@style/AppThemeLight"
-            android:windowSoftInputMode="adjustNothing">
+            android:noHistory="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".core.MainActivity"
+            android:configChanges="keyboardHidden|orientation|layoutDirection|screenSize|locale"
+            android:theme="@style/AppThemeLight"
+            android:windowSoftInputMode="adjustNothing">
+        </activity>
+
         <activity
             android:name=".core.LoginActivity"
             android:configChanges="keyboardHidden|orientation|layoutDirection|screenSize|locale"
+            android:label="">
+            <!--android:windowSoftInputMode="stateVisible"  use this to make the keyboard show when the activity is started-->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="ch.amiv.android_app.core.MainActivity" />
+        </activity>
+
+        <activity
+            android:name=".core.IntroActivity"
+            android:screenOrientation="portrait"
+            android:configChanges="locale" />
+
+        <activity
+            android:name=".core.SettingsActivity"
+            android:configChanges="layoutDirection|locale"
             android:label=""
-            android:windowSoftInputMode="stateVisible">
+            android:parentActivityName=".core.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="ch.amiv.android_app.core.MainActivity" />
         </activity>
+
         <activity
             android:name=".events.EventDetailActivity"
             android:configChanges="orientation|layoutDirection|locale"
@@ -58,6 +73,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="ch.amiv.android_app.core.MainActivity" />
         </activity>
+
         <activity
             android:name=".jobs.JobDetailActivity"
             android:configChanges="orientation|layoutDirection|locale"
@@ -66,18 +82,20 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="ch.amiv.android_app.core.MainActivity" />
         </activity>
+
         <activity
             android:name=".checkin.BarcodeIdActivity"
             android:configChanges="layoutDirection|locale"
             android:parentActivityName=".core.MainActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
 
         <!-- Checkin -->
         <activity
             android:name=".checkin.MainActivity"
             android:label="@string/app_name_checkin"
             android:screenOrientation="portrait"
-            android:theme="@style/CheckinTheme"></activity>
+            android:theme="@style/CheckinTheme" />
+
         <activity
             android:name=".checkin.ScanActivity"
             android:label="@string/app_name_checkin"
@@ -87,6 +105,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".checkin.MainActivity" />
         </activity>
+
         <activity
             android:name=".checkin.SettingsActivity"
             android:label="@string/app_name_checkin"
@@ -96,6 +115,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".checkin.MainActivity" />
         </activity>
+
         <activity
             android:name=".checkin.MemberListActivity"
             android:label="@string/app_name_checkin"
@@ -111,6 +131,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".checkin.ScanActivity" />
         </activity>
+
         <activity
             android:name=".checkin.SearchMembersActivity"
             android:label="@string/app_name_checkin"
@@ -119,14 +140,13 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".checkin.MemberListActivity" />
         </activity>
-        
+
         <!-- Demo -->
-        <activity android:name=".demo.MainActivity"
+        <activity
+            android:name=".demo.MainActivity"
             android:configChanges="layoutDirection|locale"
             android:parentActivityName=".core.MainActivity"
-            android:screenOrientation="portrait">
-            
-        </activity>
-    </application>
+            android:screenOrientation="portrait" />
 
+    </application>
 </manifest>
\ No newline at end of file

app/src/main/java/ch/amiv/android_app/checkin/ScanActivity.java

@@ -329,7 +329,7 @@ public class ScanActivity extends AppCompatActivity {
             mTickImage.setVisibility(View.VISIBLE);
             mBGTint.setVisibility(View.VISIBLE);
             mTickImage.startAnimation(AnimationUtils.loadAnimation(this, R.anim.item_anim_grow));
-            mTickImage.setColorFilter(getResources().getColor(R.color.colorValid));
+            mTickImage.setColorFilter(getResources().getColor(R.color.valid));
 
             if(EventDatabase.instance.eventData.eventType == EventData.EventType.Counter) {
                 mCheckinCountLabel.setVisibility(View.VISIBLE);
@@ -342,13 +342,13 @@ public class ScanActivity extends AppCompatActivity {
 
             if(member.membership.equalsIgnoreCase("regular"))
             {
-                mTickImage.setColorFilter(getResources().getColor(R.color.colorValid));
-                mBGTint.setColorFilter(getResources().getColor(R.color.colorValid));
+                mTickImage.setColorFilter(getResources().getColor(R.color.valid));
+                mBGTint.setColorFilter(getResources().getColor(R.color.valid));
             }
             else
             {
-                mTickImage.setColorFilter(getResources().getColor(R.color.colorOrange));
-                mBGTint.setColorFilter(getResources().getColor(R.color.colorOrange));
+                mTickImage.setColorFilter(getResources().getColor(R.color.orange));
+                mBGTint.setColorFilter(getResources().getColor(R.color.orange));
             }
 
             Settings.Vibrate(Settings.VibrateTime.NORMAL, getApplicationContext());
@@ -369,20 +369,20 @@ public class ScanActivity extends AppCompatActivity {
             mResponseLabel.setVisibility(View.VISIBLE);
             mResponseLabel.setText(responseText);
             mTickImage.setVisibility(View.VISIBLE);
-            mTickImage.setColorFilter(getResources().getColor(R.color.colorValid));
+            mTickImage.setColorFilter(getResources().getColor(R.color.valid));
             mTickImage.startAnimation(AnimationUtils.loadAnimation(this, R.anim.item_anim_grow));
             mBGTint.setVisibility(View.VISIBLE);
 
 
             if(responseText.substring(0, 12).equalsIgnoreCase("regular"))
             {
-                mTickImage.setColorFilter(getResources().getColor(R.color.colorValid));
-                mBGTint.setColorFilter(getResources().getColor(R.color.colorValid));
+                mTickImage.setColorFilter(getResources().getColor(R.color.valid));
+                mBGTint.setColorFilter(getResources().getColor(R.color.valid));
             }
             else
             {
-                mTickImage.setColorFilter(getResources().getColor(R.color.colorOrange));
-                mBGTint.setColorFilter(getResources().getColor(R.color.colorOrange));
+                mTickImage.setColorFilter(getResources().getColor(R.color.orange));
+                mBGTint.setColorFilter(getResources().getColor(R.color.orange));
             }
 
             Settings.Vibrate(Settings.VibrateTime.NORMAL, getApplicationContext());
@@ -394,7 +394,7 @@ public class ScanActivity extends AppCompatActivity {
             mCrossImage.setVisibility(View.VISIBLE);
             mCrossImage.startAnimation(AnimationUtils.loadAnimation(this, R.anim.item_anim_grow));
             mBGTint.setVisibility(View.VISIBLE);
-            mBGTint.setColorFilter(getResources().getColor(R.color.colorInvalid));
+            mBGTint.setColorFilter(getResources().getColor(R.color.invalid));
         }
         else
         {                  //invalid legi/already checked in etc
@@ -403,7 +403,7 @@ public class ScanActivity extends AppCompatActivity {
             mCrossImage.setVisibility(View.VISIBLE);
             mCrossImage.startAnimation(AnimationUtils.loadAnimation(this, R.anim.item_anim_grow));
             mBGTint.setVisibility(View.VISIBLE);
-            mBGTint.setColorFilter(getResources().getColor(R.color.colorInvalid));
+            mBGTint.setColorFilter(getResources().getColor(R.color.invalid));
 
             Settings.Vibrate(Settings.VibrateTime.LONG, getApplicationContext());
         }

app/src/main/java/ch/amiv/android_app/core/IntroActivity.java

+package ch.amiv.android_app.core;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import ch.amiv.android_app.R;
+import ch.amiv.android_app.ui.NonSwipeableViewPager;
+
+public class IntroActivity extends AppCompatActivity {
+
+    private NonSwipeableViewPager viewPager;
+    private IntroViewPagerAdapter introViewPagerAdapter;
+    private LinearLayout dotsLayout;
+    private TextView[] dots;
+    private Button btnSkip, btnNext;
+
+    //page configs & layouts
+    private int[] layouts = {
+            R.layout.core_intro_slide_language,
+            R.layout.core_intro_slide_info,
+            R.layout.core_intro_slide_profile,
+            R.layout.core_intro_slide_event_prefs};
+    private boolean[] allowSkip = {false, false, true, false};
+    private int[] nextText = {0, R.string.next, 0, R.string.lets_go};//set to 0 to hide next button
+
+    private boolean hasLoggedIn;    //used when using back after the login page
+    private String langSetIntentKey = "lang_set";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.core_activity_intro);
+
+        viewPager = findViewById(R.id.viewPager);
+        dotsLayout = findViewById(R.id.layoutDots);
+        btnSkip = findViewById(R.id.buttonSkip);
+        btnNext = findViewById(R.id.buttonNext);
+
+        boolean hasSetLang = false;
+        Intent intent = getIntent();
+        if(intent != null)
+            hasSetLang = intent.getBooleanExtra(langSetIntentKey, false);
+
+        //init ui elements
+        introViewPagerAdapter = new IntroViewPagerAdapter();
+        viewPager.setAdapter(introViewPagerAdapter);
+        viewPager.addOnPageChangeListener(viewPagerPageChangeListener);
+        viewPager.setOffscreenPageLimit(0);
+
+        btnSkip.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                NextPage(false);
+            }
+        });
+
+        btnNext.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                NextPage(true);
+            }
+        });
+
+        if(hasSetLang)
+            NextPage(true);
+        else
+            RefreshPageUI(0);
+    }
+
+    @Override
+    public void onBackPressed() {
+        int currentPos = viewPager.getCurrentItem();
+        if(currentPos == 2) {
+            StartLoginActivity(true);
+        }
+        else if(currentPos == 3){
+            if(hasLoggedIn)
+                viewPager.setCurrentItem(2);
+            else
+                StartLoginActivity(true);
+        }
+        else if(currentPos > 0)
+            viewPager.setCurrentItem(currentPos -1);
+
+        //Dont call super.onBackPressed as we will otherwise leave the app
+    }
+
+    /**
+     * Will set the buttons and dots correctly for the page given
+     */
+    private void RefreshPageUI(int currentPage){
+        RefreshPageDots(currentPage);
+
+        btnSkip.setVisibility(allowSkip[currentPage] ? View.VISIBLE : View.INVISIBLE);
+        btnNext.setVisibility(nextText[currentPage] != 0 ? View.VISIBLE : View.INVISIBLE);
+        if(nextText[currentPage] != 0)
+            btnNext.setText(getString(nextText[currentPage]));
+    }
+
+    /**
+     * Will update the page dots at the bottom, to indicate which page we are on. note: the views are deleted and recreated
+     */
+    private void RefreshPageDots(int currentPage) {
+        dots = new TextView[layouts.length +1]; //+1 for login acitivty
+
+        int inactive = ContextCompat.getColor(this, R.color.darkGrey);
+        dotsLayout.removeAllViews();
+        for (int i = 0; i < dots.length; i++) {
+            dots[i] = new TextView(this);
+            dots[i].setText(Html.fromHtml("&#8226;"));
+            dots[i].setTextSize(35);
+            dots[i].setTextColor(inactive);
+            dotsLayout.addView(dots[i]);
+        }
+
+        if (dots.length > 0)//change indexes for login activity
+            dots[currentPage < 2 ? currentPage : currentPage +1].setTextColor(ContextCompat.getColor(this, R.color.lightGrey));
+    }
+
+    private void NextPage(boolean success){
+        int nextPos = viewPager.getCurrentItem() + 1;
+        if (nextPos == 2)//go to login first
+            StartLoginActivity(false);
+        else if (nextPos < layouts.length) {
+            viewPager.setCurrentItem(nextPos);
+        } else {
+            StartMainAcivity();
+        }
+    }
+
+    //  Callbacks for when the page changes to refresh the progress dots
+    ViewPager.OnPageChangeListener viewPagerPageChangeListener = new ViewPager.OnPageChangeListener() {
+
+        @Override
+        public void onPageSelected(int position) {
+            RefreshPageUI(position);
+        }
+
+        @Override
+        public void onPageScrolled(int arg0, float arg1, int arg2) {}
+
+        @Override
+        public void onPageScrollStateChanged(int arg0) {}
+    };
+
+    /**
+     * View pager adapter
+     */
+    public class IntroViewPagerAdapter extends PagerAdapter {
+        private LayoutInflater layoutInflater;
+
+        public IntroViewPagerAdapter() {
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            View view = layoutInflater.inflate(layouts[position], container, false);
+            container.addView(view);
+
+            return view;
+        }
+
+        @Override
+        public int getCount() {
+            return layouts.length;
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object obj) {
+            return view == obj;
+        }
+
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            View view = (View) object;
+            container.removeView(view);
+        }
+    }
+
+    /**
+     * This is called when we return from the login activity
+     */
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if(requestCode == 0) {  //skip the profile page if we are not logged in
+            hasLoggedIn = data.getBooleanExtra("login_success", false);
+            if(hasLoggedIn)
+                hasLoggedIn = Settings.HasToken(getApplicationContext());//check if user is only logged in by mail, or if we have no user profile to edit
+
+            if(resultCode == RESULT_OK)
+                viewPager.setCurrentItem(hasLoggedIn ? 2 : 3);
+            else
+                viewPager.setCurrentItem(1);//means the user canceled using back, show the previous page
+        }
+    }
+
+    private void StartLoginActivity(boolean logoutFirst) {
+        if(logoutFirst)
+            UserInfo.LogoutUser(getApplicationContext());
+        startActivityForResult(new Intent(this, LoginActivity.class), 0);
+    }
+
+    private void StartMainAcivity() {
+        Settings.SetIntroDone(true, this);
+        startActivity(new Intent(this, MainActivity.class));
+        finish();
+    }
+    //endregion
+
+    //region----Functionality specific to a page----
+    //region---Language Page---
+    public void SetLanguageEN(View view){
+        ApplyLanguage(0);
+    }
+
+    public void SetLanguageDE(View view){
+        ApplyLanguage(1);
+    }
+
+    /**
+     * @param langIndex According to the language pref array (pref_lang_list_entries) in strings.xml
+     */
+    private void ApplyLanguage(int langIndex){
+        Settings.SetLanguage(getResources().getStringArray(R.array.pref_lang_list_entries)[langIndex], getApplicationContext());
+
+        //restart activty and set extra to skip language page
+        Intent intent = getIntent();
+        intent.putExtra(langSetIntentKey, true);
+        finish();
+        startActivity(intent);
+    }
+    //endregion
+
+    //region---Profile---
+
+    //endregion
+    //endregion
+}

app/src/main/java/ch/amiv/android_app/core/LoginActivity.java

@@ -34,6 +34,8 @@ import ch.amiv.android_app.R;
  */
 public class LoginActivity extends AppCompatActivity {
 
+    boolean isIntroLogin;
+
     EditText userField;
     EditText passwordField;
     Button submitButton;
@@ -43,15 +45,34 @@ public class LoginActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        isIntroLogin = !Settings.GetIntroDone(this);
+
         //Set for the keyboard to resize the window so the snackbars appear just above the keyboard
         prevLayoutParams = getWindow().getAttributes().softInputMode;
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
         setContentView(R.layout.core_activity_login);
 
+        //Show skip button if this is in the intro
+        Button btnSkip = findViewById(R.id.buttonSkip);
+        if (isIntroLogin) {
+            btnSkip.setVisibility(View.VISIBLE);
+            btnSkip.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    ReturnToCallingActivity(false, false);
+                }
+            });
+        }
+        else {
+            btnSkip.setVisibility(View.GONE);
+        }
+
         //Add the toolbar and back navigation
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        if(getSupportActionBar() != null)//XXX doesnt always work, ensure that the back arrow is visible
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         //Link UI elements to xml
         userField = findViewById(R.id.usernameField);
@@ -87,7 +108,7 @@ public class LoginActivity extends AppCompatActivity {
             UserInfo.SetEmailOnlyLogin(getApplicationContext(), username, false);
             SetSubmitButtonState(false, true);
             Settings.Vibrate(Settings.VibrateTime.NORMAL, getApplicationContext());
-            ReturnToCallingActivity(true);
+            ReturnToCallingActivity(true, false);
         }
 
         //Does a POST request to sessions to create a session and get a token. Does *not* use the OAuth process, see api docs
@@ -105,7 +126,7 @@ public class LoginActivity extends AppCompatActivity {
                             Settings.SetToken(json.getString("token"), getApplicationContext());
                             SetSubmitButtonState(false, true);
                             Settings.Vibrate(Settings.VibrateTime.NORMAL, getApplicationContext());
-                            ReturnToCallingActivity(true);
+                            ReturnToCallingActivity(true, false);
                         }
                         else{
                             Snackbar.make(userField, R.string.snack_error_retry, Snackbar.LENGTH_SHORT).show();
@@ -187,31 +208,30 @@ public class LoginActivity extends AppCompatActivity {
      */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                ReturnToCallingActivity(false);
-                break;
+        if (item.getItemId() == android.R.id.home) {
+            ReturnToCallingActivity(false, true);
+            return true;
         }
-        return true;
+        return false;
     }
 
     @Override
     public void onBackPressed() {
-        ReturnToCallingActivity(false);
+        ReturnToCallingActivity(false, true);
     }
 
     /**
      * Will return to the calling activity and pass the login success parameter
      * @param success is the user now logged in
      */
-    private void ReturnToCallingActivity(final boolean success) {
+    private void ReturnToCallingActivity(final boolean success, final boolean canceled) {
         submitButton.post(new Runnable() {
             @Override
             public void run() {
                 getWindow().setSoftInputMode(prevLayoutParams); //reset the keyboard and window layout to how it was before
-                Intent data = new Intent();
-                data.putExtra("login_success", success);
-                setResult(RESULT_OK, data);
+                Intent intent = new Intent();
+                intent.putExtra("login_success", success);
+                setResult(canceled ? RESULT_CANCELED : RESULT_OK, intent);
                 finish();   //return to the calling activity
             }
         });

app/src/main/java/ch/amiv/android_app/core/MainActivity.java

@@ -158,17 +158,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
      */
     public void LogoutUser()
     {
-        if(Settings.IsEmailOnlyLogin(getApplicationContext())) {
-            Settings.SetToken("", getApplicationContext());
-        }
-        else {
-            //delete session at the server and then clear the token
-            Requests.DeleteCurrentSession(getApplicationContext());
-            Events.ClearSignups();
-        }
+        UserInfo.LogoutUser(getApplicationContext());
 
-        PersistentStorage.ClearUser(getApplicationContext());
-        UserInfo.current = null;
         pagerAdapter.RefreshPage(ListFragment.PageType.EVENTS, true);
         SetLoginUIDirty();
 
@@ -314,9 +305,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
         if (drawer.isDrawerOpen(GravityCompat.START)) {
             drawer.closeDrawer(GravityCompat.START);
-        } else {