Skip to content

Chore/tabhost leftover ids #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
letharion wants to merge 10 commits into from
Closed

Chore/tabhost leftover ids #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8f3c6c4
fix: copy bundled workouts on fresh install (#1383)
roberi Sep 13, 2026
9436e47
fix: analyzeReleaseR8Config warnings (#1385)
gerhardol Sep 14, 2026
80b5a67
fix: gha tools install (#1388)
gerhardol Sep 16, 2026
b8a2f8e
fix: ble hr deprecation fixes (#1387)
gerhardol Sep 16, 2026
1a0c9bd
fix: use Log.e instead of printStackTrace in AboutPreference (#1391)
Threeguana Sep 17, 2026
51d80b7
refactor: migrate HistoryFragment to Activity Result API (#1390)
Threeguana Sep 19, 2026
960762c
fix: agp 9.4.1 (#1393)
gerhardol Sep 30, 2026
d001387
fix: deprecated TabHost
gerhardol Sep 29, 2026
04d9453
fix: use Material tabs on the activity details screen (#1396)
letharion Oct 7, 2026
a20a9fb
chore: remove leftovers from TabHost
letharion Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,23 @@ jobs:

- name: Git LFS Pull
run: git lfs pull

- name: Setup Android SDK
uses: android-actions/setup-android@v4
run: |
echo "ANDROID_HOME=/usr/local/lib/android/sdk" >> $GITHUB_ENV
echo "ANDROID_SDK_ROOT=/usr/local/lib/android/sdk" >> $GITHUB_ENV
echo "/usr/local/lib/android/sdk/cmdline-tools/latest/bin" >> $GITHUB_PATH
echo "/usr/local/lib/android/sdk/platform-tools" >> $GITHUB_PATH

- name: Install Android SDK components
run: |
sdkmanager "tools"
sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
sdkmanager "platforms;android-${ANDROID_API}"
yes | sdkmanager --licenses
sdkmanager "platforms;android-${{ env.ANDROID_API }}"
sdkmanager "build-tools;${{ env.ANDROID_BUILD_TOOLS }}"
sdkmanager "extras;android;m2repository"
sdkmanager "extras;google;m2repository"
sdkmanager "extras;google;google_play_services"

- name: Prepare builddir
run: |
# secrets are only available for collabrators, other will build with OsmDroid (but a few more options than F-Droid still)
Expand Down
14 changes: 3 additions & 11 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ android {
lint {
baseline = file('lint-baseline.xml')
checkReleaseBuilds = true
if (mapboxEnabled) {
if (rootProject.ext.mapboxEnabled) {
lintConfig = file('lint.xml')
} else {
lintConfig = file('lint-osmdroid.xml')
Expand Down Expand Up @@ -131,7 +131,8 @@ android {

repositories {
google()
mavenCentral() //MapBox GraphView
mavenCentral()
maven { url = 'https://jitpack.io' }
if (rootProject.ext.mapboxEnabled) {
maven {
url = 'https://api.mapbox.com/downloads/v2/releases/maven'
Expand Down Expand Up @@ -183,15 +184,6 @@ dependencies {
testImplementation "org.mockito:mockito-core:${rootProject.ext.mockitoVersion}"
}

allprojects {
tasks.withType(JavaCompile).tap {
configureEach {
// options.compilerArgs << "-Xlint:deprecation";
options.compilerArgs << "-Xlint:unchecked"
}
}
}

def props = new Properties()
// For locally signed builds only, Google Play signs the bundle
if (rootProject.file("release.properties").exists()) {
Expand Down
13 changes: 1 addition & 12 deletions app/lint-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 9.3.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.3.1)" variant="all" version="9.3.1">
<issues format="6" by="lint 9.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (9.4.1)" variant="all" version="9.4.1">

<issue
id="UnusedAttribute"
Expand All @@ -12,17 +12,6 @@
column="9"/>
</issue>

<issue
id="AppBundleLocaleChanges"
message="Found dynamic locale changes, but did not find corresponding Play Core library calls for downloading languages and splitting by language is not disabled in the `bundle` configuration"
errorLine1=" configuration.setLocale(locale);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/org/runnerup/util/Formatter.java"
line="830"
column="7"/>
</issue>

<issue
id="SourceLockedOrientationActivity"
message="You should not lock orientation of your activities, so that you can support a good user experience for any device or orientation"
Expand Down
Binary file removed app/res/drawable-mdpi/tab_selected_focused_holo.9.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/res/drawable-mdpi/tab_selected_holo.9.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/res/drawable-mdpi/tab_selected_pressed_holo.9.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/res/drawable-mdpi/tab_unselected_focused_holo.9.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/res/drawable-mdpi/tab_unselected_holo.9.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/res/drawable-mdpi/tab_unselected_pressed_holo.9.png
View file
Open in desktop
Binary file not shown.
29 changes: 0 additions & 29 deletions app/res/drawable/tab_indicator_holo.xml
View file
Open in desktop

This file was deleted.

209 changes: 101 additions & 108 deletions app/res/layout/detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,140 +88,133 @@
</LinearLayout>
</LinearLayout>

<TabHost
android:id="@+id/tabhost"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/buttons"
android:layout_below="@id/appbarlayout">
android:layout_below="@id/appbarlayout"
android:orientation="vertical">

<LinearLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/detail_tabs"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content" />

<TabWidget
android:id="@android:id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<FrameLayout
android:id="@android:id/tabcontent"
<LinearLayout
android:id="@+id/tab_main"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_margin="@dimen/activity_margin"
android:orientation="vertical">

<LinearLayout
android:id="@+id/tab_main"
<org.runnerup.widget.TitleSpinner
android:id="@+id/summary_sport"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/activity_margin"
android:orientation="vertical">
android:layout_height="wrap_content"
android:layout_marginTop="1px"
android:prompt="@string/Type"
android:text="@string/Sport" />

<org.runnerup.widget.TitleSpinner
android:id="@+id/summary_sport"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1px"
android:prompt="@string/Type"
android:text="@string/Sport" />

<org.runnerup.widget.TitleSpinner
android:id="@+id/summary_manual_distance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberDecimal"
android:minWidth="48dp"
android:minHeight="48dp"
android:prompt="@string/Type"
android:text="@string/Distance"
runnerup:type="distancepicker" />

<EditText
android:id="@+id/notes_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|start"
android:hint="@string/Notes_about_your_workout"
android:inputType="textCapSentences|textMultiLine"
android:minLines="4"
android:singleLine="false"
tools:ignore="AutoFill" />

<LinearLayout
android:id="@+id/hrzonesBarLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:orientation="vertical"
android:visibility="gone">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/Heartrate_zones_distribution"
android:textAlignment="center"
android:textColor="@android:color/white" />
</LinearLayout>
</LinearLayout>
<org.runnerup.widget.TitleSpinner
android:id="@+id/summary_manual_distance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberDecimal"
android:minWidth="48dp"
android:minHeight="48dp"
android:prompt="@string/Type"
android:text="@string/Distance"
runnerup:type="distancepicker" />

<EditText
android:id="@+id/notes_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|start"
android:hint="@string/Notes_about_your_workout"
android:inputType="textCapSentences|textMultiLine"
android:minLines="4"
android:singleLine="false"
tools:ignore="AutoFill" />

<LinearLayout
android:id="@+id/tab_lap"
android:id="@+id/hrzonesBarLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/activity_margin"
android:baselineAligned="false">
android:background="@android:color/black"
android:orientation="vertical"
android:visibility="gone">

<ListView
android:id="@+id/laplist"
android:layout_width="0dip"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_gravity="center"
android:text="@string/Heartrate_zones_distribution"
android:textAlignment="center"
android:textColor="@android:color/white" />
</LinearLayout>
</LinearLayout>

<LinearLayout
android:id="@+id/tab_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<org.runnerup.util.MapViewWrapper
android:id="@+id/mapview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

<ScrollView
android:id="@+id/tab_graph"
<LinearLayout
android:id="@+id/tab_lap"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/activity_margin"
android:baselineAligned="false">

<ListView
android:id="@+id/laplist"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>

<LinearLayout
android:id="@+id/tab_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<org.runnerup.util.MapViewWrapper
android:id="@+id/mapview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="none">
android:layout_height="match_parent" />
</LinearLayout>

<LinearLayout
android:id="@+id/graphview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/activity_margin"
android:orientation="vertical"
android:weightSum="1" />
</ScrollView>
<ScrollView
android:id="@+id/tab_graph"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="none">

<LinearLayout
android:id="@+id/tab_upload"
android:id="@+id/graphview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/activity_margin"
android:baselineAligned="false">
android:orientation="vertical"
android:weightSum="1" />
</ScrollView>

<ListView
android:id="@+id/report_list"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</TabHost>
<LinearLayout
android:id="@+id/tab_upload"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/activity_margin"
android:baselineAligned="false">

<ListView
android:id="@+id/report_list"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
</FrameLayout>
</LinearLayout>

<LinearLayout
android:id="@+id/buttons"
Expand Down
Loading
Loading