upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-22 10:15:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added AndroidX appcompat.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-11 21:45:50 +02:00
parent 2763c27283
commit 840ea69276
8 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/build.gradle
+2 -2
View File
@@ -23,6 +23,6 @@ dependencies {
implementation project(':myTracksLib') implementation project(':myTracksLib')
implementation 'com.google.android.gms:play-services-location:17.0.0' implementation 'com.google.android.gms:play-services-location:17.0.0'
//implementation 'com.google.android.gms:play-services:12.0.1'
//implementation 'com.google.android.gms:play-services-auth:17.0.0' implementation 'androidx.appcompat:appcompat:1.0.0'
} }
myTracks/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java
+2
View File
@@ -28,6 +28,7 @@ import android.app.Activity;
import android.app.SearchManager; import android.app.SearchManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.util.Log;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.Menu; import android.view.Menu;
@@ -129,6 +130,7 @@ public abstract class AbstractTrackActivity extends AbstractActivity implements
if (searchView == null) { if (searchView == null) {
//TODO This is a workaround and needs to be fixed; looks like a configuration issue. //TODO This is a workaround and needs to be fixed; looks like a configuration issue.
Log.d(AbstractTrackActivity.class.getCanonicalName(), "Search is not yet implemented.");
return; return;
} }
myTracks/src/main/res/menu/list_context_menu.xml
+19 -11
View File
@@ -13,30 +13,38 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:icon="@drawable/ic_menu_share"
android:id="@+id/list_context_menu_share" android:id="@+id/list_context_menu_share"
android:icon="@drawable/ic_menu_share"
android:title="@string/menu_share" android:title="@string/menu_share"
android:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item
android:id="@+id/track_detail_share"
android:icon="@drawable/ic_menu_share"
android:orderInCategory="4"
android:title="@string/menu_share"
app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider"
app:showAsAction="ifRoom" />
<item <item
android:icon="@drawable/ic_menu_show_on_map"
android:id="@+id/list_context_menu_show_on_map" android:id="@+id/list_context_menu_show_on_map"
android:icon="@drawable/ic_menu_show_on_map"
android:title="@string/menu_show_on_map" android:title="@string/menu_show_on_map"
android:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:icon="@drawable/ic_menu_edit"
android:id="@+id/list_context_menu_edit" android:id="@+id/list_context_menu_edit"
android:icon="@drawable/ic_menu_edit"
android:title="@string/menu_edit" android:title="@string/menu_edit"
android:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:icon="@drawable/ic_menu_delete"
android:id="@+id/list_context_menu_delete" android:id="@+id/list_context_menu_delete"
android:icon="@drawable/ic_menu_delete"
android:title="@string/menu_delete" android:title="@string/menu_delete"
android:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:icon="@drawable/ic_menu_select_all"
android:id="@+id/list_context_menu_select_all" android:id="@+id/list_context_menu_select_all"
android:icon="@drawable/ic_menu_select_all"
android:title="@string/menu_select_all" android:title="@string/menu_select_all"
android:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
</menu> </menu>
myTracks/src/main/res/menu/marker_detail.xml
+10 -9
View File
@@ -13,25 +13,26 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/marker_detail_show_on_map" android:id="@+id/marker_detail_show_on_map"
android:icon="@drawable/ic_menu_show_on_map" android:icon="@drawable/ic_menu_show_on_map"
android:showAsAction="ifRoom" android:title="@string/menu_show_on_map"
android:title="@string/menu_show_on_map" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/marker_detail_edit" android:id="@+id/marker_detail_edit"
android:icon="@drawable/ic_menu_edit" android:icon="@drawable/ic_menu_edit"
android:showAsAction="ifRoom" android:title="@string/menu_edit"
android:title="@string/menu_edit" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/marker_detail_delete" android:id="@+id/marker_detail_delete"
android:icon="@drawable/ic_menu_delete" android:icon="@drawable/ic_menu_delete"
android:showAsAction="ifRoom" android:title="@string/menu_delete"
android:title="@string/menu_delete" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/marker_detail_view_photo" android:id="@+id/marker_detail_view_photo"
android:icon="@drawable/ic_menu_view_photo" android:icon="@drawable/ic_menu_view_photo"
android:showAsAction="ifRoom" android:title="@string/menu_view_photo"
android:title="@string/menu_view_photo" /> app:showAsAction="ifRoom" />
</menu> </menu>
myTracks/src/main/res/menu/marker_list.xml
+8 -7
View File
@@ -13,16 +13,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:icon="@drawable/ic_menu_insert_marker"
android:id="@+id/marker_list_insert_marker" android:id="@+id/marker_list_insert_marker"
android:showAsAction="ifRoom" android:icon="@drawable/ic_menu_insert_marker"
android:title="@string/menu_insert_marker" /> android:title="@string/menu_insert_marker"
app:showAsAction="ifRoom" />
<item <item
android:icon="@drawable/ic_menu_search"
android:id="@+id/marker_list_search" android:id="@+id/marker_list_search"
android:icon="@drawable/ic_menu_search"
android:title="@string/menu_search" android:title="@string/menu_search"
android:showAsAction="ifRoom|collapseActionView" app:actionViewClass="androidx.appcompat.widget.SearchView"
android:actionViewClass="androidx.appcompat.widget.SearchView" /> app:showAsAction="ifRoom|collapseActionView" />
</menu> </menu>
myTracks/src/main/res/menu/search_list.xml
+5 -4
View File
@@ -13,11 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:icon="@drawable/ic_menu_search"
android:id="@+id/search_list_search" android:id="@+id/search_list_search"
android:icon="@drawable/ic_menu_search"
android:title="@string/menu_search" android:title="@string/menu_search"
android:showAsAction="ifRoom|collapseActionView" app:actionViewClass="androidx.appcompat.widget.SearchView"
android:actionViewClass="androidx.appcompat.widget.SearchView" /> app:showAsAction="ifRoom|collapseActionView" />
</menu> </menu>
myTracks/src/main/res/menu/track_detail.xml
+19 -17
View File
@@ -13,58 +13,60 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:icon="@drawable/ic_menu_insert_marker"
android:id="@+id/track_detail_insert_marker" android:id="@+id/track_detail_insert_marker"
android:icon="@drawable/ic_menu_insert_marker"
android:orderInCategory="1" android:orderInCategory="1"
android:showAsAction="ifRoom" android:title="@string/menu_insert_marker"
android:title="@string/menu_insert_marker" /> app:showAsAction="ifRoom" />
<item <item
android:icon="@drawable/ic_menu_insert_photo"
android:id="@+id/track_detail_insert_photo" android:id="@+id/track_detail_insert_photo"
android:icon="@drawable/ic_menu_insert_photo"
android:orderInCategory="2" android:orderInCategory="2"
android:showAsAction="ifRoom" android:title="@string/menu_insert_photo"
android:title="@string/menu_insert_photo" /> app:showAsAction="ifRoom" />
<item <item
android:icon="@drawable/ic_menu_share"
android:id="@+id/track_detail_share" android:id="@+id/track_detail_share"
android:icon="@drawable/ic_menu_share"
android:orderInCategory="4" android:orderInCategory="4"
android:showAsAction="ifRoom" android:title="@string/menu_share"
android:title="@string/menu_share" /> app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider"
app:showAsAction="never" />
<item <item
android:icon="@drawable/ic_menu_markers"
android:id="@+id/track_detail_markers" android:id="@+id/track_detail_markers"
android:icon="@drawable/ic_menu_markers"
android:orderInCategory="5" android:orderInCategory="5"
android:title="@string/menu_markers" /> android:title="@string/menu_markers" />
<item <item
android:icon="@drawable/ic_menu_edit"
android:id="@+id/track_detail_edit" android:id="@+id/track_detail_edit"
android:icon="@drawable/ic_menu_edit"
android:orderInCategory="9" android:orderInCategory="9"
android:title="@string/menu_edit" /> android:title="@string/menu_edit" />
<item <item
android:icon="@drawable/ic_menu_delete"
android:id="@+id/track_detail_delete" android:id="@+id/track_detail_delete"
android:icon="@drawable/ic_menu_delete"
android:orderInCategory="10" android:orderInCategory="10"
android:title="@string/menu_delete" /> android:title="@string/menu_delete" />
<item <item
android:icon="@drawable/ic_menu_voice_frequency"
android:id="@+id/track_detail_voice_frequency" android:id="@+id/track_detail_voice_frequency"
android:icon="@drawable/ic_menu_voice_frequency"
android:orderInCategory="11" android:orderInCategory="11"
android:title="@string/menu_voice_frequency" /> android:title="@string/menu_voice_frequency" />
<item <item
android:icon="@drawable/ic_menu_split_frequency"
android:id="@+id/track_detail_split_frequency" android:id="@+id/track_detail_split_frequency"
android:icon="@drawable/ic_menu_split_frequency"
android:orderInCategory="12" android:orderInCategory="12"
android:title="@string/menu_split_frequency" /> android:title="@string/menu_split_frequency" />
<item <item
android:icon="@drawable/ic_menu_sensor_state"
android:id="@+id/track_detail_sensor_state" android:id="@+id/track_detail_sensor_state"
android:icon="@drawable/ic_menu_sensor_state"
android:orderInCategory="13" android:orderInCategory="13"
android:title="@string/menu_sensor_state" /> android:title="@string/menu_sensor_state" />
<item <item
android:icon="@drawable/ic_menu_settings"
android:id="@+id/track_detail_settings" android:id="@+id/track_detail_settings"
android:icon="@drawable/ic_menu_settings"
android:orderInCategory="14" android:orderInCategory="14"
android:title="@string/menu_settings" /> android:title="@string/menu_settings" />
</menu> </menu>
myTracks/src/main/res/menu/track_list.xml
+12 -12
View File
@@ -13,37 +13,37 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:app="http://schemas.android.com/apk/res-auto" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:icon="@drawable/ic_menu_search"
android:id="@+id/track_list_search" android:id="@+id/track_list_search"
android:icon="@drawable/ic_menu_search"
android:title="@string/menu_search" android:title="@string/menu_search"
android:actionViewClass="androidx.appcompat.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
android:showAsAction="always" /> app:showAsAction="always" />
<item <item
android:icon="@drawable/ic_menu_start_gps"
android:id="@+id/track_list_start_gps" android:id="@+id/track_list_start_gps"
android:icon="@drawable/ic_menu_start_gps"
android:title="@string/menu_start_gps" android:title="@string/menu_start_gps"
android:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:icon="@drawable/ic_menu_aggregated_statistics"
android:id="@+id/track_list_aggregated_statistics" android:id="@+id/track_list_aggregated_statistics"
android:icon="@drawable/ic_menu_aggregated_statistics"
android:title="@string/menu_aggregated_statistics" /> android:title="@string/menu_aggregated_statistics" />
<item <item
android:icon="@drawable/ic_menu_export"
android:id="@+id/track_list_export_all" android:id="@+id/track_list_export_all"
android:icon="@drawable/ic_menu_export"
android:title="@string/menu_export_all" /> android:title="@string/menu_export_all" />
<item <item
android:icon="@drawable/ic_menu_import"
android:id="@+id/track_list_import_all" android:id="@+id/track_list_import_all"
android:icon="@drawable/ic_menu_import"
android:title="@string/menu_import_all" /> android:title="@string/menu_import_all" />
<item <item
android:icon="@drawable/ic_menu_delete"
android:id="@+id/track_list_delete_all" android:id="@+id/track_list_delete_all"
android:icon="@drawable/ic_menu_delete"
android:title="@string/menu_delete_all" /> android:title="@string/menu_delete_all" />
<item <item
android:icon="@drawable/ic_menu_settings"
android:id="@+id/track_list_settings" android:id="@+id/track_list_settings"
android:icon="@drawable/ic_menu_settings"
android:title="@string/menu_settings" /> android:title="@string/menu_settings" />
</menu> </menu>