Skip to content

Commit

Permalink
Move namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
kilpkonn committed Aug 3, 2020
1 parent 1aa46e3 commit a756362
Show file tree
Hide file tree
Showing 63 changed files with 223 additions and 232 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android {
}

defaultConfig {
applicationId "ee.taltech.iti0213.sportsapp"
applicationId 'ee.taltech.kilpkonn.sportsapp'
minSdkVersion 21
targetSdkVersion 30
versionCode 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp
package ee.taltech.kilpkonn.sportsapp

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ee.taltech.iti0213.sportsapp">
package="ee.taltech.kilpkonn.sportsapp">
<!--
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
Google Maps Android API v2, but you must specify either coarse or fine
Expand All @@ -27,15 +27,15 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".activity.OverviewActivity"></activity>
<activity android:name="ee.taltech.kilpkonn.sportsapp.activity.OverviewActivity"></activity>
<activity
android:name=".activity.SettingsActivity"
android:name="ee.taltech.kilpkonn.sportsapp.activity.SettingsActivity"
android:launchMode="singleInstance" />
<activity
android:name=".activity.HistoryActivity"
android:name="ee.taltech.kilpkonn.sportsapp.activity.HistoryActivity"
android:launchMode="singleInstance" />
<activity
android:name=".activity.DetailActivity"
android:name="ee.taltech.kilpkonn.sportsapp.activity.DetailActivity"
android:launchMode="singleInstance" />
<!--
The API key for Google Maps-based APIs is defined as a string resource.
Expand All @@ -46,7 +46,7 @@
You can define the keys for the debug and release targets in src/debug/ and src/release/.
-->
<activity
android:name=".activity.MapsActivity"
android:name="ee.taltech.kilpkonn.sportsapp.activity.MapsActivity"
android:launchMode="singleInstance">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -59,7 +59,7 @@
Requires buildTools SDK >= 29
-->
<service
android:name=".service.LocationService"
android:name="ee.taltech.kilpkonn.sportsapp.service.LocationService"
android:enabled="true"
android:exported="true"
android:foregroundServiceType="location"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp
package ee.taltech.kilpkonn.sportsapp

class C {
companion object {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.activity
package ee.taltech.kilpkonn.sportsapp.activity

import android.annotation.SuppressLint
import android.app.Activity
Expand All @@ -17,15 +17,15 @@ import android.widget.*
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import ee.taltech.iti0213.sportsapp.C
import ee.taltech.iti0213.sportsapp.R
import ee.taltech.iti0213.sportsapp.component.spinner.adapter.TrackTypeSpinnerAdapter
import ee.taltech.iti0213.sportsapp.db.domain.User
import ee.taltech.iti0213.sportsapp.db.repository.UserRepository
import ee.taltech.iti0213.sportsapp.detector.FlingDetector
import ee.taltech.iti0213.sportsapp.track.TrackType
import ee.taltech.iti0213.sportsapp.track.converters.Converter
import ee.taltech.iti0213.sportsapp.track.pracelable.DetailedTrackData
import ee.taltech.kilpkonn.sportsapp.C
import ee.taltech.kilpkonn.sportsapp.R
import ee.taltech.kilpkonn.sportsapp.component.spinner.adapter.TrackTypeSpinnerAdapter
import ee.taltech.kilpkonn.sportsapp.db.domain.User
import ee.taltech.kilpkonn.sportsapp.db.repository.UserRepository
import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
import ee.taltech.kilpkonn.sportsapp.track.TrackType
import ee.taltech.kilpkonn.sportsapp.track.converters.Converter
import ee.taltech.kilpkonn.sportsapp.track.pracelable.DetailedTrackData


class DetailActivity : AppCompatActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.activity
package ee.taltech.kilpkonn.sportsapp.activity

import android.Manifest
import android.content.Intent
Expand All @@ -16,22 +16,22 @@ import androidx.core.app.ActivityCompat
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.textfield.TextInputLayout
import ee.taltech.iti0213.sportsapp.C
import ee.taltech.iti0213.sportsapp.R
import ee.taltech.iti0213.sportsapp.component.imageview.TrackTypeIcons
import ee.taltech.iti0213.sportsapp.component.spinner.ReplaySpinnerItems
import ee.taltech.iti0213.sportsapp.component.spinner.adapter.HistorySpinnerAdapter
import ee.taltech.iti0213.sportsapp.db.domain.TrackSummary
import ee.taltech.iti0213.sportsapp.detector.FlingDetector
import ee.taltech.iti0213.sportsapp.track.TrackType
import ee.taltech.iti0213.sportsapp.track.converters.Converter
import ee.taltech.iti0213.sportsapp.component.view.TrackIconImageView
import ee.taltech.iti0213.sportsapp.db.ReadDatabaseTask
import ee.taltech.iti0213.sportsapp.db.domain.User
import ee.taltech.iti0213.sportsapp.db.repository.*
import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
import ee.taltech.iti0213.sportsapp.util.TrackUtils
import ee.taltech.iti0213.sportsapp.util.serializer.TrackSerializer
import ee.taltech.kilpkonn.sportsapp.C
import ee.taltech.kilpkonn.sportsapp.R
import ee.taltech.kilpkonn.sportsapp.component.imageview.TrackTypeIcons
import ee.taltech.kilpkonn.sportsapp.component.spinner.ReplaySpinnerItems
import ee.taltech.kilpkonn.sportsapp.component.spinner.adapter.HistorySpinnerAdapter
import ee.taltech.kilpkonn.sportsapp.db.domain.TrackSummary
import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
import ee.taltech.kilpkonn.sportsapp.track.TrackType
import ee.taltech.kilpkonn.sportsapp.track.converters.Converter
import ee.taltech.kilpkonn.sportsapp.component.view.TrackIconImageView
import ee.taltech.kilpkonn.sportsapp.db.ReadDatabaseTask
import ee.taltech.kilpkonn.sportsapp.db.domain.User
import ee.taltech.kilpkonn.sportsapp.db.repository.*
import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
import ee.taltech.kilpkonn.sportsapp.util.TrackUtils
import ee.taltech.kilpkonn.sportsapp.util.serializer.TrackSerializer

class HistoryActivity : AppCompatActivity() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.activity
package ee.taltech.kilpkonn.sportsapp.activity

import android.Manifest
import android.animation.ArgbEvaluator
Expand Down Expand Up @@ -41,29 +41,29 @@ import com.google.android.gms.maps.SupportMapFragment
import com.google.android.gms.maps.model.*
import com.google.android.material.snackbar.Snackbar
import com.google.maps.android.ui.IconGenerator
import ee.taltech.iti0213.sportsapp.BuildConfig
import ee.taltech.iti0213.sportsapp.C
import ee.taltech.iti0213.sportsapp.R
import ee.taltech.iti0213.sportsapp.detector.FlingDetector
import ee.taltech.iti0213.sportsapp.service.LocationService
import ee.taltech.iti0213.sportsapp.component.spinner.CompassMode
import ee.taltech.iti0213.sportsapp.component.spinner.DisplayMode
import ee.taltech.iti0213.sportsapp.component.spinner.ReplaySpinnerItems
import ee.taltech.iti0213.sportsapp.component.spinner.RotationMode
import ee.taltech.iti0213.sportsapp.db.ReadDatabaseTask
import ee.taltech.iti0213.sportsapp.db.domain.TrackSummary
import ee.taltech.iti0213.sportsapp.db.domain.User
import ee.taltech.iti0213.sportsapp.db.repository.TrackLocationsRepository
import ee.taltech.iti0213.sportsapp.db.repository.TrackSummaryRepository
import ee.taltech.iti0213.sportsapp.db.repository.UserRepository
import ee.taltech.iti0213.sportsapp.provider.FakeLocationProvider
import ee.taltech.iti0213.sportsapp.track.TrackType
import ee.taltech.iti0213.sportsapp.track.converters.Converter
import ee.taltech.iti0213.sportsapp.track.pracelable.TrackData
import ee.taltech.iti0213.sportsapp.track.pracelable.TrackSyncData
import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
import ee.taltech.iti0213.sportsapp.util.filter.SimpleFilter
import ee.taltech.kilpkonn.sportsapp.BuildConfig
import ee.taltech.kilpkonn.sportsapp.C
import ee.taltech.kilpkonn.sportsapp.R
import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
import ee.taltech.kilpkonn.sportsapp.service.LocationService
import ee.taltech.kilpkonn.sportsapp.component.spinner.CompassMode
import ee.taltech.kilpkonn.sportsapp.component.spinner.DisplayMode
import ee.taltech.kilpkonn.sportsapp.component.spinner.ReplaySpinnerItems
import ee.taltech.kilpkonn.sportsapp.component.spinner.RotationMode
import ee.taltech.kilpkonn.sportsapp.db.ReadDatabaseTask
import ee.taltech.kilpkonn.sportsapp.db.domain.TrackSummary
import ee.taltech.kilpkonn.sportsapp.db.domain.User
import ee.taltech.kilpkonn.sportsapp.db.repository.TrackLocationsRepository
import ee.taltech.kilpkonn.sportsapp.db.repository.TrackSummaryRepository
import ee.taltech.kilpkonn.sportsapp.db.repository.UserRepository
import ee.taltech.kilpkonn.sportsapp.provider.FakeLocationProvider
import ee.taltech.kilpkonn.sportsapp.track.TrackType
import ee.taltech.kilpkonn.sportsapp.track.converters.Converter
import ee.taltech.kilpkonn.sportsapp.track.pracelable.TrackData
import ee.taltech.kilpkonn.sportsapp.track.pracelable.TrackSyncData
import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
import ee.taltech.kilpkonn.sportsapp.util.filter.SimpleFilter
import java.lang.Math.toDegrees
import kotlin.math.min
import kotlin.math.pow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package ee.taltech.iti0213.sportsapp.activity
package ee.taltech.kilpkonn.sportsapp.activity

import android.os.Bundle
import android.view.MotionEvent
import android.view.View
import android.widget.*
import androidx.appcompat.app.AppCompatActivity
import ee.taltech.iti0213.sportsapp.R
import ee.taltech.iti0213.sportsapp.component.imageview.TrackTypeIcons
import ee.taltech.iti0213.sportsapp.component.spinner.OverviewMode
import ee.taltech.iti0213.sportsapp.component.spinner.adapter.OverviewTypeSpinnerAdapter
import ee.taltech.iti0213.sportsapp.db.domain.User
import ee.taltech.iti0213.sportsapp.db.repository.TrackSummaryRepository
import ee.taltech.iti0213.sportsapp.db.repository.UserRepository
import ee.taltech.iti0213.sportsapp.detector.FlingDetector
import ee.taltech.iti0213.sportsapp.track.TrackType
import ee.taltech.iti0213.sportsapp.track.converters.Converter
import ee.taltech.kilpkonn.sportsapp.R
import ee.taltech.kilpkonn.sportsapp.component.imageview.TrackTypeIcons
import ee.taltech.kilpkonn.sportsapp.component.spinner.OverviewMode
import ee.taltech.kilpkonn.sportsapp.component.spinner.adapter.OverviewTypeSpinnerAdapter
import ee.taltech.kilpkonn.sportsapp.db.domain.User
import ee.taltech.kilpkonn.sportsapp.db.repository.TrackSummaryRepository
import ee.taltech.kilpkonn.sportsapp.db.repository.UserRepository
import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
import ee.taltech.kilpkonn.sportsapp.track.TrackType
import ee.taltech.kilpkonn.sportsapp.track.converters.Converter

class OverviewActivity : AppCompatActivity() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package ee.taltech.iti0213.sportsapp.activity
package ee.taltech.kilpkonn.sportsapp.activity

import android.content.Intent
import android.os.Bundle
import android.util.Log
import android.view.MotionEvent
Expand All @@ -10,22 +9,19 @@ import android.widget.*
import android.widget.SeekBar.OnSeekBarChangeListener
import androidx.appcompat.app.AppCompatActivity
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.google.android.material.snackbar.Snackbar
import ee.taltech.iti0213.sportsapp.C
import ee.taltech.iti0213.sportsapp.R
import ee.taltech.iti0213.sportsapp.api.controller.AccountController
import ee.taltech.iti0213.sportsapp.api.controller.TrackSyncController
import ee.taltech.iti0213.sportsapp.api.dto.LoginDto
import ee.taltech.iti0213.sportsapp.api.dto.RegisterDto
import ee.taltech.iti0213.sportsapp.component.spinner.adapter.TrackTypeSpinnerAdapter
import ee.taltech.iti0213.sportsapp.db.domain.User
import ee.taltech.iti0213.sportsapp.db.repository.*
import ee.taltech.iti0213.sportsapp.detector.FlingDetector
import ee.taltech.iti0213.sportsapp.track.Track
import ee.taltech.iti0213.sportsapp.track.TrackType
import ee.taltech.iti0213.sportsapp.util.HashUtils
import ee.taltech.iti0213.sportsapp.util.TrackUtils
import ee.taltech.kilpkonn.sportsapp.R
import ee.taltech.kilpkonn.sportsapp.api.controller.AccountController
import ee.taltech.kilpkonn.sportsapp.api.controller.TrackSyncController
import ee.taltech.kilpkonn.sportsapp.api.dto.LoginDto
import ee.taltech.kilpkonn.sportsapp.api.dto.RegisterDto
import ee.taltech.kilpkonn.sportsapp.component.spinner.adapter.TrackTypeSpinnerAdapter
import ee.taltech.kilpkonn.sportsapp.db.domain.User
import ee.taltech.kilpkonn.sportsapp.db.repository.*
import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
import ee.taltech.kilpkonn.sportsapp.track.TrackType
import ee.taltech.kilpkonn.sportsapp.util.HashUtils
import ee.taltech.kilpkonn.sportsapp.util.TrackUtils

class SettingsActivity : AppCompatActivity() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.api
package ee.taltech.kilpkonn.sportsapp.api

import android.content.Context
import android.text.TextUtils
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.api.controller
package ee.taltech.kilpkonn.sportsapp.api.controller

import android.content.Context
import android.util.Log
Expand All @@ -7,13 +7,11 @@ import com.android.volley.Request
import com.android.volley.Response
import com.android.volley.toolbox.JsonObjectRequest
import com.fasterxml.jackson.databind.ObjectMapper
import ee.taltech.iti0213.sportsapp.api.WebApiHandler
import ee.taltech.iti0213.sportsapp.api.dto.GpsSessionDto
import ee.taltech.iti0213.sportsapp.api.dto.LoginDto
import ee.taltech.iti0213.sportsapp.api.dto.LoginResponseDto
import ee.taltech.iti0213.sportsapp.api.dto.RegisterDto
import ee.taltech.kilpkonn.sportsapp.api.WebApiHandler
import ee.taltech.kilpkonn.sportsapp.api.dto.LoginDto
import ee.taltech.kilpkonn.sportsapp.api.dto.LoginResponseDto
import ee.taltech.kilpkonn.sportsapp.api.dto.RegisterDto
import org.json.JSONObject
import java.nio.charset.Charset


class AccountController private constructor(val context: Context) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package ee.taltech.iti0213.sportsapp.api.controller
package ee.taltech.kilpkonn.sportsapp.api.controller

import android.content.Context
import android.util.Log
import android.widget.Toast
import com.fasterxml.jackson.databind.ObjectMapper
import ee.taltech.iti0213.sportsapp.api.WebApiHandler
import ee.taltech.iti0213.sportsapp.api.dto.BulkUploadResponseDto
import ee.taltech.iti0213.sportsapp.api.dto.GpsLocationDto
import ee.taltech.iti0213.sportsapp.api.dto.GpsSessionDto
import ee.taltech.kilpkonn.sportsapp.api.WebApiHandler
import ee.taltech.kilpkonn.sportsapp.api.dto.BulkUploadResponseDto
import ee.taltech.kilpkonn.sportsapp.api.dto.GpsLocationDto
import ee.taltech.kilpkonn.sportsapp.api.dto.GpsSessionDto
import org.json.JSONArray
import org.json.JSONObject
import java.nio.charset.Charset
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.api.dto
package ee.taltech.kilpkonn.sportsapp.api.dto

import com.fasterxml.jackson.annotation.JsonProperty

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package ee.taltech.iti0213.sportsapp.api.dto
package ee.taltech.kilpkonn.sportsapp.api.dto

import com.fasterxml.jackson.annotation.JsonFormat
import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.Checkpoint
import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.Checkpoint
import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
import java.util.*

@JsonInclude(JsonInclude.Include.NON_NULL)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.api.dto
package ee.taltech.kilpkonn.sportsapp.api.dto

import com.fasterxml.jackson.annotation.JsonFormat
import com.fasterxml.jackson.annotation.JsonInclude
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.api.dto
package ee.taltech.kilpkonn.sportsapp.api.dto

import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.api.dto
package ee.taltech.kilpkonn.sportsapp.api.dto

import com.fasterxml.jackson.annotation.JsonProperty

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.api.dto
package ee.taltech.kilpkonn.sportsapp.api.dto

import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ee.taltech.iti0213.sportsapp.component.imageview
package ee.taltech.kilpkonn.sportsapp.component.imageview

import ee.taltech.iti0213.sportsapp.R
import ee.taltech.iti0213.sportsapp.track.TrackType
import ee.taltech.kilpkonn.sportsapp.R
import ee.taltech.kilpkonn.sportsapp.track.TrackType

class TrackTypeIcons {
companion object {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ee.taltech.iti0213.sportsapp.component.spinner
package ee.taltech.kilpkonn.sportsapp.component.spinner

class CompassMode {
companion object {
Expand Down
Loading

0 comments on commit a756362

Please sign in to comment.