github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

MVP (#46)

Browse Source
This commit is contained in:
Rafał Borcz
2018-03-04 12:49:16 +01:00
committed by Mikołaj Pich
parent a1a3427142
commit 79bdbbbb16
158 changed files with 4369 additions and 3753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/drawable/ic_arrow_down.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="35dp"
android:height="35dp"
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#000000"
android:pathData="M7.41 7.84L12 12.42l4.59-4.58L18 9.25l-6 6-6-6z" />
<path android:pathData="M0-0.75h24v24H0z" />
</vector>

BIN
app/src/main/res/drawable/ic_logo_splash.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

2
app/src/main/res/drawable/icon_grade_26dp.xml
View File

@ -5,6 +5,6 @@
android:viewportWidth="26"
android:viewportHeight="26">
<path
android:fillColor="#000000"
android:fillColor="#FFF"
android:pathData="M13,11H15V13H13M13,15H15A2,2 0 0,0 17,13V11C17,9.89 16.1,9 15,9H13V7H17V5H13A2,2 0 0,0 11,7V13C11,14.11 11.9,15 13,15M21,17H7V3H21M21,1H7A2,2 0 0,0 5,3V17A2,2 0 0,0 7,19H21A2,2 0 0,0 23,17V3A2,2 0 0,0 21,1M3,5H1V21A2,2 0 0,0 3,23H19V21H3V5Z" />
</vector>

BIN
app/src/main/res/drawable/img_splash_512px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

16
app/src/main/res/drawable/splash_background.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="#FFF" />
</shape>
</item>
<item
android:width="250dp"
android:height="250dp"
android:drawable="@drawable/img_splash_512px"
android:gravity="center">
<!-- Only for 23 sdk -->
</item>
</layer-list>

30
app/src/main/res/layout/activity_dashboard.xml
View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="1"
tools:context="io.github.wulkanowy.ui.main.DashboardActivity">
<android.support.design.widget.CoordinatorLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior" />
<android.support.design.widget.BottomNavigationView
android:id="@+id/navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/colorBackgroundBottomNavi"
app:itemIconTint="@color/bottomnavi_color"
app:itemTextColor="@color/bottomnavi_color"
app:menu="@menu/navigation" />
</LinearLayout>

85
app/src/main/res/layout/activity_login.xml
View File

@ -1,152 +1,137 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/login_activity_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:id="@+id/fragment_container"
tools:context="io.github.wulkanowy.ui.login.LoginActivity"
>
tools:context="io.github.wulkanowy.ui.login.LoginActivity">
<!-- Login progress -->
<RelativeLayout
android:id="@+id/login_progress"
android:id="@+id/login_activity_progress_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginTop="178dp"
android:gravity="center_horizontal"
android:gravity="center"
android:visibility="gone">
<ProgressBar
android:id="@+id/login_progress_horizontal"
android:id="@+id/login_activity_progress_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="91dp"
android:indeterminate="true"
android:minHeight="30dp"
android:minWidth="220dp" />
<TextView
android:id="@+id/login_progress_text"
android:id="@+id/login_activity_progress_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/login_progress_horizontal"
android:layout_alignBottom="@+id/login_activity_progress_bar"
android:layout_centerHorizontal="true"
android:layout_marginBottom="42dp" />
</RelativeLayout>
<ScrollView
android:id="@+id/login_form"
android:id="@+id/login_activity_form_scroll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/email_login_form"
android:id="@+id/login_activity_form_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/login_heading"
android:layout_marginBottom="24dp"
/>
android:text="@string/login_heading" />
<android.support.design.widget.TextInputLayout
android:id="@+id/to_email_input_layout"
android:id="@+id/login_activity_email_text_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
>
android:layout_marginBottom="12dp">
<EditText
android:id="@+id/email"
android:id="@+id/login_activity_email_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_email"
android:inputType="textEmailAddress"
android:maxLines="1"
/>
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/to_password_input_layout"
android:id="@+id/login_activity_pass_text_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
android:layout_height="wrap_content">
<EditText
android:id="@+id/password"
android:id="@+id/login_activity_pass_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:hint="@string/prompt_password"
android:inputType="textPassword"
android:maxLines="1"
android:imeActionLabel="@string/action_sign_in"
android:imeOptions="actionDone"
android:fontFamily="sans-serif"
/>
android:inputType="textPassword"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/to_symbol_input_layout"
android:id="@+id/login_activity_symbol_text_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
>
android:visibility="gone">
<AutoCompleteTextView
android:id="@+id/symbol"
android:id="@+id/login_activity_symbol_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_symbol"
android:inputType="textAutoComplete"
android:maxLines="1"
android:imeActionLabel="@string/action_sign_in"
android:imeOptions="actionDone"
android:importantForAutofill="noExcludeDescendants"
/>
android:inputType="textAutoComplete"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/action_sign_in"
android:id="@+id/login_activity_sign_button"
style="?android:textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="24dp"
android:text="@string/action_sign_in"
android:textStyle="bold"
/>
android:textStyle="bold" />
<TextView
android:id="@+id/action_create_account"
android:id="@+id/login_activity_create_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_create_account"
android:layout_marginBottom="24dp"
/>
android:text="@string/action_create_account" />
<TextView
android:id="@+id/action_forgot_password"
android:id="@+id/login_activity_forgot_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_forgot_password"
/>
android:text="@string/action_forgot_password" />
</LinearLayout>
</ScrollView>

33
app/src/main/res/layout/activity_main.xml Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_activity_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="io.github.wulkanowy.ui.main.MainActivity">
<RelativeLayout
android:id="@+id/main_activity_progress_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true" />
</RelativeLayout>
<com.aurelhubert.ahbottomnavigation.AHBottomNavigationViewPager
android:id="@+id/main_activity_view_pager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/bottom_navigation_height" />
<com.aurelhubert.ahbottomnavigation.AHBottomNavigation
android:id="@+id/main_activity_nav"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom" />
</android.support.design.widget.CoordinatorLayout>

34
app/src/main/res/layout/activity_splash.xml
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/logoImage"
android:layout_width="250dp"
android:layout_height="200dp"
android:layout_gravity="center"
android:layout_marginTop="70dp"
android:src="@drawable/ic_logo_splash"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/nameApp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="50dp"
android:text="@string/app_name"
android:textSize="40sp" />
<TextView
android:id="@+id/rawText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="50dp"
android:text="@string/version_text"
android:textSize="20sp" />
</LinearLayout>

2
app/src/main/res/layout/fragment_board.xml
View File

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="io.github.wulkanowy.ui.main.board.BoardFragment">
tools:context="io.github.wulkanowy.ui.main.dashboard.DashboardFragment">
<RelativeLayout
android:layout_width="match_parent"

33
app/src/main/res/layout/fragment_grades.xml
View File

@ -1,27 +1,28 @@
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/coordinator_grade"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/grade_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="io.github.wulkanowy.ui.main.grades.GradesFragment">
<RelativeLayout
android:id="@+id/grade_fragment_no_item_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:id="@+id/fragment_no_grades">
android:gravity="center">
<ImageView
android:id="@+id/wrench_under_construction"
android:id="@+id/grade_fragment_no_item_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView3"
android:layout_below="@+id/grade_fragment_no_item_text"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
android:contentDescription="@string/activity_dashboard_text"
android:minHeight="100dp"
android:minWidth="100dp"
android:tint="@android:color/black"
app:srcCompat="@drawable/icon_grade_26dp" />
<TextView
@ -29,30 +30,18 @@
android:layout_height="wrap_content"
android:layout_marginTop="46dp"
android:text="@string/fragment_no_grades"
android:textSize="20sp"
android:id="@+id/grade_fragment_no_item_text"
android:textAlignment="center"
android:id="@+id/textView3" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/loadingPanel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true" />
android:textSize="20sp" />
</RelativeLayout>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/grade_swipe_refresh"
android:id="@+id/grade_fragment_swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/subject_grade_recycler"
android:id="@+id/grade_fragment_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />

19
app/src/main/res/layout/fragment_timetable.xml
View File

@ -2,26 +2,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true">
<RelativeLayout
android:id="@+id/timetable_tab_progress_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true" />
</RelativeLayout>
android:layout_alignParentBottom="true"
android:id="@+id/timetable_fragment_container">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.TabLayout
android:id="@+id/timetable_fragment_tab"
android:id="@+id/timetable_fragment_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabMinWidth="125dp"
@ -31,6 +20,6 @@
android:id="@+id/timetable_fragment_viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/timetable_fragment_tab" />
android:layout_below="@id/timetable_fragment_tab_layout" />
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout>

13
app/src/main/res/layout/fragment_timetable_tab.xml
View File

@ -1,15 +1,16 @@
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_grade"
android:id="@+id/timetable_tab_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="io.github.wulkanowy.ui.main.grades.GradesFragment">
<RelativeLayout
android:id="@+id/timetable_progress_bar"
android:id="@+id/timetable_tab_fragment_progress_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
android:gravity="center"
android:visibility="gone">
<ProgressBar
android:layout_width="wrap_content"
@ -18,12 +19,12 @@
</RelativeLayout>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/timetable_tab_fragment_swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/timetable_refresh_layout">
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/timetable_recycler"
android:id="@+id/timetable_tab_fragment_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />

53
app/src/main/res/layout/grades_dialog.xml → app/src/main/res/layout/grade_dialog.xml
View File

@ -7,7 +7,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="450dp"
android:minWidth="300dp"
android:orientation="vertical">
@ -16,13 +15,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="15dp"
android:minHeight="450dp"
android:padding="20dp"
tools:ignore="UselessParent">
<TextView
android:id="@+id/dialog_grade_text"
android:id="@+id/grade_dialog_value"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_alignParentEnd="true"
@ -34,7 +32,7 @@
android:textSize="30sp" />
<TextView
android:id="@+id/subject_dialog_text_value"
android:id="@+id/grade_dialog_subject"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@ -53,133 +51,134 @@
android:textSize="20sp" />
<TextView
android:id="@+id/description_dialog_text"
android:id="@+id/grade_dialog_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/subject_dialog_text_value"
android:layout_below="@+id/grade_dialog_subject"
android:text="@string/dialog_description_text"
android:textIsSelectable="true"
android:textSize="17sp" />
<TextView
android:id="@+id/description_dialog_text_value"
android:id="@+id/grade_dialog_description_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/description_dialog_text"
android:layout_below="@+id/grade_dialog_description"
android:layout_marginTop="3dp"
android:text="@string/noDescription_text"
android:textIsSelectable="true"
android:textSize="12sp" />
<TextView
android:id="@+id/weight_dialog_text"
android:id="@+id/grade_dialog_weight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/description_dialog_text_value"
android:layout_below="@+id/grade_dialog_description_value"
android:layout_marginTop="10dp"
android:text="@string/dialog_weight_text"
android:textSize="17sp" />
<TextView
android:id="@+id/weight_dialog_text_value"
android:id="@+id/grade_dialog_weight_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/weight_dialog_text"
android:layout_below="@+id/grade_dialog_weight"
android:layout_marginTop="3dp"
android:text="@string/grades_text"
android:textIsSelectable="true"
android:textSize="12sp" />
<TextView
android:id="@+id/teacher_dialog_text"
android:id="@+id/grade_dialog_teacher"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/weight_dialog_text_value"
android:layout_below="@+id/grade_dialog_weight_value"
android:layout_marginTop="10dp"
android:text="@string/dialog_teacher_text"
android:textSize="17sp" />
<TextView
android:id="@+id/teacher_dialog_text_value"
android:id="@+id/grade_dialog_teacher_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/teacher_dialog_text"
android:layout_below="@+id/grade_dialog_teacher"
android:layout_marginTop="3dp"
android:text="@string/dialog_teacher_text"
android:textIsSelectable="true"
android:textSize="12sp" />
<TextView
android:id="@+id/color_dialog_text"
android:id="@+id/grade_dialog_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/teacher_dialog_text_value"
android:layout_below="@+id/grade_dialog_teacher_value"
android:layout_marginTop="10dp"
android:text="@string/dialog_color_text"
android:textSize="17sp" />
<TextView
android:id="@+id/color_dialog_text_value"
android:id="@+id/grade_dialog_color_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/color_dialog_text"
android:layout_below="@+id/grade_dialog_color"
android:layout_marginTop="3dp"
android:text="@string/dialog_color_text"
android:textIsSelectable="true"
android:textSize="12sp" />
<TextView
android:id="@+id/date_dialog_text"
android:id="@+id/grade_dialog_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/color_dialog_text_value"
android:layout_below="@+id/grade_dialog_color_value"
android:layout_marginTop="10dp"
android:text="@string/dialog_date_text"
android:textSize="17sp" />
<TextView
android:id="@+id/date_dialog_text_value"
android:id="@+id/grade_dialog_date_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/date_dialog_text"
android:layout_below="@+id/grade_dialog_date"
android:layout_marginTop="3dp"
android:text="@string/dialog_date_text"
android:textIsSelectable="true"
android:textSize="12sp" />
<Button
android:id="@+id/close_dialog"
android:id="@+id/grade_dialog_close_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/grade_dialog_date_value"
android:layout_marginTop="25dp"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:text="@string/generic_dialog_close"
android:textAllCaps="true"
android:textSize="15sp"
/>
android:textSize="15sp" />
</RelativeLayout>
</LinearLayout>

21
app/src/main/res/layout/subject_item.xml → app/src/main/res/layout/grade_header.xml
View File

@ -1,14 +1,15 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tool="http://schemas.android.com/tools"
android:id="@+id/grade_header_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tool="http://schemas.android.com/tools"
android:background="@drawable/subject_border_1px"
android:foreground="?attr/selectableItemBackgroundBorderless"
android:padding="15dp">
<TextView
android:id="@+id/subject_text"
android:id="@+id/grade_header_subject_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="35dp"
@ -19,36 +20,36 @@
android:textSize="17sp" />
<TextView
android:id="@+id/subject_grades_average"
android:id="@+id/grade_header_average_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/subject_text"
android:layout_below="@+id/grade_header_subject_text"
android:layout_marginTop="5dp"
android:text="@string/app_name"
android:textColor="#4C4C4C"
android:textSize="12sp" />
<TextView
android:id="@+id/subject_number_of_grades"
android:id="@+id/grade_header_number_of_grade_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/subject_text"
android:layout_below="@id/grade_header_subject_text"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_toEndOf="@+id/subject_grades_average"
android:layout_toRightOf="@+id/subject_grades_average"
android:layout_toEndOf="@+id/grade_header_average_text"
android:layout_toRightOf="@+id/grade_header_average_text"
android:text="@string/app_name"
android:textColor="#4C4C4C"
android:textSize="12sp" />
<ImageView
android:id="@+id/subject_new_grades_alert"
android:id="@+id/grade_header_alert_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginTop="10dp"
app:srcCompat="@drawable/subject_alert_circle"
tool:ignore="contentDescription"/>
tool:ignore="contentDescription" />
</RelativeLayout>

24
app/src/main/res/layout/grade_item.xml → app/src/main/res/layout/grade_subitem.xml
View File

@ -2,7 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tool="http://schemas.android.com/tools"
android:id="@+id/grade_cardview"
android:id="@+id/grade_subitem_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
@ -24,7 +24,7 @@
android:layout_marginTop="7dp">
<TextView
android:id="@+id/grade_text"
android:id="@+id/grade_subitem_value"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_centerVertical="true"
@ -33,7 +33,7 @@
android:textSize="16sp" />
<TextView
android:id="@+id/description_grade_text"
android:id="@+id/grade_subitem_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
@ -41,33 +41,33 @@
android:layout_marginLeft="10dp"
android:layout_marginRight="40dp"
android:layout_marginStart="10dp"
android:layout_toEndOf="@+id/grade_text"
android:layout_toRightOf="@+id/grade_text"
android:layout_toEndOf="@+id/grade_subitem_value"
android:layout_toRightOf="@+id/grade_subitem_value"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_name"
android:textSize="15sp"
tool:ignore="all"/>
tool:ignore="all" />
<TextView
android:id="@+id/grade_date_text"
android:id="@+id/grade_subitem_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/grade_text"
android:layout_alignLeft="@+id/description_grade_text"
android:layout_alignStart="@+id/description_grade_text"
android:layout_alignBottom="@+id/grade_subitem_value"
android:layout_alignLeft="@+id/grade_subitem_description"
android:layout_alignStart="@+id/grade_subitem_description"
android:text="@string/grades_text"
android:textSize="12sp" />
<ImageView
android:id="@+id/grade_new_grades_alert"
android:id="@+id/grade_subitem_alert_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginTop="10dp"
app:srcCompat="@drawable/subject_alert_circle"
tool:ignore="contentDescription"/>
tool:ignore="contentDescription" />
</RelativeLayout>
</android.support.v7.widget.CardView>

6
app/src/main/res/layout/timetable_header.xml
View File

@ -8,7 +8,7 @@
android:padding="15dp">
<TextView
android:id="@+id/timetable_header_dayName_text"
android:id="@+id/timetable_header_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@ -23,12 +23,12 @@
android:textSize="19sp" />
<TextView
android:id="@+id/timetable_header_date_text"
android:id="@+id/timetable_header_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/timetable_header_dayName_text"
android:layout_below="@+id/timetable_header_day"
android:layout_marginTop="5dp"
android:maxLines="1"
android:text="@string/app_name"

10
app/src/main/res/layout/timetable_subitem.xml
View File

@ -30,13 +30,13 @@
android:layout_height="40dp"
android:layout_centerVertical="true"
android:gravity="center"
android:maxLength="1"
android:maxLength="2"
android:text="0"
android:textSize="32sp"
tool:ignore="all"/>
<TextView
android:id="@+id/timetable_subItem_lesson_text"
android:id="@+id/timetable_subItem_lesson"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
@ -57,8 +57,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/timetable_subItem_number_of_lesson"
android:layout_alignLeft="@id/timetable_subItem_lesson_text"
android:layout_alignStart="@id/timetable_subItem_lesson_text"
android:layout_alignLeft="@id/timetable_subItem_lesson"
android:layout_alignStart="@id/timetable_subItem_lesson"
android:maxLines="1"
android:text="@string/grades_text"
android:textColor="#4C4C4C"
@ -82,7 +82,7 @@
tool:ignore="all"/>
<ImageView
android:id="@+id/timetable_subItem_change_image"
android:id="@+id/timetable_subItem_alert_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"

1
app/src/main/res/values/colors.xml
View File

@ -4,7 +4,6 @@
<color name="colorPrimaryDark">#9a0007</color>
<color name="colorPrimaryLight">#ff6659</color>
<color name="colorBackgroundBottomNavi">#f0f0f0</color>
<color name="white">#ffffff</color>
<color name="six_grade">#92b53d</color>
<color name="five_grade">#66B266</color>
<color name="four_grade">#55BBDB</color>

2
app/src/main/res/values/strings.xml
View File

@ -33,7 +33,7 @@
<string name="dashboard_text">Dashboard</string>
<string name="grades_text">Grades</string>
<string name="attendance_text">Attendance</string>
<string name="lessonplan_text">Lesson Plan</string>
<string name="lessonplan_text">Timetable</string>
<string name="settings_text">Settings</string>
<string name="activity_under_construction">This section of app is under construction.</string>
<string name="fragment_no_grades">No grades</string>

5
app/src/main/res/values/styles.xml
View File

@ -12,12 +12,13 @@
<item name="android:textColorTertiaryInverse">@android:color/primary_text_dark</item>
<item name="titleTextColor">@android:color/primary_text_dark</item>
<item name="subtitleTextColor">@android:color/primary_text_dark</item>
<item name="android:colorBackground">@color/white</item>
<item name="android:colorBackground">@android:color/white</item>
</style>
<style name="WulkanowyTheme.noActionBar" parent="WulkanowyTheme">
<style name="WulkanowyTheme.SplashTheme" parent="WulkanowyTheme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowBackground">@drawable/splash_background</item>
</style>
</resources>