Swipe Threshold
- 100
+ 100
diff --git a/app/src/main/assets/ui-files/ui.css b/app/src/main/assets/ui-files/ui.css
index 442825ad0..390bc4777 100644
--- a/app/src/main/assets/ui-files/ui.css
+++ b/app/src/main/assets/ui-files/ui.css
@@ -343,6 +343,10 @@ touch_search{
.high-mini .mini p {
font-size: 16px;
color: var(--On-Surface);
+ max-width: 75px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.high-mini .mini span {
@@ -2620,10 +2624,32 @@ max-width: 150px;
}
+@media screen and (min-width: 400px){
+ .currentConditions{
+ padding-top: 13px;
+ padding-bottom: 14px;
+ row-gap: 30px;
+ }
+
+ .currentConditionItem{
+ transform: scale(1.1);
+ }
+}
+
@media screen and (min-width: 600px){
.currentConditions{
grid-template-columns: repeat(3, 1fr);
}
+
+ .currentConditions{
+ padding-top: 0;
+ padding-bottom: 5px;
+ gap: 10px;
+ }
+
+ .currentConditionItem{
+ transform: scale(1);
+ }
}
/* ------------------------- */
@@ -3049,15 +3075,15 @@ swipecooldown{
}
.sortHolder{
- gap: 5px;
- padding-top: 5px;
- padding-bottom: 5px;
+ gap: 8.5px;
+ padding-top: 8.5px;
+ padding-bottom: 8.5px;
}
[round-ui="true"] .sortHolder{
- gap: 8px;
- padding-top: 8px;
- padding-bottom: 8px;
+ gap: 8.5px;
+ padding-top: 8.5px;
+ padding-bottom: 8.5px;
}
.behind_search_animation_wrap .behind_search_animation{
diff --git a/app/src/main/assets/ui-files/variables.css b/app/src/main/assets/ui-files/variables.css
index 84f3e351b..9df61c770 100644
--- a/app/src/main/assets/ui-files/variables.css
+++ b/app/src/main/assets/ui-files/variables.css
@@ -108,13 +108,24 @@ body{
--md-filled-tonal-button-pressed-state-layer-opacity: 0.25;
--md-elevated-button-pressed-state-layer-opacity: 0.25;
- --md-text-button-label-text-size: 18px;
- --md-filled-button-label-text-size: 18px;
- --md-outlined-button-label-text-size: 18px;
- --md-filled-tonal-button-label-text-size: 18px;
- --md-elevated-button-label-text-size: 18px;
+ --md-text-button-label-text-size: 1rem;;
+ --md-filled-button-label-text-size: 1rem;;
+ --md-outlined-button-label-text-size: 1rem;;
+ --md-filled-tonal-button-label-text-size: 1rem;;
+ --md-elevated-button-label-text-size: 1rem;
+ --md-text-button-label-text-font: var(--google-mid);
+ --md-filled-button-label-text-font: var(--google-mid);
+ --md-outlined-button-label-text-font: var(--google-mid);
+ --md-filled-tonal-button-label-text-font: var(--google-mid);
+ --md-elevated-button-label-text-font: var(--google-mid);
+
+ --md-filled-button-icon-size: 21px;
+ --md-text-button-icon-size: 21px;
+ --md-outlined-button-icon-size: 21px;
+ --md-filled-tonal-button-icon-size: 21px;
+ --md-elevated-button-icon-size: 21px;
}
[margin] {
@@ -302,7 +313,7 @@ body{
--Surface: #0e1d2a;
--Surface-Bright: #38393e;
--Surface-Container-Lowest:#0d0e12 ;
- --Surface-Container-Low: #012438;
+ --Surface-Container-Low: #042030;
--Surface-Container: #112535;
--Surface-Container-High: #292a2e;
--Surface-Container-Highest: #343439;
diff --git a/app/src/main/java/com/example/weathermaster/AppUnitsActivity.java b/app/src/main/java/com/example/weathermaster/AppUnitsActivity.java
new file mode 100644
index 000000000..3c74a5093
--- /dev/null
+++ b/app/src/main/java/com/example/weathermaster/AppUnitsActivity.java
@@ -0,0 +1,399 @@
+package com.example.weathermaster;
+
+
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.ContextThemeWrapper;
+import android.view.View;
+import android.view.WindowManager;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class AppUnitsActivity extends AppCompatActivity {
+
+ private WebView webview;
+ private boolean isFirstLoad = true;
+
+ public void onBackPressed() {
+ if (webview.canGoBack()) {
+ webview.goBack();
+ } else {
+ super.onBackPressed();
+ }
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+
+
+
+ setContentView(R.layout.activity_main);
+
+
+
+ // Webview stuff
+ webview = findViewById(R.id.webView);
+ WebSettings webSettings = webview.getSettings();
+ webSettings.setJavaScriptEnabled(true);
+ webSettings.setDomStorageEnabled(true);
+ webSettings.setAllowFileAccessFromFileURLs(true);
+ webSettings.setAllowUniversalAccessFromFileURLs(true);
+ webSettings.setAllowContentAccess(true);
+ webview.setVerticalScrollBarEnabled(true);
+ webview.setHorizontalScrollBarEnabled(false);
+ webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER);
+ webview.setWebViewClient(new WebViewClientDemo());
+ AndroidInterface androidInterface = new AndroidInterface(this);
+ webview.addJavascriptInterface(androidInterface, "AndroidInterface");
+ webview.setBackgroundColor(getResources().getColor(R.color.yellowBg));
+ setTheme(R.style.blue_caret);
+ webSettings.setTextZoom(100);
+ webSettings.setAllowFileAccess(true);
+ webview.loadUrl("file:///android_asset/pages/AppUnits.html");
+ webview.setWebViewClient(new WebViewClient() {
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+
+
+ if (isFirstLoad) {
+ isFirstLoad = false;
+
+ int primaryColor = new ContextThemeWrapper(AppUnitsActivity.this, R.style.Base_Theme_WeatherMaster)
+ .getTheme()
+ .obtainStyledAttributes(new int[]{com.google.android.material.R.attr.colorPrimary})
+ .getColor(0, 0);
+
+ String hexColor = String.format("#%06X", (0xFFFFFF & primaryColor));
+
+ String jsCodePrimaryColor = "CreateMaterialYouTheme('" + hexColor + "');";
+
+ webview.evaluateJavascript(jsCodePrimaryColor, null);
+ }
+ }
+ });
+ }
+
+
+
+
+ public class AndroidInterface {
+ private AppUnitsActivity aActivity;
+
+ AndroidInterface(AppUnitsActivity activity) {
+ aActivity = activity;
+ }
+
+ @JavascriptInterface
+ public void updateStatusBarColor(final String color) {
+ aActivity.runOnUiThread(new Runnable() {
+ @SuppressLint("ResourceType")
+ @RequiresApi(api = Build.VERSION_CODES.O)
+ @Override
+ public void run() {
+ int statusBarColor;
+ int navigationBarColor;
+ int systemUiVisibilityFlags = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+
+
+ if(color.equals("Scrolled")){
+ statusBarColor = 0xFF1d2024;
+ navigationBarColor = 0xFF111318;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("ScrollFalse")) {
+ statusBarColor = 0xFF111318;
+ navigationBarColor = 0xFF111318;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("DialogNotScrolled")) {
+ statusBarColor = 0xFF07080a;
+ navigationBarColor = 0xFF07080a;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("DialogScrolled")) {
+ statusBarColor = 0xFF0c0d0e;
+ navigationBarColor = 0xFF07080a;
+ systemUiVisibilityFlags = 0;
+
+ } else if(color.equals("orange_material_Scrolled")){
+ statusBarColor = 0xFF251e17;
+ navigationBarColor = 0xFF18120c;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("orange_material_ScrollFalse")) {
+ statusBarColor = 0xFF18120c;
+ navigationBarColor = 0xFF18120c;
+ systemUiVisibilityFlags = 0;
+ setTheme(R.style.orange_material_caret);
+
+ } else if(color.equals("red_material_Scrolled")){
+ statusBarColor = 0xFF271d1b;
+ navigationBarColor = 0xFF1a110f;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("red_material_ScrollFalse")) {
+ statusBarColor = 0xFF1a110f;
+ navigationBarColor = 0xFF1a110f;
+ systemUiVisibilityFlags = 0;
+ setTheme(R.style.red_material_caret);
+
+ } else if(color.equals("pink_material_Scrolled")){
+ statusBarColor = 0xFF261d1f;
+ navigationBarColor = 0xFF191113;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("pink_material_ScrollFalse")) {
+ statusBarColor = 0xFF191113;
+ navigationBarColor = 0xFF191113;
+ systemUiVisibilityFlags = 0;
+ setTheme(R.style.pink_material_caret);
+
+ } else if(color.equals("purple_material_Scrolled")){
+ statusBarColor = 0xFF241e22;
+ navigationBarColor = 0xFF171216;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("purple_material_ScrollFalse")) {
+ statusBarColor = 0xFF171216;
+ navigationBarColor = 0xFF171216;
+ systemUiVisibilityFlags = 0;
+ setTheme(R.style.purple_material_caret);
+
+ } else if(color.equals("blue_material_Scrolled")){
+ statusBarColor = 0xFF1d2024;
+ navigationBarColor = 0xFF111318;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("blue_material_ScrollFalse")) {
+ statusBarColor = 0xFF111318;
+ navigationBarColor = 0xFF111318;
+ systemUiVisibilityFlags = 0;
+ setTheme(R.style.blue_material_caret);
+
+ } else if(color.equals("yellow_material_Scrolled")){
+ statusBarColor = 0xFF222017;
+ navigationBarColor = 0xFF15130b;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("yellow_material_ScrollFalse")) {
+ statusBarColor = 0xFF15130b;
+ navigationBarColor = 0xFF15130b;
+ systemUiVisibilityFlags = 0;
+ setTheme(R.style.yellow_material_caret);
+
+ } else if(color.equals("green_material_Scrolled")){
+ statusBarColor = 0xFF1e201a;
+ navigationBarColor = 0xFF12140e;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("green_material_ScrollFalse")) {
+ statusBarColor = 0xFF12140e;
+ navigationBarColor = 0xFF12140e;
+ systemUiVisibilityFlags = 0;
+ setTheme(R.style.green_material_caret);
+
+ } else if (color.equals("orange_material_DialogNotScrolled")){
+ statusBarColor = 0xFF0a0705;
+ navigationBarColor = 0xFF0a0705;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("orange_material_DialogScrolled")) {
+ statusBarColor = 0xFF0f0c09;
+ navigationBarColor = 0xFF0a0705;
+ systemUiVisibilityFlags = 0;
+
+ } else if(color.equals("red_material_DialogNotScrolled")){
+ statusBarColor = 0xFF0b0706;
+ navigationBarColor = 0xFF0b0706;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("red_material_DialogScrolled")) {
+ statusBarColor = 0xFF100c0b;
+ navigationBarColor = 0xFF0b0706;
+ systemUiVisibilityFlags = 0;
+
+ } else if(color.equals("pink_material_DialogNotScrolled")){
+ statusBarColor = 0xFF090708;
+ navigationBarColor = 0xFF090708;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("pink_material_DialogScrolled")) {
+ statusBarColor = 0xFF0e0d0b;
+ navigationBarColor = 0xFF090708;
+ systemUiVisibilityFlags = 0;
+
+ } else if(color.equals("purple_material_DialogNotScrolled")){
+ statusBarColor = 0xFF090709;
+ navigationBarColor = 0xFF090709;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("purple_material_DialogScrolled")) {
+ statusBarColor = 0xFF0e0c0e;
+ navigationBarColor = 0xFF090709;
+ systemUiVisibilityFlags = 0;
+
+ } else if(color.equals("blue_material_DialogNotScrolled")){
+ statusBarColor = 0xFF07080a;
+ navigationBarColor = 0xFF07080a;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("blue_material_DialogScrolled")) {
+ statusBarColor = 0xFF0c0d0e;
+ navigationBarColor = 0xFF07080a;
+ systemUiVisibilityFlags = 0;
+
+ } else if(color.equals("yellow_material_DialogNotScrolled")){
+ statusBarColor = 0xFF080804;
+ navigationBarColor = 0xFF080804;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("yellow_material_DialogScrolled")) {
+ statusBarColor = 0xFF0e0d09;
+ navigationBarColor = 0xFF080804;
+ systemUiVisibilityFlags = 0;
+
+ } else if(color.equals("green_material_DialogNotScrolled")){
+ statusBarColor = 0xFF070806;
+ navigationBarColor = 0xFF070806;
+ systemUiVisibilityFlags = 0;
+
+ } else if (color.equals("green_material_DialogScrolled")) {
+ statusBarColor = 0xFF0c0d0a;
+ navigationBarColor = 0xFF070806;
+ systemUiVisibilityFlags = 0;
+
+
+ } else if (color.equals("GoBack")){
+ back();
+ return;
+ } else if (color.equals("OpenTermsConditions")){
+
+ return;
+ } else if (color.equals("OpenPrivacyPolicy")){
+
+ return;
+ } else if (color.equals("OpenLicenses")){
+
+ return;
+
+ } else if (color.equals("bluesetDef")) {
+
+ return;
+ } else if (color.equals("keepiton")) {
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ return;
+ } else if (color.equals("keepitoff")) {
+ getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ return;
+ } else if (color.equals("itsOn")) {
+ Toast.makeText(aActivity, "Your device will stay awake", Toast.LENGTH_SHORT).show();
+ return;
+ } else if (color.equals("ItsOff")) {
+ Toast.makeText(aActivity, "Your device will go to sleep at the default time", Toast.LENGTH_SHORT).show();
+ return;
+
+
+ } else {
+ Toast.makeText(aActivity, "not found", Toast.LENGTH_SHORT).show();
+ return;
+ }
+
+
+ int currentStatusBarColor = aActivity.getWindow().getStatusBarColor();
+ int currentNavigationBarColor = aActivity.getWindow().getNavigationBarColor();
+
+ ObjectAnimator statusBarAnimator = ObjectAnimator.ofObject(
+ aActivity.getWindow(),
+ "statusBarColor",
+ new ArgbEvaluator(),
+ currentStatusBarColor,
+ statusBarColor
+ );
+
+ statusBarAnimator.setDuration(200);
+ statusBarAnimator.start();
+
+ ObjectAnimator navBarAnimator = ObjectAnimator.ofObject(
+ aActivity.getWindow(),
+ "navigationBarColor",
+ new ArgbEvaluator(),
+ currentNavigationBarColor,
+ navigationBarColor
+ );
+
+ navBarAnimator.setDuration(200);
+ navBarAnimator.start();
+
+ aActivity.getWindow().setNavigationBarColor(navigationBarColor);
+
+ View decorView = aActivity.getWindow().getDecorView();
+ decorView.setSystemUiVisibility(systemUiVisibilityFlags);
+
+
+ }
+ });
+ }
+
+
+
+ }
+
+ public void back() {
+ onBackPressed();
+ }
+
+
+
+ private static class WebViewClientDemo extends WebViewClient {
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ if (shouldOpenInBrowser(url)) {
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ view.getContext().startActivity(intent);
+ return true;
+
+ } else {
+ view.loadUrl(url);
+ return true;
+
+
+ }
+
+
+ }
+
+ private boolean shouldOpenInBrowser(String url) {
+ return url.startsWith("https://fonts.google.com/specimen/Outfit?query=outfit") ||
+ url.startsWith("https://openweathermap.org/") ||
+ url.startsWith("https://fonts.google.com/specimen/Poppins?query=poppins") ||
+ url.startsWith("https://github.com/material-components/material-web") ||
+ url.startsWith("https://app-privacy-policy-generator.nisrulz.com/") ||
+ url.startsWith("https://github.com/PranshulGG/WeatherMaster") ||
+ url.startsWith("mailto:pranshul.devmain@gmail.com")||
+ url.startsWith("https://github.com/PranshulGG/WeatherMaster/releases");
+
+
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/weathermaster/SettingsActivity.java b/app/src/main/java/com/example/weathermaster/SettingsActivity.java
index e8cbd449c..854e50d43 100644
--- a/app/src/main/java/com/example/weathermaster/SettingsActivity.java
+++ b/app/src/main/java/com/example/weathermaster/SettingsActivity.java
@@ -564,6 +564,9 @@ public class SettingsActivity extends AppCompatActivity {
} else if (color.equals("EditAppLayoutPage")){
EditAppLayoutPage();
return;
+ } else if (color.equals("AppUnitsActivity")){
+ AppUnitsActivity();
+ return;
} else if (color.equals("bluesetDef")) {
return;
} else if (color.equals("keepiton")) {
@@ -647,6 +650,10 @@ public class SettingsActivity extends AppCompatActivity {
Intent intent = new Intent(sActivity, ArrangeItems.class);
sActivity.startActivity(intent);
}
+ public void AppUnitsActivity() {
+ Intent intent = new Intent(sActivity, AppUnitsActivity.class);
+ sActivity.startActivity(intent);
+ }
}
diff --git a/app/src/main/res/layout/widget_weather_round.xml b/app/src/main/res/layout/widget_weather_round.xml
index 213492663..fa7718337 100644
--- a/app/src/main/res/layout/widget_weather_round.xml
+++ b/app/src/main/res/layout/widget_weather_round.xml
@@ -1,7 +1,7 @@
diff --git a/app/src/main/res/xml/widget_info_round.xml b/app/src/main/res/xml/widget_info_round.xml
index 17d2fdc98..c10d88140 100644
--- a/app/src/main/res/xml/widget_info_round.xml
+++ b/app/src/main/res/xml/widget_info_round.xml
@@ -2,10 +2,10 @@