make changes in the UI
This commit is contained in:
@@ -264,7 +264,7 @@ public class BraveNewTabPageLayout extends NewTabPageLayout {
|
||||
private void showWidgetBasedOnOrder() {
|
||||
if (ntpWidgetViewPager != null) {
|
||||
int selectedOrder = NTPWidgetManager.getInstance().getNTPWidgetOrder();
|
||||
// ntpWidgetViewPager.setCurrentItem(selectedOrder);
|
||||
ntpWidgetViewPager.setCurrentItem(selectedOrder);
|
||||
updateAndShowIndicators(selectedOrder);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,6 +88,7 @@ public class NTPWidgetAdapter extends PagerAdapter {
|
||||
updateBraveStats(mainView);
|
||||
} else if (ntpWidgetItem.getWidgetType().equals(NTPWidgetManager.PREF_BINANCE)) {
|
||||
Button connectButton = mainView.findViewById(R.id.btn_connect);
|
||||
LinearLayout bianceDisconnectLayout= mainView.findViewById(R.id.binance_disconnect_layout);
|
||||
LinearLayout binanceWidgetLayout =
|
||||
mainView.findViewById(R.id.binance_widget_layout);
|
||||
TextView binanceBalanceText =
|
||||
@@ -106,10 +107,10 @@ public class NTPWidgetAdapter extends PagerAdapter {
|
||||
}
|
||||
if (BinanceWidgetManager.getInstance().isUserAuthenticatedForBinance()) {
|
||||
binanceWidgetLayout.setVisibility(View.VISIBLE);
|
||||
connectButton.setVisibility(View.GONE);
|
||||
bianceDisconnectLayout.setVisibility(View.GONE);
|
||||
} else {
|
||||
binanceWidgetLayout.setVisibility(View.GONE);
|
||||
connectButton.setVisibility(View.VISIBLE);
|
||||
bianceDisconnectLayout.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
container.addView(mainView);
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ public class BinanceWidgetManager {
|
||||
public static final String BINANCE_US =
|
||||
"https://www.binance.us/en/buy-sell-crypto?crypto=%1$s&amount=%2$s&ref=35089877&utm_source=brave";
|
||||
public static final String BINANCE_COM =
|
||||
"https://www.binance.com/en/buy-sell-crypto?fiat=%1$s&crypto=%2$s&amount=%3$s&ref=39346846&utm_source=brave";
|
||||
"https://www.binance.com/en/buy-sell-crypto?fiat=%1$s&crypto=%2$s&amount=%3$s&ref=W4GYNUAJ&utm_source=brave";
|
||||
|
||||
private static BinanceWidgetManager sInstance;
|
||||
|
||||
|
||||
@@ -28,10 +28,7 @@ public class BraveTileWithTextView extends TileWithTextView {
|
||||
@Override
|
||||
public void setTitle(String title, int titleLines) {
|
||||
super.setTitle(title, titleLines);
|
||||
// TextView mTitleView = findViewById(R.id.tile_view_title);
|
||||
// if (BravePrefServiceBridge.getInstance().getBoolean(BravePref.NTP_SHOW_BACKGROUND_IMAGE)
|
||||
// && NTPUtil.shouldEnableNTPFeature()) {
|
||||
// mTitleView.setTextColor(getResources().getColor(android.R.color.white));
|
||||
// }
|
||||
TextView mTitleView = findViewById(R.id.tile_view_title);
|
||||
mTitleView.setTextColor(getResources().getColor(android.R.color.black));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#17171F"
|
||||
android:padding="8dp"
|
||||
android:orientation="vertical">
|
||||
@@ -43,18 +43,36 @@
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="36dp"
|
||||
android:layout_marginEnd="36dp">
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_connect"
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:id="@+id/binance_disconnect_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/rounded_filled_binance"
|
||||
android:layout_gravity="center"
|
||||
android:padding="16dp"
|
||||
android:text="Connect" />
|
||||
android:visibility="gone"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/binance_disconnect_text"
|
||||
android:textColor="#FFFFFF"
|
||||
android:layout_marginEnd="4dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_connect"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/rounded_filled_binance"
|
||||
android:layout_gravity="center"
|
||||
android:padding="16dp"
|
||||
android:text="@string/continue_button" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/binance_widget_layout"
|
||||
|
||||
@@ -87,6 +87,7 @@
|
||||
android:padding="8dp"
|
||||
android:background="@drawable/binance_edittext"
|
||||
style="@android:style/Widget.Spinner"
|
||||
android:popupBackground="@color/spinner_bg_color"
|
||||
android:spinnerMode="dropdown"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -102,6 +103,7 @@
|
||||
android:padding="8dp"
|
||||
style="@android:style/Widget.Spinner"
|
||||
android:background="@drawable/binance_edittext"
|
||||
android:popupBackground="@color/spinner_bg_color"
|
||||
android:spinnerMode="dropdown"/>
|
||||
|
||||
<Button
|
||||
|
||||
@@ -211,6 +211,7 @@
|
||||
android:textColor="@android:color/white"
|
||||
android:padding="8dp"
|
||||
android:background="@drawable/binance_edittext"
|
||||
android:popupBackground="@color/spinner_bg_color"
|
||||
style="@android:style/Widget.Spinner"
|
||||
android:spinnerMode="dropdown"/>
|
||||
|
||||
@@ -226,6 +227,7 @@
|
||||
android:textColor="@android:color/white"
|
||||
android:padding="8dp"
|
||||
style="@android:style/Widget.Spinner"
|
||||
android:popupBackground="@color/spinner_bg_color"
|
||||
android:background="@drawable/binance_edittext"
|
||||
android:spinnerMode="dropdown"/>
|
||||
|
||||
|
||||
@@ -53,4 +53,5 @@
|
||||
<color name="brave_stats_close_button_color">#F0F2FF</color>
|
||||
<color name="brave_stats_radio_group_bg">#17171F</color>
|
||||
<color name="brave_stats_radio_button_active">#3B3E4F</color>
|
||||
<color name="spinner_bg_color">#212529</color>
|
||||
</resources>
|
||||
|
||||
@@ -112,4 +112,5 @@
|
||||
<color name="brave_stats_radio_button_active">@android:color/white</color>
|
||||
|
||||
<color name="topsite_bg_color">#DADCE8</color>
|
||||
<color name="spinner_bg_color">#DADCE8</color>
|
||||
</resources>
|
||||
|
||||
@@ -1309,10 +1309,10 @@ until they verify, or until 90 days have passed.
|
||||
Enable "Night Mode" (Experimental)
|
||||
</message>
|
||||
<message name="IDS_MENU_EDIT" desc="NTP widget menu item">
|
||||
Edit
|
||||
Edit Stack
|
||||
</message>
|
||||
<message name="IDS_MENU_REMOVE" desc="NTP widget menu item">
|
||||
Remove
|
||||
Remove Widget
|
||||
</message>
|
||||
<message name="IDS_MENU_LEARN_MORE" desc="NTP widget menu item">
|
||||
Learn More
|
||||
@@ -1386,6 +1386,9 @@ until they verify, or until 90 days have passed.
|
||||
<message name="IDS_BUY" desc="Binance detail section title.">
|
||||
Buy
|
||||
</message>
|
||||
<message name="IDS_BINANCE_DISCONNECT_TEXT" desc="Binance disconnected state text.">
|
||||
Enable Binance connection to view Binance account balance and trade crypto.
|
||||
</message>
|
||||
</messages>
|
||||
</release>
|
||||
</grit>
|
||||
|
||||
Reference in New Issue
Block a user