Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
android:name=".MainActivity"
android:launchMode="singleTask"
android:exported="true"
android:windowSoftInputMode="adjustPan"
android:theme="@style/Theme.NetBird.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/res/drawable-night/edit_text_white_focusable.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When focused, show dark background with 3dp white border (focus highlight) -->
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="@color/nb_gray_light" />
<stroke
android:width="3dp"
android:color="@color/white" />
<corners android:radius="2dp" />
</shape>
</item>

<!-- Default state: dark background with 1dp gray border -->
<item>
<shape android:shape="rectangle">
<solid android:color="@color/nb_gray_light" />
<stroke
android:width="1dp"
android:color="#464a52" />
<corners android:radius="2dp" />
</shape>
</item>
</selector>
24 changes: 24 additions & 0 deletions app/src/main/res/drawable/edit_text_white_focusable.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When focused, show white background with 3dp dark border (focus highlight) -->
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#FFFFFF" />
<stroke
android:width="3dp"
android:color="#1C1E21" />
<corners android:radius="2dp" />
</shape>
</item>

<!-- Default state: white background with 1dp gray border -->
<item>
<shape android:shape="rectangle">
<solid android:color="#FFFFFF" />
<stroke
android:width="1dp"
android:color="#ececec" />
<corners android:radius="2dp" />
</shape>
</item>
</selector>
3 changes: 1 addition & 2 deletions app/src/main/res/layout/dialog_simple_edit_text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,12 @@
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginTop="8dp"
android:background="@drawable/edit_text_white"
android:background="@drawable/edit_text_white_focusable"
android:padding="12dp"
android:textColor="@color/nb_txt"
android:textColorHint="@color/nb_txt_light"
android:focusable="true"
android:focusableInTouchMode="true"
android:foreground="@drawable/focus_highlight"
android:autofillHints=""
android:inputType="text"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_advanced.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:autofillHints=""
android:background="@drawable/edit_text_white"
android:background="@drawable/edit_text_white_focusable"
android:focusable="true"
android:focusableInTouchMode="true"
android:focusedByDefault="false"
android:hint="@string/advanced_hint"
android:inputType="textUri"
android:padding="16dp"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/fragment_server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@
android:textSize="14sp"
android:inputType="textUri"
android:imeOptions="actionDone"
android:background="@drawable/edit_text_white"
android:background="@drawable/edit_text_white_focusable"
android:padding="12dp"
android:textColor="@color/nb_txt"
android:textColorHint="@color/nb_txt_light"
android:focusable="true"
android:focusableInTouchMode="true"
android:foreground="@drawable/focus_highlight"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/text_server_label"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -79,11 +78,12 @@
android:textSize="14sp"
android:inputType="textUri"
android:imeOptions="actionDone"
android:background="@drawable/edit_text_white"
android:background="@drawable/edit_text_white_focusable"
android:padding="12dp"
android:textColor="@color/nb_txt"
android:textColorHint="@color/nb_txt_light"
android:foreground="@drawable/focus_highlight"
android:focusable="true"
android:focusableInTouchMode="true"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/text_setup_key_label"
app:layout_constraintStart_toStartOf="parent"
Expand Down
Loading