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

Refactorization of the app (#31)

Browse Source 
* Refactor LoadingTask
* Remove LoadingTask class
* Fix context leak in LoginTask
* Refactorisation GradesFragment
* Refactorization synchronization
* Fix leak in VulcanService
* Update mockito
* Add more tests for EntitiesCompare
* Fix Instant Run
* Add margin to grades
* Update ci android image
This commit is contained in:
Rafał Borcz
2017-11-06 17:25:38 +01:00
committed by Mikołaj Pich
parent 54112f73f1
commit e5ea6e0b41
32 changed files with 374 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,18 @@
android:layout_height="match_parent"
tools:context="io.github.wulkanowy.activity.dashboard.grades.GradesFragment">
<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" />
</RelativeLayout>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/grade_swipe_refresh"
android:layout_width="match_parent"
@ -15,18 +27,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<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" />
</RelativeLayout>
</android.support.v4.widget.SwipeRefreshLayout>
</android.support.design.widget.CoordinatorLayout>

5
app/src/main/res/layout/grade_item.xml
View File

@ -8,7 +8,7 @@
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginStart="5dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="10dp"
android:foreground="?attr/selectableItemBackgroundBorderless"
card_view:cardElevation="0dp">
@ -19,8 +19,7 @@
android:layout_marginEnd="7dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:layout_marginStart="7dp"
android:layout_marginTop="7dp">
android:layout_marginStart="7dp">
<TextView
android:id="@+id/grade_text"

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

@ -32,7 +32,7 @@
<string name="noInternet_text">Brak połączenia z internetem</string>
<string name="root_failed_text">To urządzenie posiada posiada podwyższone uprawnienia (root). Automatyczne logowanie zosatło wyłączone.</string>
<string name="encrypt_failed_text">Szyfrowanie nie powiodło się. Automatyczne logowanie zostało wyłączone</string>
<string name="version_text">Wersja\u0020</string>
<string name="version_text">Wersja %1$s</string>
<string name="dialog_description_text">Opis</string>
<string name="dialog_weight_text">Waga</string>
<string name="noDescription_text">Brak opisu</string>

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

@ -23,29 +23,33 @@
<string name="action_create_account">No account yet? Create one</string>
<string name="action_forgot_password">Forgot password?</string>
<string name="color_black_text">Black</string>
<string name="color_red_text">Red</string>
<string name="color_blue_text">Blue</string>
<string name="color_green_text">Green</string>
<string name="noColor_text">No color</string>
<string name="activity_dashboard_text">Dashboard Activity</string>
<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="settings_text">Settings</string>
<string name="noInternet_text">No internet connection</string>
<string name="root_failed_text">This device is rooted. Automatic login has been disabled</string>
<string name="encrypt_failed_text">Encryption failed. Automatic login has been disabled</string>
<string name="version_text">Version\u0020</string>
<string name="version_text">Version %1$s</string>
<string name="refresh_error_text">An error occurred while refreshing the content.</string>
<string name="dialog_description_text">Description</string>
<string name="dialog_weight_text">Weight</string>
<string name="noDescription_text">No description</string>
<string name="dialog_teacher_text">Teacher</string>
<string name="dialog_date_text">Date</string>
<string name="dialog_color_text">Color</string>
<string name="color_black_text">Black</string>
<string name="color_red_text">Red</string>
<string name="color_blue_text">Blue</string>
<string name="color_green_text">Green</string>
<string name="noColor_text">No color</string>
<string name="dialog_close">Close</string>
<string name="refresh_error_text">An error occurred while refreshing the content.</string>
<string name="snackbar_no_grades">No new grades</string>
<string name="snackbar_new_grade">Number of new grades: %1$d</string>