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 index 76866f98..a53dcf69 100644 --- a/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java +++ b/app/src/main/java/io/github/wulkanowy/activity/dashboard/DashboardActivity.java @@ -34,18 +34,22 @@ public class DashboardActivity extends AppCompatActivity { 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; @@ -64,6 +68,8 @@ public class DashboardActivity extends AppCompatActivity { 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); 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 5ace0075..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 @@ -145,7 +145,10 @@ public class Login extends AsyncTask { Toast.makeText(activity, userMesage , Toast.LENGTH_LONG).show(); } - Intent intent = new Intent(activity,DashboardActivity.class); - activity.startActivity(intent); + 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 bc57ffc0..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 @@ -31,7 +31,7 @@ public class LoadingTask extends AsyncTask { /* Intent intent = new Intent(activity,MainActivity.class); activity.startActivity(intent); */ - Intent intent = new Intent(activity,DashboardActivity.class); + Intent intent = new Intent(activity,MainActivity.class); activity.startActivity(intent); } } diff --git a/app/src/main/res/layout/fragment_marks.xml b/app/src/main/res/layout/fragment_marks.xml index d662d69b..bc582405 100644 --- a/app/src/main/res/layout/fragment_marks.xml +++ b/app/src/main/res/layout/fragment_marks.xml @@ -10,4 +10,8 @@ android:layout_height="match_parent" android:text="Fragment Oceny" /> + + 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/strings.xml b/app/src/main/res/values/strings.xml index b63eae8a..f7a631f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,6 +19,4 @@ Attendance Lesson Plan Settings - - TO JEST FRAGMENT