Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switch customize

Browse source
This commit is contained in:
androiddevkkotlin 2020-11-07 15:39:50 +02:00
parent c3d88ab231
commit 7ba46570a0
7 changed files with 154 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/drawable/layout_bg_dark.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1dp" android:color="#2F3030" />
<corners android:radius="6dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

6
OsmAnd/res/drawable/layout_bg_dark_solid.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#2F3030"/>
<corners android:radius="6dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

6
OsmAnd/res/drawable/layout_bg_solid.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#F0F0F0"/>
<corners android:radius="6dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

18
OsmAnd/res/layout/send_osm_note_fragment.xml
View file

@ -21,8 +21,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:textSize="@dimen/default_desc_text_size"
android:text = "@string/osm_notes" />
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium"
android:text = "@string/osm_notes"
android:letterSpacing="@dimen/text_button_letter_spacing"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/message_label"
@ -41,12 +43,16 @@
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/upload_anonymously_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:minHeight="@dimen/context_menu_buttons_bottom_height"
android:text="@string/upload_anonymously"
android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
android:paddingLeft="@dimen/context_menu_padding_margin_medium"
android:background="@drawable/layout_bg"/>
android:paddingBottom="@dimen/content_padding_small"
android:paddingTop="@dimen/content_padding_small"
android:text="@string/upload_anonymously"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
android:letterSpacing="@dimen/text_button_letter_spacing"
osmand:typeface="@string/font_roboto_regular"/>
</LinearLayout>

11
OsmAnd/res/layout/send_poi_fragment.xml
View file

@ -22,7 +22,9 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/upload_poi"
android:textSize="@dimen/default_desc_text_size" />
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium"
android:letterSpacing="@dimen/text_button_letter_spacing"/>
<com.google.android.material.textfield.TextInputLayout
@ -46,8 +48,11 @@
android:layout_marginBottom="@dimen/content_padding"
android:minHeight="@dimen/context_menu_buttons_bottom_height"
android:text="@string/close_changset"
android:paddingLeft="@dimen/context_menu_padding_margin_medium"
android:background="@drawable/layout_bg"/>
android:paddingLeft="50dp"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular"
android:letterSpacing="@dimen/text_button_letter_spacing"/>
</LinearLayout>

19
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus.osmedit.dialogs;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import android.widget.CompoundButton;
@ -40,17 +41,26 @@ public class SendOsmNoteBottomSheetFragment extends MenuBottomSheetDialogFragmen
@Override
public void createMenuItems(Bundle savedInstanceState) {
String userName = getMyApplication().getSettings().USER_DISPLAY_NAME.get();
final boolean isNightMode = !getMyApplication().getSettings().isLightContent();
final View sendOsmNoteView = View.inflate(getContext(), R.layout.send_osm_note_fragment, null);
final LinearLayout accountBlockView = (LinearLayout) sendOsmNoteView.findViewById(R.id.account_block);
final SwitchCompat uploadAnonymously = (SwitchCompat) sendOsmNoteView.findViewById(R.id.upload_anonymously_switch);
final TextView accountName = (TextView) sendOsmNoteView.findViewById(R.id.user_name);
final LinearLayout accountBlockView = sendOsmNoteView.findViewById(R.id.account_block);
final SwitchCompat uploadAnonymously = sendOsmNoteView.findViewById(R.id.upload_anonymously_switch);
final TextView accountName = sendOsmNoteView.findViewById(R.id.user_name);
String userName = getMyApplication().getSettings().USER_DISPLAY_NAME.get();
accountName.setText(userName);
accountBlockView.setVisibility(View.VISIBLE);
uploadAnonymously.setBackgroundResource(isNightMode ? R.drawable.layout_bg_dark : R.drawable.layout_bg);
uploadAnonymously.setPadding(30, 0, 0, 0);
uploadAnonymously.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
accountBlockView.setVisibility(isChecked ? View.GONE : View.VISIBLE);
if (isNightMode) {
uploadAnonymously.setBackgroundResource(isChecked ? R.drawable.layout_bg_dark_solid : R.drawable.layout_bg_dark);
} else {
uploadAnonymously.setBackgroundResource(isChecked ? R.drawable.layout_bg_solid : R.drawable.layout_bg);
}
uploadAnonymously.setPadding(30, 0, 0, 0);
}
});
final SimpleBottomSheetItem titleItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
@ -117,5 +127,4 @@ public class SendOsmNoteBottomSheetFragment extends MenuBottomSheetDialogFragmen
protected int getRightBottomButtonTextId() {
return R.string.shared_string_upload;
}
}

22
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java
View file

@ -2,6 +2,7 @@ package net.osmand.plus.osmedit.dialogs;
import android.os.Bundle;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.TextView;
@ -35,12 +36,27 @@ public class SendPoiBottomSheetFragment extends MenuBottomSheetDialogFragment {
@Override
public void createMenuItems(Bundle savedInstanceState) {
final boolean isNightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
final View sendOsmPoiView = View.inflate(getContext(), R.layout.send_poi_fragment, null);
final SwitchCompat closeChangset = sendOsmPoiView.findViewById(R.id.close_change_set_checkbox);
final TextView accountName = (TextView) sendOsmPoiView.findViewById(R.id.user_name);
String userName = getMyApplication().getSettings().USER_DISPLAY_NAME.get();
final View sendOsmNoteView = View.inflate(getContext(), R.layout.send_poi_fragment, null);
final TextView accountName = (TextView) sendOsmNoteView.findViewById(R.id.user_name);
accountName.setText(userName);
closeChangset.setBackgroundResource(isNightMode ? R.drawable.layout_bg_dark : R.drawable.layout_bg);
closeChangset.setPadding(30, 0, 0, 0);
closeChangset.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isNightMode) {
closeChangset.setBackgroundResource(isChecked ? R.drawable.layout_bg_dark_solid : R.drawable.layout_bg_dark);
} else {
closeChangset.setBackgroundResource(isChecked ? R.drawable.layout_bg_solid : R.drawable.layout_bg);
}
closeChangset.setPadding(30, 0, 0, 0);
}
});
final SimpleBottomSheetItem titleItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
.setCustomView(sendOsmNoteView)
.setCustomView(sendOsmPoiView)
.create();
items.add(titleItem);
}