mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-30 06:13:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed package LocationPicker to locationpicker

Browse source
This commit is contained in:
savsch 2024-12-13 13:44:24 +05:30
parent c6f293cc5b
commit 0d32b4f80a
14 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/androidTest/java/fr/free/nrw/commons/UploadCancelledTest.kt
View file

@ -18,7 +18,7 @@ import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.rule.ActivityTestRule
import androidx.test.rule.GrantPermissionRule
import androidx.test.uiautomator.UiDevice
import fr.free.nrw.commons.LocationPicker.LocationPickerActivity
import fr.free.nrw.commons.locationpicker.LocationPickerActivity
import fr.free.nrw.commons.UITestHelper.Companion.childAtPosition
import fr.free.nrw.commons.auth.LoginActivity
import org.hamcrest.CoreMatchers

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

@ -171,7 +171,7 @@
android:name=".review.ReviewActivity"
android:label="@string/title_activity_review" />
<activity
android:name=".LocationPicker.LocationPickerActivity"
android:name=".locationpicker.LocationPickerActivity"
android:label="Location Picker" />
<service

2
app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.kt
View file

@ -3,7 +3,7 @@ package fr.free.nrw.commons.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import fr.free.nrw.commons.AboutActivity
import fr.free.nrw.commons.LocationPicker.LocationPickerActivity
import fr.free.nrw.commons.locationpicker.LocationPickerActivity
import fr.free.nrw.commons.WelcomeActivity
import fr.free.nrw.commons.auth.LoginActivity
import fr.free.nrw.commons.auth.SignupActivity

8
app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPicker.kt → app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPicker.kt
View file

@ -1,4 +1,4 @@
package fr.free.nrw.commons.LocationPicker
package fr.free.nrw.commons.locationpicker
import android.app.Activity
import android.content.Intent
@ -32,7 +32,7 @@ object LocationPicker {
/**
* Gets and puts location in intent
* @param position CameraPosition
* @return LocationPicker.IntentBuilder
* @return locationpicker.IntentBuilder
*/
fun defaultLocation(position: CameraPosition): IntentBuilder {
intent.putExtra(LocationPickerConstants.MAP_CAMERA_POSITION, position)
@ -42,7 +42,7 @@ object LocationPicker {
/**
* Gets and puts activity name in intent
* @param activity activity key
* @return LocationPicker.IntentBuilder
* @return locationpicker.IntentBuilder
*/
fun activityKey(activity: String): IntentBuilder {
intent.putExtra(LocationPickerConstants.ACTIVITY_KEY, activity)
@ -52,7 +52,7 @@ object LocationPicker {
/**
* Gets and puts media in intent
* @param media Media
* @return LocationPicker.IntentBuilder
* @return locationpicker.IntentBuilder
*/
fun media(media: Media): IntentBuilder {
intent.putExtra(LocationPickerConstants.MEDIA, media)

2
app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.kt → app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt
View file

@ -1,4 +1,4 @@
package fr.free.nrw.commons.LocationPicker
package fr.free.nrw.commons.locationpicker
import android.Manifest.permission
import android.annotation.SuppressLint

2
app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerConstants.kt → app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerConstants.kt
View file

@ -1,4 +1,4 @@
package fr.free.nrw.commons.LocationPicker
package fr.free.nrw.commons.locationpicker
/**
* Constants need for location picking

2
app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerViewModel.kt → app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerViewModel.kt
View file

@ -1,4 +1,4 @@
package fr.free.nrw.commons.LocationPicker
package fr.free.nrw.commons.locationpicker
import android.app.Application
import androidx.lifecycle.AndroidViewModel

2
app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
View file

@ -74,7 +74,7 @@ import fr.free.nrw.commons.BuildConfig
import fr.free.nrw.commons.CameraPosition
import fr.free.nrw.commons.CommonsApplication
import fr.free.nrw.commons.CommonsApplication.Companion.instance
import fr.free.nrw.commons.LocationPicker.LocationPicker
import fr.free.nrw.commons.locationpicker.LocationPicker
import fr.free.nrw.commons.Media
import fr.free.nrw.commons.MediaDataExtractor
import fr.free.nrw.commons.R

2
app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
View file

@ -25,7 +25,7 @@ import androidx.annotation.Nullable;
import androidx.exifinterface.media.ExifInterface;
import androidx.recyclerview.widget.LinearLayoutManager;
import fr.free.nrw.commons.CameraPosition;
import fr.free.nrw.commons.LocationPicker.LocationPicker;
import fr.free.nrw.commons.locationpicker.LocationPicker;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.contributions.MainActivity;
import fr.free.nrw.commons.databinding.FragmentUploadMediaDetailFragmentBinding;

2
app/src/main/res/layout/activity_location_picker.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".LocationPicker.LocationPickerActivity">
tools:context=".locationpicker.LocationPickerActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/location_picker_app_bar_layout"

1
app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt
View file

@ -11,7 +11,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.nhaarman.mockitokotlin2.times
import com.nhaarman.mockitokotlin2.verify
import fr.free.nrw.commons.CameraPosition
import fr.free.nrw.commons.LocationPicker.LocationPickerActivity
import fr.free.nrw.commons.TestCommonsApplication
import fr.free.nrw.commons.kvstore.JsonKvStore
import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_LOCATION

1
app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt
View file

@ -7,7 +7,6 @@ import com.nhaarman.mockitokotlin2.times
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.whenever
import fr.free.nrw.commons.CameraPosition
import fr.free.nrw.commons.LocationPicker.LocationPickerViewModel
import org.junit.Before
import org.junit.Test
import org.mockito.Mock

5
app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt
View file

@ -1,6 +1,5 @@
package fr.free.nrw.commons.media
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
@ -19,7 +18,6 @@ import android.widget.ProgressBar
import android.widget.ScrollView
import android.widget.Spinner
import android.widget.TextView
import androidx.activity.result.ActivityResult
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentTransaction
import androidx.test.core.app.ApplicationProvider
@ -27,10 +25,9 @@ import com.facebook.drawee.backends.pipeline.Fresco
import com.facebook.drawee.generic.GenericDraweeHierarchy
import com.facebook.drawee.view.SimpleDraweeView
import com.facebook.soloader.SoLoader
import com.nhaarman.mockitokotlin2.anyOrNull
import com.nhaarman.mockitokotlin2.doReturn
import com.nhaarman.mockitokotlin2.whenever
import fr.free.nrw.commons.LocationPicker.LocationPickerActivity
import fr.free.nrw.commons.locationpicker.LocationPickerActivity
import fr.free.nrw.commons.Media
import fr.free.nrw.commons.OkHttpConnectionFactory
import fr.free.nrw.commons.TestCommonsApplication

4
app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt
View file

@ -21,8 +21,8 @@ import androidx.test.core.app.ApplicationProvider
import com.github.chrisbanes.photoview.PhotoView
import com.nhaarman.mockitokotlin2.mock
import fr.free.nrw.commons.CameraPosition
import fr.free.nrw.commons.LocationPicker.LocationPicker
import fr.free.nrw.commons.LocationPicker.LocationPickerActivity
import fr.free.nrw.commons.locationpicker.LocationPicker
import fr.free.nrw.commons.locationpicker.LocationPickerActivity
import fr.free.nrw.commons.OkHttpConnectionFactory
import fr.free.nrw.commons.R
import fr.free.nrw.commons.TestCommonsApplication