diff --git a/app/.gitignore b/app/.gitignore index 42afabf..796b96d 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1 @@ -/build \ No newline at end of file +/build diff --git a/app/build.gradle b/app/build.gradle index 0084a45..0ef4ad1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,48 +1,30 @@ -plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' -} +apply plugin: 'com.android.application' android { - compileSdk 32 - + compileSdkVersion 28 defaultConfig { - applicationId "com.example.externgnss" - minSdk 28 - targetSdk 32 + applicationId "fmaps.grabow.com.location001" + minSdkVersion 14 + targetSdkVersion 28 versionCode 1 versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } - buildFeatures { - viewBinding true - } } dependencies { - - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' -} \ No newline at end of file + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'pub.devrel:easypermissions:2.0.1' + implementation 'com.android.support:design:28.0.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..f1b4245 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,4 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/com/example/externgnss/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/externgnss/ExampleInstrumentedTest.kt deleted file mode 100644 index bc7287d..0000000 --- a/app/src/androidTest/java/com/example/externgnss/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.externgnss - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.externgnss", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/fmaps/grabow/com/location001/ExampleInstrumentedTest.java b/app/src/androidTest/java/fmaps/grabow/com/location001/ExampleInstrumentedTest.java new file mode 100644 index 0000000..4710532 --- /dev/null +++ b/app/src/androidTest/java/fmaps/grabow/com/location001/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package fmaps.grabow.com.location001; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("fmaps.grabow.com.location001", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9dd99dd..28c1d28 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,9 @@ + package="fmaps.grabow.com.location001"> + + + - + android:theme="@style/AppTheme"> + diff --git a/app/src/main/java/com/example/externgnss/MainActivity.kt b/app/src/main/java/com/example/externgnss/MainActivity.kt deleted file mode 100644 index 27daf72..0000000 --- a/app/src/main/java/com/example/externgnss/MainActivity.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.example.externgnss - -import android.os.Bundle -import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.google.android.material.snackbar.Snackbar -import com.google.android.material.tabs.TabLayout -import androidx.viewpager.widget.ViewPager -import androidx.appcompat.app.AppCompatActivity -import android.view.Menu -import android.view.MenuItem -import com.example.externgnss.ui.main.SectionsPagerAdapter -import com.example.externgnss.databinding.ActivityMainBinding - -class MainActivity : AppCompatActivity() { - - private lateinit var binding: ActivityMainBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - binding = ActivityMainBinding.inflate(layoutInflater) - setContentView(binding.root) - - val sectionsPagerAdapter = SectionsPagerAdapter(this, supportFragmentManager) - val viewPager: ViewPager = binding.viewPager - viewPager.adapter = sectionsPagerAdapter - val tabs: TabLayout = binding.tabs - tabs.setupWithViewPager(viewPager) - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/externgnss/ui/main/PageViewModel.kt b/app/src/main/java/com/example/externgnss/ui/main/PageViewModel.kt deleted file mode 100644 index 204104b..0000000 --- a/app/src/main/java/com/example/externgnss/ui/main/PageViewModel.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.externgnss.ui.main - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations -import androidx.lifecycle.ViewModel -import androidx.lifecycle.ViewModelProvider - -class PageViewModel : ViewModel() { - - private val _index = MutableLiveData() - val text: LiveData = Transformations.map(_index) { - "Hello world from section: $it" - } - - fun setIndex(index: Int) { - _index.value = index - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/externgnss/ui/main/PlaceholderFragment.kt b/app/src/main/java/com/example/externgnss/ui/main/PlaceholderFragment.kt deleted file mode 100644 index 365eb8a..0000000 --- a/app/src/main/java/com/example/externgnss/ui/main/PlaceholderFragment.kt +++ /dev/null @@ -1,73 +0,0 @@ -package com.example.externgnss.ui.main - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.fragment.app.Fragment -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProvider -import com.example.externgnss.R -import com.example.externgnss.databinding.FragmentMainBinding - -/** - * A placeholder fragment containing a simple view. - */ -class PlaceholderFragment : Fragment() { - - private lateinit var pageViewModel: PageViewModel - private var _binding: FragmentMainBinding? = null - - // This property is only valid between onCreateView and - // onDestroyView. - private val binding get() = _binding!! - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - pageViewModel = ViewModelProvider(this).get(PageViewModel::class.java).apply { - setIndex(arguments?.getInt(ARG_SECTION_NUMBER) ?: 1) - } - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - - _binding = FragmentMainBinding.inflate(inflater, container, false) - val root = binding.root - - val textView: TextView = binding.sectionLabel - pageViewModel.text.observe(viewLifecycleOwner, Observer { - textView.text = it - }) - return root - } - - companion object { - /** - * The fragment argument representing the section number for this - * fragment. - */ - private const val ARG_SECTION_NUMBER = "section_number" - - /** - * Returns a new instance of this fragment for the given section - * number. - */ - @JvmStatic - fun newInstance(sectionNumber: Int): PlaceholderFragment { - return PlaceholderFragment().apply { - arguments = Bundle().apply { - putInt(ARG_SECTION_NUMBER, sectionNumber) - } - } - } - } - - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/externgnss/ui/main/SectionsPagerAdapter.kt b/app/src/main/java/com/example/externgnss/ui/main/SectionsPagerAdapter.kt deleted file mode 100644 index a62e786..0000000 --- a/app/src/main/java/com/example/externgnss/ui/main/SectionsPagerAdapter.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.externgnss.ui.main - -import android.content.Context -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.fragment.app.FragmentPagerAdapter -import com.example.externgnss.R - -private val TAB_TITLES = arrayOf( - R.string.tab_text_1, - R.string.tab_text_2 -) - -/** - * A [FragmentPagerAdapter] that returns a fragment corresponding to - * one of the sections/tabs/pages. - */ -class SectionsPagerAdapter(private val context: Context, fm: FragmentManager) - : FragmentPagerAdapter(fm) { - - override fun getItem(position: Int): Fragment { - // getItem is called to instantiate the fragment for the given page. - // Return a PlaceholderFragment (defined as a static inner class below). - return PlaceholderFragment.newInstance(position + 1) - } - - override fun getPageTitle(position: Int): CharSequence? { - return context.resources.getString(TAB_TITLES[position]) - } - - override fun getCount(): Int { - // Show 2 total pages. - return 2 - } -} \ No newline at end of file diff --git a/app/src/main/java/fmaps/grabow/com/location001/MainActivity.java b/app/src/main/java/fmaps/grabow/com/location001/MainActivity.java new file mode 100644 index 0000000..b0f37d3 --- /dev/null +++ b/app/src/main/java/fmaps/grabow/com/location001/MainActivity.java @@ -0,0 +1,232 @@ +package fmaps.grabow.com.location001; + +import android.Manifest; +import android.annotation.SuppressLint; +import android.content.Context; +import android.location.LocationListener; +import android.location.LocationManager; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.widget.TextView; +import android.widget.Toast; + +import pub.devrel.easypermissions.AfterPermissionGranted; +import pub.devrel.easypermissions.EasyPermissions; + +import static java.lang.Thread.sleep; + +public class MainActivity extends AppCompatActivity { + private TextView output; + private LocationManager locationManager; + private boolean doRun = true; + private final Context cntxToastInternGNSSUpdate = this; + final String[] perms = {Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.INTERNET}; + private boolean bChange = true; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + startLocationInit(); + } + + // From https://github.com/googlesamples/easypermissions + @Override + public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + // Forward results to EasyPermissions + EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this); + } + + @AfterPermissionGranted(123) + private void startLocationInit() { + if (EasyPermissions.hasPermissions(this, perms)) { + // Already have permission, do the thing + Toast.makeText(cntxToastInternGNSSUpdate, "Permission granted!", Toast.LENGTH_SHORT).show(); + + // Get the output UI + output = (TextView) findViewById(R.id.interngnss); + + // Test print + ///printlnOnView(output, "Running!"); + + locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); + //List providers = locationManager.getAllProviders(); + + //for (String temp : providers) { + // System.out.println(temp); + //printProvider(temp); + //} + + } else { + // Do not have permissions, request them now + EasyPermissions.requestPermissions(this, "We require location access!!!", + 123, perms); + } + } + +/* + private void printProvider(String provider) { + LocationProvider info = locationManager.getProvider(provider); + output.append("Name: " + info.getName() + "\n"); + output.append("Accuracy: " + info.getAccuracy() + "\n"); + output.append("PowerReq.: " + info.getPowerRequirement() + "\n"); + output.append("CellIDReq.: " + info.requiresCell() + "\n"); + output.append("NetworkReq.: " + info.requiresNetwork() + "\n"); + output.append("SatReq.: " + info.requiresSatellite() + "\n\n"); + } + */ + + + // Die Nachfolgenden Methoden können Sie aus einem Worker-Thread aufrufen + private void printlnOnView(final TextView v, final String str) { + Runnable myRun = new Runnable() { + public void run() { + v.setText(str + "\n"); + } + }; + runOnUiThread(myRun); + } + /* + private void printOnView(final TextView v, final String str) { + Runnable myRun = new Runnable() { + public void run() { + v.append(str); + } + }; + runOnUiThread(myRun); + } + + public void addToString(Location loc) { + //Verwendet die Variablen centerLat & centerLng + String time = loc.getTime() +""; + String latStr = Double.toString(loc.getLatitude()); + String lngStr = Double.toString(loc.getLongitude()); + String acc = loc.getAccuracy() + ""; + String numOfSat = loc.getExtras().getInt("satellites") +""; + String satStr = ""; + String distStr = ""; + // Bestimme die Distanz (Fix <-> Center) + Location locationA = new Location("Center"); + locationA.setLatitude(Double.valueOf(centerLat)); + locationA.setLongitude(Double.valueOf(centerLng)); + Location locationB = new Location("Fix"); + locationB.setLatitude(Double.valueOf(latStr)); + locationB.setLongitude(Double.valueOf(lngStr)); + distStr = locationA.distanceTo(locationB) + ""; + logString = logString + time + ";"; logString = logString + numOfSat + ";"; logString = logString + distStr + + ";"; logString = logString + acc + ";"; logString = logString + latStr + ";"; logString = logString + lngStr + + ";"; logString = logString + centerLat + ";"; logString = logString + centerLng + ";"; logString = + logString + satStr + ";"; logString = logString + "\n"; + } + */ + + @SuppressLint("MissingPermission") + @Override + protected void onResume() { + super.onResume(); + if (!EasyPermissions.hasPermissions(this, perms)) { + // Dummy thread ... + new Thread(new Runnable() { + @Override + public void run() { + while (doRun) { + Log.i("HAG", "Just do nothing ..."); + try { + sleep(2000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + }).start(); + } else { + locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener); + + // Worker-Thread + new Thread( + new Runnable() { + @Override + public void run() { + + + while (doRun) { + // Log.i("HAG", "ok"); + + // + // Aufgabe 3 + // + // Geben Sie via printOnView die getLastKnownLocation() von + // Network-Provider und GPS-Provider aus + // + + printlnOnView(output, "Lat: " + locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER).getLatitude() + + " Long: " + locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER).getLongitude() + + " Accuracy: " + locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER).getAccuracy() + + + + ); + + + // + // Aufgabe 4 + // + // Erzeugen Sie eine WebView und zeigen Sie mittels der WebView + // alternierend die Location von Network und GPS auf der Karte an + // + // + + runOnUiThread(new Runnable() { + @Override + public void run() { + //Update + } + }); + + try { + sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + }).start(); + + } + } + + /** + * Stop the updates when Activity is paused + */ + @Override + protected void onPause() { + super.onPause(); + doRun = false; + } + + LocationListener locationListener = new LocationListener() { + @Override + public void onLocationChanged(android.location.Location location) { + //double latitude = location.getLatitude(); + //double longitude = location.getLongitude(); + //String msg = "New Latitude: " + latitude + " New Longitude: " + longitude; + Toast.makeText(cntxToastInternGNSSUpdate, "Internal GNSS updated", Toast.LENGTH_LONG).show(); + } + + @Override + // This callback will never be invoked on Android Q and above. + public void onStatusChanged(String provider, int status, Bundle extras) { + // Toast.makeText(mContext, "Status Changed", Toast.LENGTH_LONG).show(); + } + + @Override + public void onProviderEnabled(String provider) { + } + + @Override + public void onProviderDisabled(String provider) { + } + }; +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index 2b068d1..1f6bb29 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -4,13 +4,17 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - + - \ No newline at end of file + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..0d025f9 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -5,7 +5,7 @@ android:viewportWidth="108" android:viewportHeight="108"> - + android:id="@+id/linearLayout" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> - - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_permission_requester.xml b/app/src/main/res/layout/activity_permission_requester.xml new file mode 100644 index 0000000..6a2c0d0 --- /dev/null +++ b/app/src/main/res/layout/activity_permission_requester.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml deleted file mode 100644 index 0a90c04..0000000 --- a/app/src/main/res/layout/fragment_main.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..898f3ed Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..64ba76f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e5ed465 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b0907ca Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c18de9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml deleted file mode 100644 index 22d7f00..0000000 --- a/app/src/main/res/values-land/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 48dp - \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 69e71c5..0000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values-w1240dp/dimens.xml b/app/src/main/res/values-w1240dp/dimens.xml deleted file mode 100644 index d73f4a3..0000000 --- a/app/src/main/res/values-w1240dp/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 200dp - \ No newline at end of file diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml deleted file mode 100644 index 22d7f00..0000000 --- a/app/src/main/res/values-w600dp/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 48dp - \ No newline at end of file diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml deleted file mode 100644 index 9309de9..0000000 --- a/app/src/main/res/values-w820dp/dimens.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 64dp - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..69b2233 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,6 @@ - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file + #008577 + #00574B + #D81B60 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml deleted file mode 100644 index 0a87b6e..0000000 --- a/app/src/main/res/values/dimens.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - 16dp - 16dp - 16dp - 16dp - 8dp - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 172ef13..8b4c8a6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,3 @@ - ExternGnss - Tab 1 - Tab 2 - \ No newline at end of file + Location001 + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml deleted file mode 100644 index 7c17845..0000000 --- a/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -