TinyWeatherForecastGermanyGroup/TinyWeatherForecastGermany
2
2
Fork 0
mirror of https://codeberg.org/Starfish/TinyWeatherForecastGermany.git synced 2025-10-06 01:32:39 +02:00
Code Releases Wiki Activity

add seekbar to the rain radar

Browse Source
This commit is contained in:
Starfish
2025-08-03 14:30:50 +02:00
parent 4854a61a5e
commit c089b95811
7 changed files with 455 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/ForecastBitmap.java
View File

@@ -32,10 +32,7 @@ import android.view.animation.Animation;
import android.widget.ImageView;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.*;
public class ForecastBitmap{
@@ -1308,4 +1305,75 @@ public class ForecastBitmap{
imageView.startAnimation(fadeInAnimation);
}
public final static int PRECIPITATION_BITMAP_AR = 50;
final static String PRECITPITATION_LABEL_SAMPLE="+XXX";
private float getPrecipitationColorLabelFontSize(){
WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
if (windowManager!=null){
DisplayMetrics displayMetrics = new DisplayMetrics();
windowManager.getDefaultDisplay().getMetrics(displayMetrics);
float screenWidth = displayMetrics.widthPixels;
float bitmapHeight = ((float) displayMetrics.heightPixels) / ForecastBitmap.PRECIPITATION_BITMAP_AR;
float itemWidth = ((float)screenWidth) / APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE;
float fontSize = bitmapHeight;
Paint paintText = new Paint();
do {
fontSize--;
paintText.setTextSize(fontSize);
} while ((fontSize>6) && (paintText.measureText(PRECITPITATION_LABEL_SAMPLE)>itemWidth));
return fontSize;
}
return 12;
}
public static Bitmap CreatePrecipitationAtPinPointBitmap(Context context, int[] values, final View imageContainterView){
// derive bitmap size from view;
// to achieve a horizontally stretched font, the bitmap width is tweaked
final float bitmapStrechFactor = 2.5f;
int bitmapWidth = Math.round(imageContainterView.getWidth()*bitmapStrechFactor);
int bitmapHeight = imageContainterView.getHeight();
// create bitmap
Bitmap bitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.ARGB_8888);
bitmap.eraseColor(Color.TRANSPARENT);// calculate tile width
int tileWidth = bitmapWidth / APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE;
// define font for label
float fontSize = bitmapHeight;
Paint paintText = new Paint();
paintText.setColor(Color.BLACK);
// paintText.setTypeface(Typeface.SANS_SERIF);
paintText.setFakeBoldText(true);
// calculate the font size
do {
fontSize--;
paintText.setTextSize(fontSize);
} while ((fontSize>6) && (paintText.measureText(PRECITPITATION_LABEL_SAMPLE)>tileWidth));
for (int position=0; position<APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE; position++){
int value = values[position];
if (value != Color.TRANSPARENT){
int offsetX = Math.round(tileWidth*position);
Canvas canvas = new Canvas(bitmap);
Paint paint = new Paint();
paint.setStyle(Paint.Style.FILL);
int radius = bitmap.getWidth()/24/4;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
paint.setColor(value);
canvas.drawRoundRect(offsetX+1,0,offsetX+Math.round(tileWidth-1),bitmap.getHeight(),radius,radius,paint);
paint.setColor(Color.BLACK);
paint.setStyle(Paint.Style.STROKE);
canvas.drawRoundRect(offsetX+1,0,offsetX+Math.round(tileWidth-1),bitmap.getHeight(),radius,radius,paint);
} else {
canvas.drawRect(offsetX+1,0,offsetX+Math.round(tileWidth-1),bitmap.getHeight(),paint);
}
float offsetY = (bitmap.getHeight() - fontSize)/2f;
paintText.setTextSize(fontSize);
String text = "+" + position * 5;
canvas.drawText(text,offsetX+(tileWidth - paintText.measureText(text))/2,offsetY+fontSize,paintText);
}
}
return bitmap;
}
}

1
app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/MainActivity.java
View File

@@ -795,6 +795,7 @@ public class MainActivity extends Activity {
DataStorage.printPackages(context,DataStorage.readAllPackages(context));
*/
//Log.v("tiwefoge","COLOR: "+Color.parseColor("#fb1bff"));
// startActivity(new Intent(this,WeatherWarningActivity.class));
}
public static long getEstimatedAdapterLayoutTimeInMillis(Context context){

225
app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/WeatherWarningActivity.java
View File

@@ -65,6 +65,7 @@ public class WeatherWarningActivity extends Activity {
Bitmap warningsBitmap;
Bitmap radarBitmap;
Bitmap administrativeBitmap;
Bitmap advancedWindStencilBitmap;
Bitmap visibleBitmap;
ZoomableImageView mapZoomable;
RelativeLayout map_collapsed_container;
@@ -80,13 +81,21 @@ public class WeatherWarningActivity extends Activity {
boolean hide_admin = true;
WeatherLocationManager weatherLocationManager;
RelativeLayout gpsProgressHolder;
RelativeLayout rainsliderSeekbarContainer;
SeekBar rainsliderSeekbar;
Bundle zoomMapState = null;
RadarMN2.MercatorProjectionTile mercatorProjectionTile;
PlotPoint pinPoint;
int[] precipitationAtPinPointArray = new int[24];
ImageView precipitationAtPinPointColors;
Bitmap precipitationAtPinPointBitmap;
boolean forceWeatherUpdateFlag = false;
boolean mapIsDrawn = false;
static float MAP_PIXEL_WIDTH;
static float MAP_PIXEL_HEIGHT;
@@ -153,18 +162,30 @@ public class WeatherWarningActivity extends Activity {
android.os.Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
nextRainSlide=0;
rainSlidesRunning = true;
// check if rain slider is visible and make it visible if necessary
if (rainsliderSeekbarContainer!=null){
if (rainsliderSeekbarContainer.getVisibility()!=View.VISIBLE){
runOnUiThread(new Runnable() {
@Override
public void run() {
rainsliderSeekbarContainer.setVisibility(View.VISIBLE);
}
});
}
}
while (!cancelRainSlides){
long startTime = Calendar.getInstance().getTimeInMillis();
rainDrawLock = true;
runOnUiThread(new Runnable() {
@Override
public void run() {
nextRainSlide++;
drawRadarSlide(nextRainSlide);
rainDrawLock = false;
}
});
if (nextRainSlide>APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE){
if (nextRainSlide<APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE) {
rainDrawLock = true;
runOnUiThread(new Runnable() {
@Override
public void run() {
drawRadarSlide(nextRainSlide);
nextRainSlide++;
rainDrawLock = false;
}
});
} else {
nextRainSlide=0;
}
long stopTime = Calendar.getInstance().getTimeInMillis();
@@ -185,6 +206,15 @@ public class WeatherWarningActivity extends Activity {
}
}
}
// make rain slider isvisible after slides stopped
if (rainsliderSeekbarContainer!=null){
runOnUiThread(new Runnable() {
@Override
public void run() {
rainsliderSeekbarContainer.setVisibility(View.INVISIBLE);
}
});
}
rainSlidesRunning = false;
cancelRainSlides = false;
}
@@ -197,6 +227,16 @@ public class WeatherWarningActivity extends Activity {
germany.post(new Runnable() {
@Override
public void run() {
runOnUiThread(new Runnable() {
@Override
public void run() {
// make slider visible before rain radar starts
if (rainsliderSeekbarContainer!=null){
updateRainSeekBar(0);
rainsliderSeekbarContainer.setVisibility(View.VISIBLE);
}
}
});
new Thread(rainRadarRunnable).start();
}
});
@@ -239,6 +279,8 @@ public class WeatherWarningActivity extends Activity {
@Override
protected void onResume() {
super.onResume();
// invalidate some map views so that they will be updated
mapIsDrawn = false;
// stop rain radar while processing warnings to avoid performance issues on older devices
cancelRainSlides=true;
registerForBroadcast();
@@ -270,19 +312,8 @@ public class WeatherWarningActivity extends Activity {
}
// at this point, do not cancel slides (anymore)
cancelRainSlides = false;
// reader is started unconditionally, because it will check in APIReaders if slides are outdated and/or incomplete
scheduledExecutorService.execute(radarMNSetGeoserverRunnable);
// start rain radar (again) if applicable
// not needed, will always be invoked by radarMNSetGeoserverRunnable
/*
if (!hide_rain){
scheduledExecutorService.execute(new Runnable() {
@Override
public void run() {
startRainRadar();
}
});
}
*/
}
@Override
@@ -325,6 +356,10 @@ public class WeatherWarningActivity extends Activity {
context = getApplicationContext();
mercatorProjectionTile = RadarMN2.getRadarMapMercatorProjectionTile(context);
mercatorProjectionTile.setScaleFactor(RadarMN2.getScaleFactor(context));
// set to station, perhaps override with current location later
ownLocation = WeatherSettings.getSetStationLocation(getApplicationContext());
// calculate coordinates of user location on map
pinPoint = getPlotPoint((float) ownLocation.longitude, (float) ownLocation.latitude);
rainSlidesStartTime = WeatherSettings.getPrefRadarLastdatapoll(context);
WeatherSettings.setRotationMode(this);
setContentView(R.layout.activity_weatherwarning);
@@ -352,6 +387,8 @@ public class WeatherWarningActivity extends Activity {
mapcontainer = (RelativeLayout) findViewById(R.id.warningactivity_mapcontainer);
map_collapsed_container = (RelativeLayout) findViewById(R.id.warningactivity_map_collapsed_container);
warningactivity_map_collapsed = (ImageView) findViewById(R.id.warningactivity_map_collapsed);
rainsliderSeekbarContainer = (RelativeLayout) findViewById(R.id.warningactivity_rainsliderSeekbarContainer);
precipitationAtPinPointColors = (ImageView) findViewById(R.id.warningactivity_rainsliderColors);
warningactivityMapinfoContainer = (LinearLayout) findViewById(R.id.warningactivity_mapinfo_container);
if (warningactivity_map_collapsed!=null){
warningactivity_map_collapsed.setImageResource(WeatherIcons.getIconResource(context,WeatherIcons.MAP_COLLAPSED));
@@ -375,14 +412,16 @@ public class WeatherWarningActivity extends Activity {
rainSlideProgressBar = (ProgressBar) findViewById(R.id.warningactivity_rainslideprogressbar);
rainSlideProgressBarText = (TextView) findViewById(R.id.warningactivity_rainslideprogressbartext);
rainSlideTime = (TextView) findViewById(R.id.warningactivity_rainslidetime);
/*
rainSlideTime.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
nextRainSlide=0;
}
});
*/
rainDescription = (ImageView) findViewById(R.id.warningactivity_mapinfo);
rainDescription.setOnTouchListener(forwardRainSlidesOnTouchListener);
// rainDescription.setOnTouchListener(forwardRainSlidesOnTouchListener);
gpsProgressHolder = (RelativeLayout) findViewById(R.id.gps_progress_holder);
displayOsmNotice();
radarMNSetGeoserverRunnable = new APIReaders.RadarMNSetGeoserverRunnable(getApplicationContext()){
@@ -411,6 +450,23 @@ public class WeatherWarningActivity extends Activity {
super.onFinished(startTime,success);
if (success){
validSlideSetObtained = true;
if (precipitationAtPinPointColors!=null){
precipitationAtPinPointArray = getPrecipitationArrayAtPinPoint();
//precipitationAtPinPointBitmap = ForecastBitmap.CreatePrecipitationAtPinPointBitmap(context,precipitationAtPinPointArray,precipitationLabelFontSize);
// make sure drawing only happens after view hierarchy was created
germany.post(new Runnable() {
@Override
public void run() {
precipitationAtPinPointBitmap = ForecastBitmap.CreatePrecipitationAtPinPointBitmap(context,precipitationAtPinPointArray,rainsliderSeekbarContainer);
runOnUiThread(new Runnable() {
@Override
public void run() {
precipitationAtPinPointColors.setImageBitmap(precipitationAtPinPointBitmap);
}
});
}
});
}
germany.post(new Runnable() {
@Override
public void run() {
@@ -478,8 +534,6 @@ public class WeatherWarningActivity extends Activity {
}
};
WeatherSettings.saveGPSfixtime(context,0);
// set to station, perhaps override with current location later
ownLocation = WeatherSettings.getSetStationLocation(getApplicationContext());
getApplication().registerActivityLifecycleCallbacks(weatherLocationManager);
weatherLocationManager.setView(gpsProgressHolder);
weatherLocationManager.registerCancelButton((Button) findViewById(R.id.cancel_gps));
@@ -511,6 +565,8 @@ public class WeatherWarningActivity extends Activity {
return true;
}
if (item_id==R.id.hide_rain) {
// invalidate some map views so that they will be drawn again once
mapIsDrawn = false;
if ((hide_rain) && (hide_admin)){
hide_rain = false;
} else
@@ -696,7 +752,7 @@ public class WeatherWarningActivity extends Activity {
float ff=1.1f;
if (validSlideSetObtained) {
rainSlideTime.setTextColor(Color.WHITE);
if (Calendar.getInstance().getTimeInMillis() > rainSlidesStartTime + +1000*60*60*1.5f){
if (Calendar.getInstance().getTimeInMillis() > rainSlidesStartTime + 1000*60*60*1.5f){
rainSlideTime.setTextColor(0xfffa7712);
}
} else {
@@ -746,6 +802,63 @@ public class WeatherWarningActivity extends Activity {
});
}
private final static float SEEKBAR_PADDING = (100f/APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE)/2;
private int getSeekBarPosition(int count){
return Math.round((((float) count)/APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE)*(100));
// return Math.round((((float) count+1)/APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE)*100);
}
private void updateRainSeekBar(final int count){
if (rainsliderSeekbar==null) {
rainsliderSeekbar = (SeekBar) findViewById(R.id.warningactivity_rainsliderSeekbar);
if (rainsliderSeekbar!=null){
rainsliderSeekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int i, boolean fromUser) {
if (fromUser){
nextRainSlide = Math.round((APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE/100f)*i);
}
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
}
});
}
}
if (rainsliderSeekbar!=null){
int position = getSeekBarPosition(count);
rainsliderSeekbar.setProgress(Math.round(position+SEEKBAR_PADDING));
}
}
private int getPrecipitationAtPinPoint(final int count, final Bitmap slideBitmap){
return slideBitmap.getPixel(Math.round(pinPoint.x),Math.round(pinPoint.y));
}
private int getPrecipitationAtPinPoint(final int count) {
try {
Bitmap slideBitmap = RadarMN2.getScaledBitmap(context, count);
if (slideBitmap != null) {
return getPrecipitationAtPinPoint(count, slideBitmap);
}
} catch (Exception e){
// usually this occurs when there are less than 24 slides, no need to worry, just ignore and return zero
}
return 0;
}
private int[] getPrecipitationArrayAtPinPoint(){
int[] resultarray = new int[24];
for (int i=0; i<APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE; i++){
resultarray[i] = getPrecipitationAtPinPoint(i);
}
return resultarray;
}
private void drawRadarSlide(final int count){
if (APIReaders.RadarMNSetGeoserverRunnable.radarCacheFileValid(context,count)) {
radarBitmap.eraseColor(Color.TRANSPARENT);
@@ -758,6 +871,7 @@ public class WeatherWarningActivity extends Activity {
}
if (!hide_rain) {
drawMapBitmap();
updateRainSeekBar(count);
}
} else {
// do nothing
@@ -781,25 +895,37 @@ public class WeatherWarningActivity extends Activity {
if ((!hide_rain) && (radarBitmap!=null)){
cp.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
canvas.drawBitmap(radarBitmap, 0,0,cp);
runOnUiThread(new Runnable() {
@Override
public void run() {
showRainDescription();
}
});
if (!mapIsDrawn){
runOnUiThread(new Runnable() {
@Override
public void run() {
showRainDescription();
}
});
}
} else {
runOnUiThread(new Runnable() {
@Override
public void run() {
clearRainDescription();
}
});
if (!mapIsDrawn){
runOnUiThread(new Runnable() {
@Override
public void run() {
clearRainDescription();
}
});
}
}
if (WeatherSettings.displayWindDistance(context)){
if (advancedWindStencilBitmap==null){
advancedWindStencilBitmap = getAdvancedWindStencilBitmap(context,germanyBitmap.getWidth(),germanyBitmap.getHeight());
}
cp.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
canvas.drawBitmap(advancedWindStencilBitmap,0,0,cp);
drawAdvancedWindStencil(canvas);
}
mapZoomable.updateBitmap(visibleBitmap);
visibleBitmap.recycle();
// set this to true to avoid unnecessary updates of views when the rain radar runs; this might be invalidated
// by manually changing the layers visible.
mapIsDrawn = true;
}
private void drawWindIcon(){
@@ -895,7 +1021,16 @@ public class WeatherWarningActivity extends Activity {
}
}
public Bitmap getAdvancedWindStencilBitmap(Context context, int targetWidth, int targetHeight) {
Bitmap resultBitmap = Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.ARGB_8888);
resultBitmap.eraseColor(Color.TRANSPARENT);
Canvas canvas = new Canvas(resultBitmap);
drawAdvancedWindStencil(canvas);
return resultBitmap;
}
private boolean hideMap(){
cancelRainSlides = true;
germany.setVisibility(View.GONE);
germany.invalidate();
LinearLayout.LayoutParams rllp = (LinearLayout.LayoutParams) mapcontainer.getLayoutParams();
@@ -913,8 +1048,8 @@ public class WeatherWarningActivity extends Activity {
lop.weight=29;
weatherList.setLayoutParams(lop);
weatherList.invalidate();
LinearLayout.LayoutParams infoContLop = (LinearLayout.LayoutParams) warningactivityMapinfoContainer.getLayoutParams();
infoContLop.weight=0;
//LinearLayout.LayoutParams infoContLop = (LinearLayout.LayoutParams) warningactivityMapinfoContainer.getLayoutParams();
// infoContLop.weight=0;
return true;
}
@@ -937,8 +1072,11 @@ public class WeatherWarningActivity extends Activity {
lop.weight=11;
weatherList.setLayoutParams(lop);
weatherList.invalidate();
LinearLayout.LayoutParams infoContLop = (LinearLayout.LayoutParams) warningactivityMapinfoContainer.getLayoutParams();
infoContLop.weight=1;
if (!hide_rain){
startRainRadar();
}
// LinearLayout.LayoutParams infoContLop = (LinearLayout.LayoutParams) warningactivityMapinfoContainer.getLayoutParams();
// infoContLop.weight=1;
return true;
}
@@ -1003,7 +1141,6 @@ public class WeatherWarningActivity extends Activity {
float pinSize = WeatherSettings.getMapPinSize(context)/2f;
int pinSizePixels = Math.round(18*this.getApplicationContext().getResources().getDisplayMetrics().density*pinSize);
Bitmap pinBitmap = Bitmap.createScaledBitmap(BitmapFactory.decodeResource(getResources(),R.mipmap.pin),pinSizePixels,pinSizePixels,false);
PlotPoint pinPoint = getPlotPoint((float) ownLocation.longitude, (float) ownLocation.latitude);
float pinX = pinPoint.x; float pinY = pinPoint.y;
// drawAdvancedWindStencil(canvas,145,300);
drawWindIcon();
@@ -1439,7 +1576,7 @@ public class WeatherWarningActivity extends Activity {
newTextView.setPadding(2,1,2,1);
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
layoutParams.setMargins(2,1,marginRight,1);
layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
layoutParams.addRule(RelativeLayout.ALIGN_BOTTOM,R.id.warningactivity_map);
layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
newTextView.setLayoutParams(layoutParams);
RelativeLayout warningactivity_mapcontainer = (RelativeLayout) findViewById(R.id.warningactivity_mapcontainer);

34
app/src/main/res/drawable/seekthumb.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is part of TinyWeatherForecastGermany.
Copyright (c) 2020, 2021 Pawel Dube
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:radius="2dp"/>
<size
android:height="10dp"
android:width="10dp"/>
<!--
<solid
android:color="@color/colorAccent_DarkTheme"/>
-->
</shape>

52
app/src/main/res/layout-w600dp-land/activity_weatherwarning.xml
View File

@@ -60,7 +60,7 @@
android:layout_width="match_parent"
android:layout_height="24dp"
android:orientation="horizontal"
android:layout_above="@id/warningactivity_notice_text"
android:layout_alignParentTop="true"
android:paddingBottom="5dp"
android:weightSum="20">
@@ -109,12 +109,60 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:layout_above="@id/warningactivity_mapinfo_container">
android:layout_below="@id/warningactivity_mapinfo_container"
android:layout_above="@id/warningactivity_notice_text">
<RelativeLayout
android:id="@+id/warningactivity_rainsliderSeekbarContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="center"
android:layout_centerHorizontal="true"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="1dp"
android:paddingBottom="1dp"
android:visibility="invisible"
>
<ImageView
android:id="@+id/warningactivity_rainsliderColors"
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_gravity="center"
android:layout_alignParentTop="true"
android:gravity="center"
android:scaleType="fitXY"
/>
<SeekBar
android:id="@+id/warningactivity_rainsliderSeekbar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:thumb="@drawable/seekthumb"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:splitTrack="false"
android:thumbOffset="5dp"
android:layout_below="@id/warningactivity_rainsliderColors"
android:progress="4"
android:min="0"
android:max="100"
android:thumbTint="@color/seekbar_thumb"
android:progressTint="@color/seekbar_progress"
android:indeterminate="false"
/>
</RelativeLayout>
<ImageView
android:id="@+id/warningactivity_map"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/warningactivity_rainsliderSeekbarContainer"
android:src="@drawable/germany2_scale1">
</ImageView>

178
app/src/main/res/layout/activity_weatherwarning.xml
View File

@@ -84,6 +84,7 @@
android:layout_weight="0"
android:layout_height="0dp"
android:visibility="gone">
<ImageView
android:id="@+id/warningactivity_map_collapsed"
android:layout_width="match_parent"
@@ -104,19 +105,130 @@
android:id="@+id/warningactivity_mapcontainer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="18">
android:layout_weight="19">
<LinearLayout
android:id="@+id/warningactivity_mapinfo_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="horizontal"
android:gravity="center"
android:layout_centerVertical="true"
android:weightSum="20">
<TextView
android:id="@+id/warningactivity_rainslidetime"
android:layout_gravity="bottom"
android:gravity="center"
android:textAlignment="center"
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="@dimen/fcmain_mediumdevice_textsize_medium"
android:shadowColor="@android:color/black"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="1"
android:padding="1dp"
android:textStyle="bold"
android:text=""/>
<ImageView
android:id="@+id/warningactivity_mapinfo"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="14"
android:gravity="center"
android:scaleType="fitXY"
android:layout_gravity="center"
android:layout_centerHorizontal="true">
</ImageView>
<RelativeLayout
android:id="@+id/warningactivity_reservedForFutureUse"
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="center">
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/warningactivity_rainsliderSeekbarContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="center"
android:layout_centerHorizontal="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="1dp"
android:layout_marginBottom="1dp"
android:visibility="invisible"
>
<ImageView
android:id="@+id/warningactivity_rainsliderColors"
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_gravity="center"
android:layout_alignParentTop="true"
android:gravity="center"
android:scaleType="fitXY"
/>
<SeekBar
android:id="@+id/warningactivity_rainsliderSeekbar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:thumb="@drawable/seekthumb"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:splitTrack="false"
android:thumbOffset="5dp"
android:layout_below="@id/warningactivity_rainsliderColors"
android:progress="4"
android:min="0"
android:max="100"
android:thumbTint="@color/seekbar_thumb"
android:progressTint="@color/seekbar_progress"
android:indeterminate="false"
/>
</RelativeLayout>
<ImageView
android:id="@+id/warningactivity_map"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/warningactivity_mapinfo_container"
android:layout_above="@id/warningactivity_rainsliderSeekbarContainer"
android:src="@drawable/germany2_scale1">
</ImageView>
<ImageView
android:id="@+id/closeicon_map"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginTop="10dp"
android:layout_marginLeft="2dp"
android:src="@mipmap/arrow_up">
</ImageView>
<RelativeLayout
android:id="@+id/warningactivity_windicon_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginTop="26dp"
android:layout_marginRight="24dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
@@ -138,17 +250,6 @@
</RelativeLayout>
<ImageView
android:id="@+id/closeicon_map"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginTop="0dp"
android:layout_marginLeft="2dp"
android:src="@mipmap/arrow_up">
</ImageView>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -192,57 +293,6 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/warningactivity_mapinfo_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal"
android:gravity="center"
android:layout_centerVertical="true"
android:weightSum="20">
<TextView
android:id="@+id/warningactivity_rainslidetime"
android:layout_gravity="bottom"
android:gravity="center"
android:textAlignment="center"
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="@dimen/fcmain_mediumdevice_textsize_medium"
android:shadowColor="@android:color/black"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="1"
android:padding="1dp"
android:textStyle="bold"
android:text=""/>
<ImageView
android:id="@+id/warningactivity_mapinfo"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="14"
android:gravity="center"
android:scaleType="fitXY"
android:layout_gravity="center"
android:layout_centerHorizontal="true">
</ImageView>
<RelativeLayout
android:id="@+id/warningactivity_reservedForFutureUse"
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="center">
</RelativeLayout>
</LinearLayout>
<ListView android:id="@+id/warningactivity_listview"
android:layout_width="match_parent"
android:layout_height="0dp"

3
app/src/main/res/values/colors.xml
View File

@@ -77,6 +77,7 @@
<color name="colorSecondary_SolarizedDark">#268bd2</color> <!-- blue -->
<color name="colorChartTemperatureCold_SolarizedDark">#f8c41c</color>
<color name="colorChartTemperatureWarm_SolarizedDark">#889ff8</color>
<color name="colorWarning_clear">#00cc00</color>
<color name="colorWarning_minor">#eeee00</color>
<color name="colorWarning_moderate">#ee6600</color>
@@ -84,6 +85,8 @@
<color name="fcitem_rain">#2222aa</color>
<color name="fcitem_clouds">#aaaaaa</color>
<color name="seekbar_thumb">#00aaff</color>
<color name="seekbar_progress">#0066aa</color>
<color name="colorTextWidget">@color/colorText_DarkTheme</color>