mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

Added "bookmarks" and "live" app shortcuts for Android 7.1+

Browse source
This commit is contained in:
Christophe Beyls 2016-12-11 14:18:09 +01:00
parent 84829c3345
commit 7e90352750
9 changed files with 87 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -1,13 +1,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 23 compileSdkVersion 25
buildToolsVersion "23.0.3" buildToolsVersion "25.0.1"
defaultConfig { defaultConfig {
applicationId "be.digitalia.fosdem" applicationId "be.digitalia.fosdem"
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 23 targetSdkVersion 25
versionCode 700138 versionCode 700138
versionName "1.3.8" versionName "1.3.8"
// Supported languages // Supported languages

3
app/src/main/AndroidManifest.xml
View file

@ -37,6 +37,9 @@
<meta-data <meta-data
android:name="android.app.default_searchable" android:name="android.app.default_searchable"
android:value=".activities.SearchResultActivity"/> android:value=".activities.SearchResultActivity"/>
<meta-data
android:name="android.app.shortcuts"
android:resource="@xml/shortcuts"/>
</activity> </activity>
<activity <activity
android:name=".activities.TrackScheduleActivity" android:name=".activities.TrackScheduleActivity"

15
app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
View file

@ -71,6 +71,9 @@ import be.digitalia.fosdem.widgets.AdapterLinearLayout;
*/ */
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
public static final String ACTION_SHORTCUT_BOOKMARKS = "be.digitalia.fosdem.intent.action.SHORTCUT_BOOKMARKS";
public static final String ACTION_SHORTCUT_LIVE = "be.digitalia.fosdem.intent.action.SHORTCUT_LIVE";
private enum Section { private enum Section {
TRACKS(TracksFragment.class, R.string.menu_tracks, R.drawable.ic_event_grey600_24dp, true, true), TRACKS(TracksFragment.class, R.string.menu_tracks, R.drawable.ic_event_grey600_24dp, true, true),
BOOKMARKS(BookmarksListFragment.class, R.string.menu_bookmarks, R.drawable.ic_bookmark_grey600_24dp, false, false), BOOKMARKS(BookmarksListFragment.class, R.string.menu_bookmarks, R.drawable.ic_bookmark_grey600_24dp, false, false),
@ -273,6 +276,18 @@ public class MainActivity extends AppCompatActivity {
// Restore current section // Restore current section
if (savedInstanceState == null) { if (savedInstanceState == null) {
currentSection = Section.TRACKS; currentSection = Section.TRACKS;
String action = getIntent().getAction();
if (action != null) {
switch (action) {
case ACTION_SHORTCUT_BOOKMARKS:
currentSection = Section.BOOKMARKS;
break;
case ACTION_SHORTCUT_LIVE:
currentSection = Section.LIVE;
break;
}
}
String fragmentClassName = currentSection.getFragmentClassName(); String fragmentClassName = currentSection.getFragmentClassName();
Fragment f = Fragment.instantiate(this, fragmentClassName); Fragment f = Fragment.instantiate(this, fragmentClassName);
getSupportFragmentManager().beginTransaction().add(R.id.content, f, fragmentClassName).commit(); getSupportFragmentManager().beginTransaction().add(R.id.content, f, fragmentClassName).commit();

2
app/src/main/res/drawable/ic_play_circle_outline_grey600_24dp.xml
View file

@ -5,5 +5,5 @@
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="#FF757575" android:fillColor="#FF757575"
android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/> android:pathData="@string/path_ic_play_circle_outline"/>
</vector> </vector>

18
app/src/main/res/drawable/ic_shortcut_bookmarks.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="48"
android:viewportWidth="48">
<path
android:fillColor="@color/shortcut_background"
android:pathData="@string/path_shortcut_background"/>
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/color_primary"
android:pathData="@string/path_ic_bookmark"/>
</group>
</vector>

18
app/src/main/res/drawable/ic_shortcut_live.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="48"
android:viewportWidth="48">
<path
android:fillColor="@color/shortcut_background"
android:pathData="@string/path_shortcut_background"/>
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/color_primary"
android:pathData="@string/path_ic_play_circle_outline"/>
</group>
</vector>

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

@ -11,5 +11,6 @@
<color name="schedule_time_background">#29000000</color> <color name="schedule_time_background">#29000000</color>
<color name="schedule_time_running_background">#d6000000</color> <color name="schedule_time_running_background">#d6000000</color>
<color name="error_material">#dd2c00</color> <color name="error_material">#dd2c00</color>
<color name="shortcut_background">#F5F5F5</color>
</resources> </resources>

2
app/src/main/res/values/vector_paths.xml
View file

@ -4,4 +4,6 @@
<string name="path_ic_bookmark_filler" translatable="false">M6,4h12v14h-12z</string> <string name="path_ic_bookmark_filler" translatable="false">M6,4h12v14h-12z</string>
<string name="path_ic_bookmark_check" translatable="false">M7.71,9.3L11,12.59L16.55,7.05</string> <string name="path_ic_bookmark_check" translatable="false">M7.71,9.3L11,12.59L16.55,7.05</string>
<string name="path_ic_bookmark_outline" translatable="false">M17,18V5H7V18L12,15.82L17,18M17,3A2,2 0 0,1 19,5V21L12,18L5,21V5C5,3.89 5.9,3 7,3H17M11,7H13V9H15V11H13V13H11V11H9V9H11V7Z</string> <string name="path_ic_bookmark_outline" translatable="false">M17,18V5H7V18L12,15.82L17,18M17,3A2,2 0 0,1 19,5V21L12,18L5,21V5C5,3.89 5.9,3 7,3H17M11,7H13V9H15V11H13V13H11V11H9V9H11V7Z</string>
<string name="path_ic_play_circle_outline" translatable="false">M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z</string>
<string name="path_shortcut_background" translatable="false">M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0</string>
</resources> </resources>

26
app/src/main/res/xml/shortcuts.xml Normal file
View file

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut
android:enabled="true"
android:icon="@drawable/ic_shortcut_bookmarks"
android:shortcutId="bookmarks"
android:shortcutShortLabel="@string/menu_bookmarks">
<intent
android:action="be.digitalia.fosdem.intent.action.SHORTCUT_BOOKMARKS"
android:targetClass="be.digitalia.fosdem.activities.MainActivity"
android:targetPackage="be.digitalia.fosdem"/>
</shortcut>
<shortcut
android:enabled="true"
android:icon="@drawable/ic_shortcut_live"
android:shortcutId="live"
android:shortcutShortLabel="@string/menu_live">
<intent
android:action="be.digitalia.fosdem.intent.action.SHORTCUT_LIVE"
android:targetClass="be.digitalia.fosdem.activities.MainActivity"
android:targetPackage="be.digitalia.fosdem"/>
</shortcut>
</shortcuts>