diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml new file mode 100644 index 0000000..57927c5 --- /dev/null +++ b/.idea/markdown-navigator/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6b7fc4f..72841a7 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,8 @@ + + diff --git a/app/src/main/java/com/codingblocks/attendancetracker/FontsOverride.java b/app/src/main/java/com/codingblocks/attendancetracker/FontsOverride.java index 421cba0..c02a8fb 100644 --- a/app/src/main/java/com/codingblocks/attendancetracker/FontsOverride.java +++ b/app/src/main/java/com/codingblocks/attendancetracker/FontsOverride.java @@ -9,6 +9,8 @@ import android.content.Context; import android.graphics.Paint; import android.graphics.Typeface; +import android.os.Build; +import android.support.annotation.RequiresApi; import android.support.v4.util.LruCache; import android.text.Spannable; import android.text.SpannableString; @@ -31,6 +33,7 @@ public class FontsOverride { public static final String FONT_PROXIMA_NOVA = "ProximaNova.ttf"; + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) public static void applyFontForToolbarTitle(Activity act, String fontName, Window window){ ActionBar ab = act.getActionBar(); diff --git a/app/src/main/java/com/codingblocks/attendancetracker/ListOfAbsentPresentStudentsActivity.java b/app/src/main/java/com/codingblocks/attendancetracker/ListOfAbsentPresentStudentsActivity.java index 2a680d2..c7fb857 100644 --- a/app/src/main/java/com/codingblocks/attendancetracker/ListOfAbsentPresentStudentsActivity.java +++ b/app/src/main/java/com/codingblocks/attendancetracker/ListOfAbsentPresentStudentsActivity.java @@ -1,6 +1,8 @@ package com.codingblocks.attendancetracker; import android.content.Intent; +import android.os.Build; +import android.support.annotation.RequiresApi; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; @@ -25,6 +27,7 @@ public class ListOfAbsentPresentStudentsActivity extends AppCompatActivity { private PresentAdapter presentAdapter; private AbsentAdapter absentAdapter; + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/codingblocks/attendancetracker/MainActivity.java b/app/src/main/java/com/codingblocks/attendancetracker/MainActivity.java index b2b1506..7c8cc4f 100644 --- a/app/src/main/java/com/codingblocks/attendancetracker/MainActivity.java +++ b/app/src/main/java/com/codingblocks/attendancetracker/MainActivity.java @@ -2,8 +2,10 @@ import android.content.Intent; import android.graphics.Color; +import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.support.annotation.RequiresApi; import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AppCompatActivity; import android.util.Log; @@ -14,6 +16,7 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; @@ -35,7 +38,7 @@ public class MainActivity extends AppCompatActivity { private String selectedBatch; private MyAdapter myAdapter; - private LinearLayout background; + private RelativeLayout background; private ArrayList students; @@ -52,6 +55,7 @@ public void run() { } }; + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -70,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) { private void initViews() { cardStack = (SwipeDeck) findViewById(R.id.swipe_deck); - background = (LinearLayout) findViewById(R.id.activity_main); + background = (RelativeLayout) findViewById(R.id.activity_main); spinner = (CustomSpinner) findViewById(R.id.spinner_batch); coursebutton = (FloatingActionButton) findViewById(R.id.create_course_button); coursebutton.setOnClickListener(new View.OnClickListener() { @@ -123,6 +127,7 @@ private void setupEventListener() { cardStack.setEventCallback(new SwipeDeck.SwipeEventCallback() { @Override public void cardSwipedLeft(int position) { + //Absent background.setBackgroundColor(Color.RED); handler.postDelayed(run, 200); absentIds.add(students.get(position).getUniqueId()); @@ -131,7 +136,7 @@ public void cardSwipedLeft(int position) { @Override public void cardSwipedRight(int position) { - //present + //Present background.setBackgroundColor(Color.GREEN); handler.postDelayed(run, 200); presentIds.add(students.get(position).getUniqueId()); diff --git a/app/src/main/java/com/codingblocks/attendancetracker/models/Batch.java b/app/src/main/java/com/codingblocks/attendancetracker/models/Batch.java index 95f5e0b..6418e4d 100644 --- a/app/src/main/java/com/codingblocks/attendancetracker/models/Batch.java +++ b/app/src/main/java/com/codingblocks/attendancetracker/models/Batch.java @@ -16,10 +16,9 @@ public static ArrayList getDummyBatches() { batches.add("Crux"); batches.add("Pandora"); batches.add("Launchpad"); - batches.add("Elixir"); - batches.add("Django"); + return batches; } diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml new file mode 100644 index 0000000..f986673 --- /dev/null +++ b/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index bb9f40d..55dcf1e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - @@ -30,12 +32,13 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" /> - + @@ -43,7 +46,6 @@ android:id="@+id/swipe_deck" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:padding="20dp" swipedeck:card_gravity="top" swipedeck:card_spacing="10dp" @@ -57,8 +59,10 @@ android:id="@+id/create_course_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|end" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_margin="16dp" android:src="@drawable/ic_add" app:fabSize="normal" /> - + diff --git a/build.gradle b/build.gradle index b78a0b8..c2eea8e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files