-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #40 from thunsaker/feature/permissions
Marshmallow Permissions Model
- Loading branch information
Showing
17 changed files
with
490 additions
and
241 deletions.
There are no files selected for viewing
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
224 changes: 191 additions & 33 deletions
224
mobile/src/main/java/com/thunsaker/rapido/ui/MainFragment.java
Large diffs are not rendered by default.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<bitmap xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:src="@drawable/rice_green" | ||
android:tileMode="repeat" | ||
android:dither="true" /> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<bitmap xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:src="@drawable/rice_orange" | ||
android:tileMode="repeat" | ||
android:dither="true" /> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<bitmap xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:src="@drawable/rice_yellow" | ||
android:tileMode="repeat" | ||
android:dither="true" /> |
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,32 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:orientation="vertical" | ||
android:gravity="center" | ||
android:layout_gravity="center" | ||
android:background="@drawable/rice_green_tiled"> | ||
|
||
<ImageView | ||
android:id="@+id/imagePermissionHeader" | ||
android:layout_width="120dp" | ||
android:layout_height="120dp" | ||
android:src="@drawable/permission_header_lock" | ||
android:gravity="center_horizontal" | ||
android:scaleType="fitCenter" | ||
android:contentDescription="@string/perm_header_image_lock" /> | ||
|
||
<TextView | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:textSize="@dimen/material_type_small" | ||
android:gravity="center" | ||
android:textColor="@color/white" | ||
android:layout_marginTop="@dimen/material_padding_quadruple" | ||
android:paddingBottom="@dimen/material_padding" | ||
android:layout_marginLeft="@dimen/material_keyline_1" | ||
android:layout_marginStart="@dimen/material_keyline_1" | ||
android:layout_marginRight="@dimen/material_keyline_1" | ||
android:layout_marginEnd="@dimen/material_keyline_1" | ||
android:text="@string/perm_get_accounts_explainer" /> | ||
</LinearLayout> |
34 changes: 34 additions & 0 deletions
34
mobile/src/main/res/layout/dialog_permissions_location.xml
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,34 @@ | ||
<?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="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:gravity="center" | ||
android:layout_gravity="center" | ||
android:background="@drawable/rice_orange_tiled" | ||
android:orientation="vertical"> | ||
|
||
<ImageView | ||
android:id="@+id/imagePermissionHeader" | ||
android:layout_width="120dp" | ||
android:layout_height="120dp" | ||
android:src="@drawable/permission_header_marker" | ||
android:layout_gravity="center_horizontal" | ||
android:scaleType="fitCenter" | ||
android:contentDescription="@string/perm_header_image_location" | ||
tools:ignore="UnusedAttribute"/> | ||
|
||
<TextView | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:textSize="@dimen/material_type_small" | ||
android:textColor="@color/white" | ||
android:gravity="center" | ||
android:layout_marginTop="@dimen/material_padding_quadruple" | ||
android:paddingBottom="@dimen/material_padding" | ||
android:layout_marginLeft="@dimen/material_keyline_1" | ||
android:layout_marginStart="@dimen/material_keyline_1" | ||
android:layout_marginRight="@dimen/material_keyline_1" | ||
android:layout_marginEnd="@dimen/material_keyline_1" | ||
android:text="@string/perm_location_explainer" /> | ||
</LinearLayout> |
Oops, something went wrong.