mirror of
https://github.com/PranshulGG/WeatherMaster.git
synced 2026-10-21 10:40:23 -05:00
1.6.6 Updated
This commit is contained in:
1 parent
e5f868c35b
commit
60caa4430d
3 files changed
+3
-14
No files matched your search
+2
-2
@@ -10,8 +10,8 @@ android {
|
||||
applicationId "com.example.weathermaster"
|
||||
minSdk 22
|
||||
targetSdk 33
|
||||
versionCode 55
|
||||
versionName "1.6.4 (W)"
|
||||
versionCode 58
|
||||
versionName "1.6.6 (W)"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
|
||||
@@ -17,11 +17,7 @@
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
<<<<<<< HEAD
|
||||
android:theme="@style/Theme.WeatherMaster"
|
||||
=======
|
||||
android:theme="@style/Base.Theme.WeatherMaster"
|
||||
>>>>>>> 1fe5d703ff20ab7a83c669b8fdc662e822488967
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".SettingsActivity"
|
||||
@@ -113,19 +109,11 @@
|
||||
android:exported="true"
|
||||
android:theme="@style/conditionMainPage"
|
||||
/>
|
||||
<<<<<<< HEAD
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:theme="@style/app_theme"
|
||||
android:screenOrientation="portrait"
|
||||
android:exported="true" >
|
||||
=======
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:theme="@style/app_theme"
|
||||
android:screenOrientation="portrait"
|
||||
android:exported="true" >
|
||||
>>>>>>> 1fe5d703ff20ab7a83c669b8fdc662e822488967
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
|
||||
@@ -209,6 +209,7 @@ public class SettingsActivity extends AppCompatActivity {
|
||||
url.startsWith("https://github.com/PranshulGG/WeatherMaster") ||
|
||||
url.startsWith("mailto:pranshul.devmain@gmail.com")||
|
||||
url.startsWith("https://ko-fi.com/pranshulgg")||
|
||||
url.startsWith("https://www.openstreetmap.org/") ||
|
||||
url.startsWith("https://leafletjs.com/")||
|
||||
url.startsWith("https://www.rainviewer.com/")||
|
||||
url.startsWith("https://carto.com/")||
|
||||
|
||||
Reference in new issue
Block a user