From 4ecf671aba328699dc095a1514423c02752f80a6 Mon Sep 17 00:00:00 2001 From: Naishadh Parmar Date: Tue, 19 Dec 2017 15:00:26 +0530 Subject: [PATCH 1/3] Applied Material theme to MainActivity and AboutAppActivity Removed the background pictures of the MainActivity's EditText and Spinners. Slimmed the button down a bit. This became material. In AboutAppActivity, displaying the data in card format and exposed buttons to visit the links instead of just displaying the links. --- .idea/misc.xml | 15 +- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 50 +- .../studentsearch/AboutAppActivity.java | 51 +- .../xoodle/studentsearch/MainActivity.java | 29 +- .../adapter/SearchResultAdapter.java | 1 + .../studentsearch/adapter/SpinnerAdapter.java | 6 +- .../main/res/layout/activity_about_app.xml | 495 ++++++++++++------ app/src/main/res/layout/activity_main.xml | 213 +++----- app/src/main/res/layout/card_entries.xml | 3 +- app/src/main/res/values/colors.xml | 3 +- app/src/main/res/values/dimens.xml | 2 + app/src/main/res/values/styles.xml | 15 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 15 files changed, 543 insertions(+), 347 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 7158618..ad53516 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + diff --git a/app/build.gradle b/app/build.gradle index 57d8386..578f053 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,7 @@ android { versionCode 5 versionName "1.3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary = true } buildTypes { release { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 43738fe..2924536 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,11 @@ - + - + + + + android:name="com.studentsearch.xoodle.studentsearch.SplashActivity" + android:theme="@style/SplashTheme" + android:screenOrientation="portrait"> - - + + - - - + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/studentsearch/xoodle/studentsearch/AboutAppActivity.java b/app/src/main/java/com/studentsearch/xoodle/studentsearch/AboutAppActivity.java index 5846554..1dfabc7 100644 --- a/app/src/main/java/com/studentsearch/xoodle/studentsearch/AboutAppActivity.java +++ b/app/src/main/java/com/studentsearch/xoodle/studentsearch/AboutAppActivity.java @@ -1,19 +1,68 @@ package com.studentsearch.xoodle.studentsearch; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; +import android.view.View; /** * Created by aryan on 15/7/17. */ -public class AboutAppActivity extends AppCompatActivity { +public class AboutAppActivity extends AppCompatActivity implements View.OnClickListener{ @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about_app); getSupportActionBar().setDisplayHomeAsUpEnabled(true); + findViewById(R.id.about_app_btn_app_repo).setOnClickListener(this); + findViewById(R.id.about_app_btn_aryan_email).setOnClickListener(this); + findViewById(R.id.about_app_btn_aryan_github).setOnClickListener(this); + findViewById(R.id.about_app_btn_kaushal_email).setOnClickListener(this); + findViewById(R.id.about_app_btn_kaushal_github).setOnClickListener(this); + findViewById(R.id.about_app_btn_utkarsh_email).setOnClickListener(this); + findViewById(R.id.about_app_btn_utkarsh_github).setOnClickListener(this); + findViewById(R.id.about_app_btn_siddharth_email).setOnClickListener(this); + findViewById(R.id.about_app_btn_siddharth_github).setOnClickListener(this); + findViewById(R.id.about_app_btn_yash_email).setOnClickListener(this); + findViewById(R.id.about_app_btn_yash_github).setOnClickListener(this); + } + + @Override + public void onClick(View v) { + Intent intent = null; + switch (v.getId()) { + case R.id.about_app_btn_app_repo: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/xoodle/frost")); + break; + case R.id.about_app_btn_aryan_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts( + "mailto","saryan@iitk.ac.in", null)); + break; + case R.id.about_app_btn_aryan_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/aryanshar")); + break; + case R.id.about_app_btn_kaushal_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts( + "mailto","kaushalk@iitk.ac.in", null)); + break; + case R.id.about_app_btn_kaushal_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/kaushal-k")); + break; + case R.id.about_app_btn_utkarsh_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts( + "mailto","butkarsh@iitk.ac.in", null)); + break; + case R.id.about_app_btn_utkarsh_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/ubarsaiyan")); + break; + case R.id.about_app_btn_siddharth_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts( + "mailto","sidgane@iitk.ac.in", null)); + break; + case R.id.about_app_btn_siddharth_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/siddharth2610")); + break; + case R.id.about_app_btn_yash_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts( + "mailto","yashsriv@iitk.ac.in", null)); + break; + case R.id.about_app_btn_yash_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/yashsriv")); + break; + } + startActivity(intent); } } diff --git a/app/src/main/java/com/studentsearch/xoodle/studentsearch/MainActivity.java b/app/src/main/java/com/studentsearch/xoodle/studentsearch/MainActivity.java index 9c86327..5a7416e 100644 --- a/app/src/main/java/com/studentsearch/xoodle/studentsearch/MainActivity.java +++ b/app/src/main/java/com/studentsearch/xoodle/studentsearch/MainActivity.java @@ -12,6 +12,9 @@ import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; +import android.text.Editable; +import android.text.TextWatcher; +import android.util.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; @@ -64,6 +67,19 @@ protected void onCreate(Bundle savedInstanceState) { } mEditText = (EditText) findViewById(R.id.edit_text); + mEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) {} + + @Override + public void afterTextChanged(Editable s) { + if(mEditText.getText()==null || mEditText.getText().equals("")) mEditText.getCompoundDrawables()[2].setAlpha(0); + else if(mEditText.getText() != null && !mEditText.getText().equals("")) mEditText.getCompoundDrawables()[2].setAlpha(255); + } + }); mEditText.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { @@ -71,7 +87,7 @@ public boolean onTouch(View v, MotionEvent event) { final int DRAWABLE_LEFT = 0; if(event.getAction() == MotionEvent.ACTION_UP) { - if(event.getRawX() >= (mEditText.getRight() - mEditText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width()-mEditText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width())) { + if(event.getRawX() >= (mEditText.getRight() - mEditText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width()-mEditText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width()) && mEditText.getText() != null && !mEditText.getText().equals("")) { mEditText.setText(""); return true; } @@ -175,7 +191,7 @@ public void setFilterSpinnerEntries() { listOfEntries.add(s); } - spinnerAdapter = new SpinnerAdapter(this,android.R.layout.simple_spinner_item, listOfEntries, ConstantUtils.BLOOD_GROUP); + spinnerAdapter = new SpinnerAdapter(this, R.layout.support_simple_spinner_dropdown_item, listOfEntries, ConstantUtils.BLOOD_GROUP); spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); ((Spinner) findViewById(R.id.spinner_blood_group)).setAdapter(spinnerAdapter); @@ -190,7 +206,7 @@ public void setFilterSpinnerEntries() { cursor.moveToNext(); } Collections.sort(listOfEntries); - spinnerAdapter = new SpinnerAdapter(this, android.R.layout.simple_spinner_item, listOfEntries, ConstantUtils.DEPT); + spinnerAdapter = new SpinnerAdapter(this, R.layout.support_simple_spinner_dropdown_item, listOfEntries, ConstantUtils.DEPT); spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); ((Spinner) findViewById(R.id.spinner_dept)).setAdapter(spinnerAdapter); cursor.close(); @@ -206,7 +222,7 @@ public void setFilterSpinnerEntries() { cursor.moveToNext(); } Collections.sort(listOfEntries); - spinnerAdapter = new SpinnerAdapter(this, android.R.layout.simple_spinner_item, listOfEntries, ConstantUtils.PROGRAMME); + spinnerAdapter = new SpinnerAdapter(this, R.layout.support_simple_spinner_dropdown_item, listOfEntries, ConstantUtils.PROGRAMME); spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); ((Spinner) findViewById(R.id.spinner_programme)).setAdapter(spinnerAdapter); cursor.close(); @@ -216,7 +232,7 @@ public void setFilterSpinnerEntries() { for(String s : ConstantUtils.GENDER_LIST) { listOfEntries.add(s); } - spinnerAdapter = new SpinnerAdapter(this, android.R.layout.simple_spinner_item, listOfEntries, ConstantUtils.GENDER); + spinnerAdapter = new SpinnerAdapter(this, R.layout.support_simple_spinner_dropdown_item, listOfEntries, ConstantUtils.GENDER); spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); ((Spinner) findViewById(R.id.spinner_gender)).setAdapter(spinnerAdapter); @@ -234,11 +250,10 @@ public void setFilterSpinnerEntries() { cursor.moveToNext(); } listOfEntries.add("Others"); - spinnerAdapter = new SpinnerAdapter(this, android.R.layout.simple_spinner_item, listOfEntries, ConstantUtils.YEAR); + spinnerAdapter = new SpinnerAdapter(this, R.layout.support_simple_spinner_dropdown_item, listOfEntries, ConstantUtils.YEAR); spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); ((Spinner) findViewById(R.id.spinner_year)).setAdapter(spinnerAdapter); cursor.close(); - } private void imageDownloadAlertbox() { DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/com/studentsearch/xoodle/studentsearch/adapter/SearchResultAdapter.java b/app/src/main/java/com/studentsearch/xoodle/studentsearch/adapter/SearchResultAdapter.java index 3a182b8..c57eccf 100644 --- a/app/src/main/java/com/studentsearch/xoodle/studentsearch/adapter/SearchResultAdapter.java +++ b/app/src/main/java/com/studentsearch/xoodle/studentsearch/adapter/SearchResultAdapter.java @@ -168,6 +168,7 @@ protected void onPostExecute(Boolean imageURLAvailable){ errID = res.getIdentifier("girl", "drawable", packageName); } + errID = res.getIdentifier("ic_person_black_48dp", "drawable", packageName); File directory = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "studentPics"); File image = new File(directory, studentData.getRollNo() + "_0"); diff --git a/app/src/main/java/com/studentsearch/xoodle/studentsearch/adapter/SpinnerAdapter.java b/app/src/main/java/com/studentsearch/xoodle/studentsearch/adapter/SpinnerAdapter.java index 4799c7f..bbeaf40 100644 --- a/app/src/main/java/com/studentsearch/xoodle/studentsearch/adapter/SpinnerAdapter.java +++ b/app/src/main/java/com/studentsearch/xoodle/studentsearch/adapter/SpinnerAdapter.java @@ -21,10 +21,12 @@ public class SpinnerAdapter extends ArrayAdapter { private String tag; - + private Map map; + public SpinnerAdapter(Context context, int resource, List items, String tag) { super(context, resource, items); this.tag = tag; + map = getMapping(); Collections.sort(items, getComparator()); } @@ -32,7 +34,6 @@ public SpinnerAdapter(Context context, int resource, List items, String @Override public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) { TextView textView = (TextView) super.getView(position, convertView, parent); - Map map = getMapping(); if(map != null) { String value = map.get(getItem(position)); if(value == null) { @@ -46,7 +47,6 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup @Override public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) { TextView textView = (TextView) super.getDropDownView(position, convertView, parent); - Map map = getMapping(); if(map != null) { String value = map.get(getItem(position)); if(value == null) { diff --git a/app/src/main/res/layout/activity_about_app.xml b/app/src/main/res/layout/activity_about_app.xml index da5ec5e..9ec6f34 100644 --- a/app/src/main/res/layout/activity_about_app.xml +++ b/app/src/main/res/layout/activity_about_app.xml @@ -1,187 +1,366 @@ - - + android:padding="@dimen/activity_padding_horizontal" + android:scrollbars="none"> - - - - - - - - - + android:orientation="vertical"> - + + - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + + +