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

remove room-related things

This commit is contained in:
Lukas Winkler 2022-10-25 17:34:50 +02:00
parent d6c1184380
commit becd71dcb8
Signed by: lukas
GPG key ID: 54DE4D798D244853
51 changed files with 4 additions and 525 deletions

View file

@ -134,5 +134,4 @@ dependencies {
}
implementation 'com.squareup.okio:okio:3.2.0'
implementation 'com.squareup.moshi:moshi:1.14.0'
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
}

View file

@ -1,11 +1,9 @@
package org.matomocamp.companion.activities
import android.annotation.SuppressLint
import android.content.ActivityNotFoundException
import android.content.Intent
import android.content.SharedPreferences
import android.graphics.drawable.Animatable
import android.net.Uri
import android.nfc.NdefRecord
import android.os.Bundle
import android.view.KeyEvent
@ -16,7 +14,6 @@ import android.widget.TextView
import androidx.annotation.IdRes
import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.appcompat.app.AppCompatActivity
import androidx.browser.customtabs.CustomTabsIntent
import androidx.core.content.edit
import androidx.core.view.ViewCompat
import androidx.core.view.isInvisible
@ -27,18 +24,15 @@ import androidx.lifecycle.lifecycleScope
import org.matomocamp.companion.BuildConfig
import org.matomocamp.companion.R
import org.matomocamp.companion.api.MatomoCampApi
import org.matomocamp.companion.api.MatomoCampUrls
import org.matomocamp.companion.db.ScheduleDao
import org.matomocamp.companion.fragments.BookmarksListFragment
import org.matomocamp.companion.fragments.LiveFragment
import org.matomocamp.companion.fragments.MapFragment
import org.matomocamp.companion.fragments.PersonsListFragment
import org.matomocamp.companion.fragments.TracksFragment
import org.matomocamp.companion.model.DownloadScheduleResult
import org.matomocamp.companion.model.LoadingState
import org.matomocamp.companion.utils.CreateNfcAppDataCallback
import org.matomocamp.companion.utils.awaitCloseDrawer
import org.matomocamp.companion.utils.configureToolbarColors
import org.matomocamp.companion.utils.launchAndRepeatOnLifecycle
import org.matomocamp.companion.utils.setNfcAppDataPushMessageCallbackIfAvailable
import com.google.android.material.navigation.NavigationView

View file

@ -1,83 +0,0 @@
package org.matomocamp.companion.fragments
import android.content.ActivityNotFoundException
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import android.widget.ImageView
import androidx.browser.customtabs.CustomTabsIntent
import androidx.core.net.toUri
import androidx.core.view.MenuProvider
import androidx.fragment.app.Fragment
import org.matomocamp.companion.R
import org.matomocamp.companion.api.MatomoCampUrls.localNavigation
import org.matomocamp.companion.utils.configureToolbarColors
import org.matomocamp.companion.utils.invertImageColors
import org.matomocamp.companion.utils.isLightTheme
class MapFragment : Fragment(R.layout.fragment_map) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
requireActivity().addMenuProvider(object : MenuProvider {
override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
menuInflater.inflate(R.menu.map, menu)
}
override fun onMenuItemSelected(menuItem: MenuItem) = when (menuItem.itemId) {
R.id.directions -> {
launchDirections()
true
}
R.id.navigation -> {
launchLocalNavigation()
true
}
else -> false
}
}, this)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
view.findViewById<ImageView>(R.id.map).apply {
if (!context.isLightTheme) {
invertImageColors()
}
}
}
private fun launchDirections() {
// Build intent to start Google Maps directions
val uri = "https://maps.google.com/maps?f=d&daddr=${DESTINATION_LATITUDE},${DESTINATION_LONGITUDE}&dirflg=r".toUri()
val intent = Intent(Intent.ACTION_VIEW, uri)
try {
startActivity(intent)
} catch (ignore: ActivityNotFoundException) {
}
}
private fun launchLocalNavigation() {
try {
val context = requireContext()
CustomTabsIntent.Builder()
.configureToolbarColors(context, R.color.light_color_primary)
.setShowTitle(true)
.build()
.launchUrl(context, Uri.parse(localNavigation))
} catch (ignore: ActivityNotFoundException) {
}
}
companion object {
private const val DESTINATION_LATITUDE = 50.812375
private const val DESTINATION_LONGITUDE = 4.380734
}
}

View file

@ -1,28 +0,0 @@
package org.matomocamp.companion.widgets
import android.content.Context
import android.util.AttributeSet
import android.view.MotionEvent
import androidx.drawerlayout.widget.DrawerLayout
/**
* DrawerLayout which includes a fix to prevent crashes with PhotoView.
*
*
* See https://github.com/chrisbanes/PhotoView#issues-with-viewgroups
* http://code.google.com/p/android/issues/detail?id=18990
*/
class PhotoViewDrawerLayout : DrawerLayout {
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
return try {
super.onInterceptTouchEvent(ev)
} catch (e: Exception) {
false
}
}
}

View file

@ -1,87 +0,0 @@
package org.matomocamp.companion.widgets
import android.content.Context
import android.os.Parcel
import android.os.Parcelable
import android.util.AttributeSet
import androidx.core.view.doOnLayout
import androidx.customview.view.AbsSavedState
import com.github.chrisbanes.photoview.PhotoView
/**
* PhotoView which saves and restores the current scale and approximate position.
*/
class SaveStatePhotoView : PhotoView {
constructor(context: Context) : super(context)
constructor(context: Context, attr: AttributeSet?) : super(context, attr)
constructor(context: Context, attr: AttributeSet?, defStyle: Int) : super(context, attr, defStyle)
override fun onSaveInstanceState(): Parcelable? {
val superState = super.onSaveInstanceState()
val rect = displayRect
val overflowWidth = rect.width() - width
val pivotX = if (overflowWidth > 0f) {
-rect.left / overflowWidth
} else 0.5f
val overflowHeight = rect.height() - height
val pivotY = if (overflowHeight > 0f) {
-rect.top / overflowHeight
} else 0.5f
return SavedState(superState ?: AbsSavedState.EMPTY_STATE, scale, pivotX, pivotY)
}
override fun onRestoreInstanceState(state: Parcelable) {
if (state !is SavedState) {
super.onRestoreInstanceState(state)
return
}
super.onRestoreInstanceState(state.superState)
doOnLayout {
setScale(state.scale.coerceIn(minimumScale, maximumScale),
width * state.pivotX,
height * state.pivotY,
false)
}
}
class SavedState : AbsSavedState {
val scale: Float
val pivotX: Float
val pivotY: Float
constructor(superState: Parcelable, scale: Float, pivotX: Float, pivotY: Float) : super(superState) {
this.scale = scale
this.pivotX = pivotX
this.pivotY = pivotY
}
override fun writeToParcel(out: Parcel, flags: Int) {
super.writeToParcel(out, flags)
out.writeFloat(scale)
out.writeFloat(pivotX)
out.writeFloat(pivotY)
}
private constructor(source: Parcel, loader: ClassLoader?) : super(source, loader) {
scale = source.readFloat()
pivotX = source.readFloat()
pivotY = source.readFloat()
}
companion object {
@JvmField
@Suppress("UNUSED")
val CREATOR = object : Parcelable.ClassLoaderCreator<SavedState> {
override fun createFromParcel(source: Parcel, loader: ClassLoader?) = SavedState(source, loader)
override fun createFromParcel(source: Parcel) = SavedState(source, null)
override fun newArray(size: Int) = arrayOfNulls<SavedState>(size)
}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="75dp"
android:drawable="@drawable/shape_room"
android:left="194dp"
android:right="66dp"
android:top="257dp"/>
<item android:drawable="@drawable/room_aw1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="75dp"
android:drawable="@drawable/shape_room"
android:left="5dp"
android:right="255dp"
android:top="284dp"/>
<item android:drawable="@drawable/room_aw1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="129dp"
android:drawable="@drawable/shape_room"
android:left="5dp"
android:right="255dp"
android:top="230dp"/>
<item android:drawable="@drawable/room_aw1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="326dp"
android:drawable="@drawable/shape_room"
android:left="49dp"
android:right="179dp"
android:top="5dp"/>
<item android:drawable="@drawable/room_aw1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="230dp"
android:drawable="@drawable/shape_room"
android:left="83dp"
android:right="142dp"
android:top="119dp"/>
<item android:drawable="@drawable/room_aw1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="211dp"
android:drawable="@drawable/shape_room"
android:left="164dp"
android:right="65dp"
android:top="119dp"/>
<item android:drawable="@drawable/room_aw1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="261dp"
android:drawable="@drawable/shape_room"
android:left="90dp"
android:right="547dp"
android:top="69dp"/>
<item android:drawable="@drawable/room_h1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="261dp"
android:drawable="@drawable/shape_room"
android:left="181dp"
android:right="442dp"
android:top="72dp"/>
<item android:drawable="@drawable/room_h1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="263dp"
android:drawable="@drawable/shape_room"
android:left="366dp"
android:right="261dp"
android:top="96dp"/>
<item android:drawable="@drawable/room_h1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="263dp"
android:drawable="@drawable/shape_room"
android:left="468dp"
android:right="165dp"
android:top="98dp"/>
<item android:drawable="@drawable/room_h1"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="241dp"
android:drawable="@drawable/shape_room"
android:left="424dp"
android:right="245dp"
android:top="75dp"/>
<item android:drawable="@drawable/room_h2"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="316dp"
android:drawable="@drawable/shape_room"
android:left="486dp"
android:right="163dp"
android:top="5dp"/>
<item android:drawable="@drawable/room_h2"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="241dp"
android:drawable="@drawable/shape_room"
android:left="486dp"
android:right="161dp"
android:top="80dp"/>
<item android:drawable="@drawable/room_h2"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="243dp"
android:drawable="@drawable/shape_room"
android:left="545dp"
android:right="67dp"
android:top="46dp"/>
<item android:drawable="@drawable/room_h2"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="116dp"
android:drawable="@drawable/shape_room"
android:left="46dp"
android:right="420dp"
android:top="191dp"/>
<item android:drawable="@drawable/room_k3"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="209dp"
android:drawable="@drawable/shape_room"
android:left="46dp"
android:right="420dp"
android:top="97dp"/>
<item android:drawable="@drawable/room_k3"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="303dp"
android:drawable="@drawable/shape_room"
android:left="46dp"
android:right="420dp"
android:top="4dp"/>
<item android:drawable="@drawable/room_k3"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="99dp"
android:drawable="@drawable/shape_room"
android:left="46dp"
android:right="434dp"
android:top="196dp"/>
<item android:drawable="@drawable/room_k4"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="195dp"
android:drawable="@drawable/shape_room"
android:left="46dp"
android:right="434dp"
android:top="100dp"/>
<item android:drawable="@drawable/room_k4"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="292dp"
android:drawable="@drawable/shape_room"
android:left="46dp"
android:right="434dp"
android:top="4dp"/>
<item android:drawable="@drawable/room_k4"/>
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="173dp"
android:drawable="@drawable/shape_room"
android:left="586dp"
android:right="5dp"
android:top="129dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="95dp"
android:drawable="@drawable/shape_room"
android:left="587dp"
android:right="5dp"
android:top="209dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="54dp"
android:drawable="@drawable/shape_room"
android:left="485dp"
android:right="108dp"
android:top="230dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="3dp"
android:drawable="@drawable/shape_room"
android:left="519dp"
android:right="73dp"
android:top="309dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="3dp"
android:drawable="@drawable/shape_room"
android:left="206dp"
android:right="334dp"
android:top="299dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="139dp"
android:drawable="@drawable/shape_room"
android:left="3dp"
android:right="614dp"
android:top="180dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="54dp"
android:drawable="@drawable/shape_room"
android:left="3dp"
android:right="589dp"
android:top="213dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="190dp"
android:drawable="@drawable/shape_room"
android:left="97dp"
android:right="504dp"
android:top="122dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="61dp"
android:drawable="@drawable/shape_room"
android:left="105dp"
android:right="489dp"
android:top="207dp" />
<item android:drawable="@drawable/room_u2" />
</layer-list>

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#92bdd9"/>
</shape>

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<org.matomocamp.companion.widgets.SaveStatePhotoView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/map"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
android:src="@drawable/campusmap"/>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<org.matomocamp.companion.widgets.PhotoViewDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
@ -73,4 +73,4 @@
</com.google.android.material.navigation.NavigationView>
</org.matomocamp.companion.widgets.PhotoViewDrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

View file

@ -7,5 +7,4 @@
android:paddingHorizontal="@dimen/main_menu_padding"
android:paddingTop="@dimen/main_menu_padding"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_matomocamp_logo_textonly"
app:tint="?colorOnSurface" />
app:srcCompat="@drawable/ic_matomocamp_logo_textonly" />

View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Room images aliases -->
<drawable name="room_chavanne">@drawable/room_ud2120</drawable>
<drawable name="room_ferrer">@drawable/room_h2215</drawable>
<drawable name="room_guillissen">@drawable/room_ua2220</drawable>
<drawable name="room_lameere">@drawable/room_ub2252</drawable>
<drawable name="room_ua2">@drawable/room_u2</drawable>
<drawable name="room_ub2">@drawable/room_u2</drawable>
<drawable name="room_ud2">@drawable/room_u2</drawable>
</resources>

View file

@ -169,7 +169,5 @@ and adapted to MatomoCamp by <a href="https://lw1.at/">Lukas Winkler</a>.
\n- <a href="https://github.com/square/okhttp">OkHttp</a><i> by Square, Inc.</i>
\n- <a href="https://github.com/square/moshi">Moshi</a><i> by Square, Inc.</i>
\n- <a href="https://github.com/JetBrains/kotlin">Kotlin Standard Library</a><i> by JetBrains s.r.o. and Kotlin Programming Language contributors</i>
\n- <a href="https://github.com/Kotlin/kotlinx.coroutines">kotlinx.coroutines</a><i> by JetBrains s.r.o.</i>
\n- <a href="https://github.com/chrisbanes/PhotoView">PhotoView</a><i> by Chris Banes, Marek Sebera and John Carlson</i></small></string>
\n- <a href="https://github.com/Kotlin/kotlinx.coroutines">kotlinx.coroutines</a><i> by JetBrains s.r.o.</i></small></string>
</resources>