Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Close #27 - Compatibility with Android 2.3
- Loading branch information
1 parent
4a02dbf
commit 128e1e9
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <RelativeLayout 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:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:paddingBottom="32dp" | ||
| tools:context="ua.samosfator.moduleok.fragment.LoginFragment"> | ||
|
|
||
| <TextView | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" | ||
| android:text="@string/login_explanation" | ||
| android:id="@+id/textView" | ||
| android:padding="16dp" | ||
| android:gravity="center" | ||
| android:layout_marginBottom="24dp" | ||
| android:textColor="@color/textColorPrimary" | ||
| android:textSize="26sp" | ||
| android:background="@color/colorPrimary" | ||
| android:layout_above="@+id/login_editText" | ||
| android:layout_alignParentTop="true" | ||
| android:layout_alignParentLeft="true" | ||
| android:layout_alignParentStart="true" | ||
| android:layout_alignParentRight="true" | ||
| android:layout_alignParentEnd="true"/> | ||
|
|
||
| <com.rengwuxian.materialedittext.MaterialEditText | ||
| app:baseColor="@color/grey_900" | ||
| app:primaryColor="@color/colorPrimary" | ||
| app:floatingLabel="normal" | ||
| app:minCharacters="4" | ||
| app:maxCharacters="16" | ||
| android:id="@+id/login_editText" | ||
| android:layout_width="@dimen/login_fields_with" | ||
| android:layout_height="wrap_content" | ||
| android:text="" | ||
| android:textSize="16sp" | ||
| android:hint="@string/login_editText_hint" | ||
| android:layout_centerVertical="true" | ||
| android:layout_centerHorizontal="true" | ||
| android:inputType="textNoSuggestions"/> | ||
|
|
||
| <com.rengwuxian.materialedittext.MaterialEditText | ||
| app:baseColor="@color/grey_900" | ||
| app:primaryColor="@color/colorPrimary" | ||
| app:floatingLabel="normal" | ||
| app:minCharacters="4" | ||
| app:maxCharacters="16" | ||
| android:id="@+id/password_editText" | ||
| android:layout_width="@dimen/login_fields_with" | ||
| android:layout_height="wrap_content" | ||
| android:text="" | ||
| android:textSize="16sp" | ||
| android:layout_below="@+id/login_editText" | ||
| android:layout_centerHorizontal="true" | ||
| android:hint="@string/password_editText_hint" | ||
| android:layout_marginTop="8dp" | ||
| android:inputType="textPassword"/> | ||
|
|
||
| <Button | ||
| android:layout_below="@+id/password_editText" | ||
| android:layout_alignRight="@+id/password_editText" | ||
| android:layout_alignEnd="@+id/password_editText" | ||
| android:layout_marginTop="42dp" | ||
| android:id="@+id/btnWithText" | ||
| android:layout_width="@dimen/login_fields_with" | ||
| android:layout_height="64dp" | ||
| android:textColor="@color/grey_100" | ||
| android:textSize="18sp" | ||
| android:text="@string/login_btn_txt" | ||
| android:background="@drawable/button_ripple"/> | ||
|
|
||
| </RelativeLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <FrameLayout | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_height="match_parent" | ||
| android:layout_width="match_parent"> | ||
|
|
||
| <Button | ||
| android:id="@+id/section_text" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="48dp" | ||
| android:text="Section name" | ||
| android:paddingLeft="16dp" | ||
| android:paddingRight="16dp" | ||
| android:paddingBottom="8dp" | ||
| android:paddingTop="8dp" | ||
| android:textAllCaps="false" | ||
| android:textSize="16sp" | ||
| android:fontFamily="sans-serif-light" | ||
| android:gravity="center_vertical" | ||
| android:drawableLeft="@drawable/ic_login_grey600_24dp" | ||
| android:drawablePadding="32dp" | ||
| tools:ignore="RtlHardcoded" | ||
| android:background="@drawable/empty"/> | ||
| </FrameLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| <LinearLayout 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/subject_item_layout" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_margin="0dp" | ||
| android:orientation="horizontal" | ||
| tools:context="ua.samosfator.moduleok.fragment.last_total_fragment.LastTotalFragment"> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:padding="8dp" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <ViewFlipper | ||
| android:id="@+id/subject_score_view_flipper" | ||
| android:layout_width="wrap_content" | ||
| android:layout_gravity="center_vertical" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/subject_score" | ||
| android:layout_width="@dimen/score_wrapper_size" | ||
| android:layout_height="@dimen/score_wrapper_size" | ||
| android:text="75" | ||
| android:textColor="@color/textColorPrimary" | ||
| android:gravity="center" | ||
| android:textSize="22sp" | ||
| android:background="@drawable/circle_2" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/subject_total_score" | ||
| android:layout_width="@dimen/score_wrapper_size" | ||
| android:layout_height="@dimen/score_wrapper_size" | ||
| android:text="75" | ||
| android:layout_gravity="center_vertical" | ||
| android:textColor="@color/textColorPrimary" | ||
| android:gravity="center" | ||
| android:textSize="22sp" | ||
| android:background="@drawable/circle_2" /> | ||
| </ViewFlipper> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:paddingLeft="16dp" | ||
| android:gravity="center_vertical" | ||
| tools:ignore="RtlHardcoded,RtlSymmetry"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/subject_name" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="Філософія" | ||
| android:singleLine="true" | ||
| android:textColor="@color/primary_text_default_material_light" | ||
| android:layout_gravity="center_vertical" | ||
| android:textSize="20sp" /> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="wrap_content" | ||
| android:orientation="horizontal" | ||
| android:paddingLeft="2dp" | ||
| android:paddingTop="4dp" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/finish_flag" | ||
| android:layout_width="24dp" | ||
| android:layout_height="24dp" | ||
| android:layout_marginLeft="-24dp" | ||
| android:layout_marginTop="-4dp"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/subject_date" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="02.02.14" | ||
| android:textColor="@color/grey_700" | ||
| android:layout_gravity="center_vertical" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/subject_weight" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="40%" | ||
| android:textColor="@color/grey_500" | ||
| android:paddingLeft="8dp" | ||
| android:layout_gravity="center_vertical" | ||
| android:textSize="14sp" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/subject_control_type" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="" | ||
| android:textColor="@color/grey_200" | ||
| android:paddingLeft="8dp" | ||
| android:layout_gravity="center_vertical" | ||
| android:textSize="14sp" /> | ||
| </LinearLayout> | ||
| </LinearLayout> | ||
| </LinearLayout> | ||
| </LinearLayout> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
lolled of that naming