diff --git a/app/build.gradle b/app/build.gradle index b38ef350..8f2419d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "25.0.3" defaultConfig { applicationId "io.github.wulkanowy" minSdkVersion 14 @@ -10,6 +10,7 @@ android { versionCode 1 versionName "0.1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary = true } buildTypes { release { @@ -27,5 +28,8 @@ dependencies { compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'org.jsoup:jsoup:1.10.2' + compile 'com.android.support:design:25.3.1' + compile 'com.android.support:support-vector-drawable:25.3.1' + compile 'com.android.support:support-v4:25.3.1' testCompile 'junit:junit:4.12' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ad0e83d1..d402764c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ package="io.github.wulkanowy"> - + + android:noHistory="true" + android:theme="@style/NoActionBar"> @@ -24,8 +24,11 @@ - + android:label="@string/login_title" /> + \ No newline at end of file diff --git a/app/src/main/ic_launcher_round-web.png b/app/src/main/ic_launcher_round-web.png new file mode 100644 index 00000000..b09d5b8e Binary files /dev/null and b/app/src/main/ic_launcher_round-web.png differ diff --git a/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java b/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java new file mode 100644 index 00000000..a53dcf69 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java @@ -0,0 +1,97 @@ +package io.github.wulkanowy.activity.dashboard; + + +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomNavigationView; +import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; +import android.support.v4.app.FragmentTransaction; + +import io.github.wulkanowy.R; +import io.github.wulkanowy.activity.dashboard.attendance.AttendanceFragment; +import io.github.wulkanowy.activity.dashboard.board.BoardFragment; +import io.github.wulkanowy.activity.dashboard.lessonplan.LessonplanFragment; +import io.github.wulkanowy.activity.dashboard.marks.MarksFragment; + + +public class DashboardActivity extends AppCompatActivity { + + + MarksFragment marksFragment = new MarksFragment(); + AttendanceFragment attendanceFragment = new AttendanceFragment(); + BoardFragment boardFragment = new BoardFragment(); + LessonplanFragment lessonplanFragment = new LessonplanFragment(); + + + private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener + = new BottomNavigationView.OnNavigationItemSelectedListener() { + + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem item) { + + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + + switch (item.getItemId()) { + case R.id.navigation_marks: + setTitle(R.string.title_marks); + transaction.replace(R.id.fragment_container, marksFragment); + transaction.commit(); + return true; + case R.id.navigation_attendance: + setTitle(R.string.title_attendance); + transaction.replace(R.id.fragment_container, attendanceFragment); + transaction.commit(); + return true; + case R.id.navigation_dashboard: + setTitle(R.string.title_dashboard); + transaction.replace(R.id.fragment_container, boardFragment); + transaction.commit(); + return true; + case R.id.navigation_lessonplan: + setTitle(R.string.title_lessonplan); + transaction.replace(R.id.fragment_container, lessonplanFragment); + transaction.commit(); + return true; + /* + case R.id.navigation_settings: + + return true; + */ + } + return false; + } + }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_dashboard); + + setTitle(R.string.title_dashboard); + + BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navigation); + navigation.setSelectedItemId(R.id.navigation_dashboard); + navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener); + + getSupportFragmentManager().beginTransaction() + .add(R.id.fragment_container, boardFragment).commit(); + } + + public void onBackPressed() { + + BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navigation); + + if (navigation.getSelectedItemId() != R.id.navigation_dashboard) { + + navigation.setSelectedItemId(R.id.navigation_dashboard); + + } + + else if (navigation.getSelectedItemId() == R.id.navigation_dashboard){ + + moveTaskToBack(true); + + } + } +} diff --git a/app/src/main/java/io/github/wulkanowy/activity/dashboard/attendance/AttendanceFragment.java b/app/src/main/java/io/github/wulkanowy/activity/dashboard/attendance/AttendanceFragment.java new file mode 100644 index 00000000..e33fd7c7 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/activity/dashboard/attendance/AttendanceFragment.java @@ -0,0 +1,25 @@ +package io.github.wulkanowy.activity.dashboard.attendance; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import io.github.wulkanowy.R; + +public class AttendanceFragment extends Fragment { + + + public AttendanceFragment() { + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_attendance, container, false); + } + +} diff --git a/app/src/main/java/io/github/wulkanowy/activity/dashboard/board/BoardFragment.java b/app/src/main/java/io/github/wulkanowy/activity/dashboard/board/BoardFragment.java new file mode 100644 index 00000000..f53c476b --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/activity/dashboard/board/BoardFragment.java @@ -0,0 +1,25 @@ +package io.github.wulkanowy.activity.dashboard.board; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import io.github.wulkanowy.R; + +public class BoardFragment extends Fragment { + + + public BoardFragment() { + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_board, container, false); + } + +} diff --git a/app/src/main/java/io/github/wulkanowy/activity/dashboard/lessonplan/LessonplanFragment.java b/app/src/main/java/io/github/wulkanowy/activity/dashboard/lessonplan/LessonplanFragment.java new file mode 100644 index 00000000..dbdb1bb4 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/activity/dashboard/lessonplan/LessonplanFragment.java @@ -0,0 +1,25 @@ +package io.github.wulkanowy.activity.dashboard.lessonplan; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import io.github.wulkanowy.R; + +public class LessonplanFragment extends Fragment { + + + public LessonplanFragment() { + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_lessonplan, container, false); + } + +} diff --git a/app/src/main/java/io/github/wulkanowy/activity/dashboard/marks/MarksFragment.java b/app/src/main/java/io/github/wulkanowy/activity/dashboard/marks/MarksFragment.java new file mode 100644 index 00000000..3af34af1 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/activity/dashboard/marks/MarksFragment.java @@ -0,0 +1,25 @@ +package io.github.wulkanowy.activity.dashboard.marks; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import io.github.wulkanowy.R; + +public class MarksFragment extends Fragment { + + + public MarksFragment() { + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_marks, container, false); + } + +} diff --git a/app/src/main/java/io/github/wulkanowy/activity/main/Login.java b/app/src/main/java/io/github/wulkanowy/activity/main/Login.java index 36f8cf8d..1e33985b 100644 --- a/app/src/main/java/io/github/wulkanowy/activity/main/Login.java +++ b/app/src/main/java/io/github/wulkanowy/activity/main/Login.java @@ -2,6 +2,7 @@ package io.github.wulkanowy.activity.main; import android.app.Activity; import android.app.ProgressDialog; +import android.content.Intent; import android.os.AsyncTask; import android.widget.Toast; @@ -14,6 +15,7 @@ import java.io.IOException; import java.util.Map; import io.github.wulkanowy.R; +import io.github.wulkanowy.activity.dashboard.DashboardActivity; public class Login extends AsyncTask { @@ -142,5 +144,11 @@ public class Login extends AsyncTask { if (!userMesage.isEmpty()){ Toast.makeText(activity, userMesage , Toast.LENGTH_LONG).show(); } + + if (userMesage.equals(activity.getString(R.string.login_accepted))){ + Intent intent = new Intent(activity,DashboardActivity.class); + activity.startActivity(intent); + } + } } diff --git a/app/src/main/java/io/github/wulkanowy/activity/started/LoadingTask.java b/app/src/main/java/io/github/wulkanowy/activity/started/LoadingTask.java index 4331932f..e6eb602b 100644 --- a/app/src/main/java/io/github/wulkanowy/activity/started/LoadingTask.java +++ b/app/src/main/java/io/github/wulkanowy/activity/started/LoadingTask.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.os.AsyncTask; +import io.github.wulkanowy.activity.dashboard.DashboardActivity; import io.github.wulkanowy.activity.main.MainActivity; public class LoadingTask extends AsyncTask { @@ -27,10 +28,10 @@ public class LoadingTask extends AsyncTask { protected void onPostExecute(Void result) { + /* Intent intent = new Intent(activity,MainActivity.class); + activity.startActivity(intent); */ + Intent intent = new Intent(activity,MainActivity.class); activity.startActivity(intent); - - } } - diff --git a/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java b/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java index 2e25bc70..241d832b 100644 --- a/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java +++ b/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java @@ -17,8 +17,5 @@ public class StartedActivity extends Activity { public void Task(){ new LoadingTask(this).execute(); - - - } } diff --git a/app/src/main/res/color/bottomnavi_color.xml b/app/src/main/res/color/bottomnavi_color.xml new file mode 100644 index 00000000..a84b0397 --- /dev/null +++ b/app/src/main/res/color/bottomnavi_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml new file mode 100644 index 00000000..f0d02f4f --- /dev/null +++ b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/icon_attendance_24dp.xml b/app/src/main/res/drawable/icon_attendance_24dp.xml new file mode 100644 index 00000000..fcdf36b8 --- /dev/null +++ b/app/src/main/res/drawable/icon_attendance_24dp.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_lessonplan_24dp.xml b/app/src/main/res/drawable/icon_lessonplan_24dp.xml new file mode 100644 index 00000000..fa4870c8 --- /dev/null +++ b/app/src/main/res/drawable/icon_lessonplan_24dp.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_marks_26dp.xml b/app/src/main/res/drawable/icon_marks_26dp.xml new file mode 100644 index 00000000..8049ad94 --- /dev/null +++ b/app/src/main/res/drawable/icon_marks_26dp.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_other_24dp.xml b/app/src/main/res/drawable/icon_other_24dp.xml new file mode 100644 index 00000000..680f5abc --- /dev/null +++ b/app/src/main/res/drawable/icon_other_24dp.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml new file mode 100644 index 00000000..9d4c23fa --- /dev/null +++ b/app/src/main/res/layout/activity_dashboard.xml @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml new file mode 100644 index 00000000..d396545e --- /dev/null +++ b/app/src/main/res/layout/fragment_attendance.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_board.xml b/app/src/main/res/layout/fragment_board.xml new file mode 100644 index 00000000..b75e8c31 --- /dev/null +++ b/app/src/main/res/layout/fragment_board.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/app/src/main/res/layout/fragment_lessonplan.xml b/app/src/main/res/layout/fragment_lessonplan.xml new file mode 100644 index 00000000..9330078a --- /dev/null +++ b/app/src/main/res/layout/fragment_lessonplan.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_marks.xml b/app/src/main/res/layout/fragment_marks.xml new file mode 100644 index 00000000..bc582405 --- /dev/null +++ b/app/src/main/res/layout/fragment_marks.xml @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml new file mode 100644 index 00000000..d813140b --- /dev/null +++ b/app/src/main/res/menu/navigation.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 9a078e3e..5994c19a 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index efc028a6..0130695c 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 3af2608a..a8280fc0 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 9bec2e62..ef918407 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 34947cd6..4b604bee 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 66e9ab01..5ff807d4 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,4 +1,3 @@ - Wulkanowy Surowa wersja @@ -13,5 +12,11 @@ Funkcja którą chciałeś uruchomić nie działa Pomyślnie zalogowano Logowanie nie powiodło się - Proszę czekać... - \ No newline at end of file + Proszę czekać… + Aktywność dashboard + Dashboard + Oceny + Frekwencja + Plan lekcji + Ustawienia + diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 00000000..63fc8164 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 00000000..47c82246 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e0874735..f7a631f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,5 +12,11 @@ The function you wanted to run does not work Login is successful Login is failed - Please wait... + Please wait… + Dashboard Activity + Dashboard + Marks + Attendance + Lesson Plan + Settings