Skip to content

Commit

Permalink
smoother dark mode: add resource
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kuljeet1998
Kuljeet1998 committed Sep 24, 2024
1 parent ece4cb2 commit 513b0ac
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 59 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/org/ole/planet/myplanet/ui/resources/AddResourceActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class AddResourceActivity : AppCompatActivity() {
val adapter = ArrayAdapter(this, R.layout.rowlayout, R.id.checkBoxRowLayout, list)
listView.choiceMode = ListView.CHOICE_MODE_MULTIPLE
listView.adapter = adapter
AlertDialog.Builder(this).setView(listView).setPositiveButton(R.string.ok) { _: DialogInterface?, _: Int ->
AlertDialog.Builder(this, R.style.AlertDialogTheme).setView(listView).setPositiveButton(R.string.ok) { _: DialogInterface?, _: Int ->
val selected = listView.selectedItemsList
items?.clear()
var selection = ""
Expand Down
119 changes: 61 additions & 58 deletions app/src/main/res/layout/activity_add_resource.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,88 +5,92 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/padding_normal"
tools:context=".ui.resources.AddResourceActivity">
tools:context=".ui.resources.AddResourceActivity"
android:background="@color/card_bg" >

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

android:orientation="vertical" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content" >

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tl_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal"
android:textColorHint="@color/hint_color" >

<EditText
android:id="@+id/et_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/title_asterisk" />
android:hint="@string/title_asterisk"
android:textColor="@color/daynight_textColor" />

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal"
android:textColorHint="@color/hint_color" >

<EditText
android:id="@+id/et_author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/author" />
android:hint="@string/author"
android:textColor="@color/daynight_textColor" />

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal"
android:textColorHint="@color/hint_color" >

<EditText
android:id="@+id/et_year"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/year" />
android:hint="@string/year"
android:textColor="@color/daynight_textColor" />

</com.google.android.material.textfield.TextInputLayout>


</LinearLayout>


<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal"
android:textColorHint="@color/hint_color" >

<EditText
android:id="@+id/et_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/description"
android:lines="3" />
android:lines="3"
android:textColor="@color/daynight_textColor" />

</com.google.android.material.textfield.TextInputLayout>


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

android:layout_height="wrap_content" >

<Spinner
android:id="@+id/spn_lang"
Expand All @@ -97,81 +101,83 @@
android:enabled="false"
android:entries="@array/language"
android:hint="@string/title_asterisk"
android:padding="@dimen/padding_large" />

android:padding="@dimen/padding_large"
android:theme="@style/ResourcePopupMenu" />

<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal"
android:textColorHint="@color/hint_color" >

<EditText
android:id="@+id/et_publisher"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/publisher" />
android:hint="@string/publisher"
android:textColor="@color/daynight_textColor" />

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal"
android:textColorHint="@color/hint_color" >

<EditText
android:id="@+id/et_link_to_license"
android:layout_width="match_parent"
android:layout_height="wrap_content"

android:textColor="@color/daynight_textColor"
android:hint="@string/link_to_license" />

</com.google.android.material.textfield.TextInputLayout>


</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content" >

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tl_subjects"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal" >

<TextView
android:id="@+id/tv_subject"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/subject"
android:textSize="@dimen/text_size_mid" />
android:textSize="@dimen/text_size_mid"
android:textColor="@color/daynight_textColor" />
</com.google.android.material.textfield.TextInputLayout>


<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tl_levels"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal" >

<TextView
android:id="@+id/tv_levels"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/levels"
android:textSize="@dimen/text_size_mid" />
android:textSize="@dimen/text_size_mid"
android:textColor="@color/daynight_textColor" />
</com.google.android.material.textfield.TextInputLayout>


<Spinner
android:id="@+id/spn_open_with"
android:layout_width="0dp"
Expand All @@ -181,30 +187,30 @@
android:enabled="false"
android:entries="@array/open_With"
android:gravity="center"
android:padding="@dimen/padding_large" />

android:padding="@dimen/padding_large"
android:theme="@style/ResourcePopupMenu" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

android:layout_height="wrap_content" >

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tl_resource_for"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal" >

<TextView
android:id="@+id/tv_resource_for"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/resource_for"
android:textSize="@dimen/text_size_mid" />
android:textSize="@dimen/text_size_mid"
android:textColor="@color/daynight_textColor" />
</com.google.android.material.textfield.TextInputLayout>

<Spinner
Expand All @@ -215,8 +221,8 @@
android:layout_weight="1"
android:entries="@array/media"
android:gravity="center"
android:padding="@dimen/padding_large" />

android:padding="@dimen/padding_large"
android:theme="@style/ResourcePopupMenu" />

<Spinner
android:id="@+id/spn_resource_type"
Expand All @@ -226,15 +232,14 @@
android:layout_weight="1"
android:entries="@array/resource_type"
android:gravity="center"
android:padding="@dimen/padding_large" />

android:padding="@dimen/padding_large"
android:theme="@style/ResourcePopupMenu" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

android:layout_height="wrap_content" >

<TextView
android:id="@+id/tv_added_by"
Expand All @@ -244,29 +249,31 @@
android:layout_weight="1"
android:padding="@dimen/padding_large"
android:text="@string/added_by"
android:textSize="@dimen/text_size_mid" />
android:textSize="@dimen/text_size_mid"
android:textColor="@color/daynight_textColor" />

<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal"
android:textColorHint="@color/hint_color" >

<EditText
android:id="@+id/et_open_which"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/open_which_file" />
android:hint="@string/open_which_file"
android:textColor="@color/daynight_textColor" />

</com.google.android.material.textfield.TextInputLayout>


</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/padding_normal">
android:padding="@dimen/padding_normal" >

<TextView
android:id="@+id/file_url"
Expand All @@ -275,10 +282,9 @@
android:layout_gravity="center"
android:padding="@dimen/padding_large"
android:text="@string/file_upload"
android:textColor="@color/md_black_1000"
android:textColor="@color/daynight_textColor"
android:textSize="@dimen/text_size_mid" />


<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -293,21 +299,22 @@
android:layout_gravity="center"
android:gravity="center"
android:text="@string/file_downloadable"
android:visibility="gone" />
android:visibility="gone"
android:theme="@style/ResourcePopupMenu" />
</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right">
android:layout_gravity="right" >

<Button
android:id="@+id/btn_submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="@string/button_submit"
android:theme="@style/PrimaryButton" />
android:theme="@style/AccentButton" />

<Button
android:id="@+id/btn_cancel"
Expand All @@ -317,10 +324,6 @@
android:theme="@style/AccentButton" />

</LinearLayout>


</LinearLayout>
</ScrollView>


</androidx.constraintlayout.widget.ConstraintLayout>
5 changes: 5 additions & 0 deletions app/src/main/res/values-night/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,9 @@
<style name="PopupMenu" parent="ThemeOverlay.AppCompat.Dark">
<item name="android:popupBackground">@color/daynight_grey</item>
</style>

<style name="ResourcePopupMenu" parent="ThemeOverlay.AppCompat.Dark">
<item name="android:popupBackground">@color/daynight_grey</item>
<item name="android:textColor">@color/daynight_textColor</item>
</style>
</resources>
5 changes: 5 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,9 @@
<item name="android:textAllCaps">false</item>
<item name="android:layout_marginTop">10dp</item>
</style>

<style name="ResourcePopupMenu" parent="ThemeOverlay.AppCompat.Light">
<item name="android:popupBackground">@color/md_white_1000</item>
<item name="android:textColor">@color/daynight_textColor</item>
</style>
</resources>

0 comments on commit 513b0ac

Please sign in to comment.