gitnex/GitNex
gitnex/GitNex
Archived
14
57
Fork 14
Code Issues Pull Requests 2 Releases 22 Wiki Activity

Theme and Icons #260

Merged
mmarif merged 15 commits from light-theme into master 2020-03-08 13:52:34 +00:00
Conversation 9 Commits 15 Files Changed 214 +38 -36
9 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dbcd80eace - Show all commits

4
app/src/main/res/layout/fragment_my_repositories.xml
View File

@ -14,7 +14,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="?attr/primaryBackgroundColor"
android:padding="4dp"
android:scrollbars="vertical" />
@ -47,7 +47,7 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:text="@string/noData"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:gravity="center"
android:textSize="20sp"
android:visibility="gone" />

5
app/src/main/res/layout/fragment_settings.xml
View File

@ -2,12 +2,12 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary">
android:background="?attr/primaryBackgroundColor">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor" >
android:background="?attr/primaryBackgroundColor" >
<RelativeLayout
android:layout_width="match_parent"
@ -27,7 +27,6 @@
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:layout_below="@id/timeLayout"
android:background="@color/divider"
/>
<include

4
app/src/main/res/layout/fragment_starred_repositories.xml
View File

@ -14,7 +14,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="?attr/primaryBackgroundColor"
android:padding="4dp"
android:scrollbars="vertical"
/>
@ -28,7 +28,7 @@
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noData"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:visibility="gone" />

21
app/src/main/res/layout/layout_settings_appearance.xml
View File

@ -4,7 +4,7 @@
android:layout_height="wrap_content"
android:id="@+id/layoutTime"
android:orientation="vertical"
android:background="@color/colorPrimary">
android:background="?attr/primaryBackgroundColor">
<TextView
android:id="@+id/tvAppearance"
@ -14,6 +14,7 @@
android:drawableStart="@drawable/ic_color"
android:drawablePadding="20dp"
android:text="@string/settingsAppearanceHeader"
android:textStyle="bold"
android:textColor="@color/colorDarkGreen"/>
<LinearLayout
@ -32,7 +33,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsDateTimeHeaderText"
android:textColor="@color/white"/>
android:textColor="?attr/primaryTextColor"/>
<TextView
android:id="@+id/tvDateTimeSelected"
@ -42,7 +43,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsDateTimeHeaderDefault"
android:textColor="@color/white"/>
android:textColor="?attr/selectedTextColor"/>
</LinearLayout>
@ -61,7 +62,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsIssueBadgeHeaderText"
android:textColor="@color/white"/>
android:textColor="?attr/primaryTextColor"/>
<Switch
android:id="@+id/switchIssuesBadge"
@ -91,7 +92,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/codeBlockHeaderText"
android:textColor="@color/white"/>
android:textColor="?attr/primaryTextColor"/>
<TextView
android:id="@+id/codeBlockSelected"
@ -101,7 +102,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/codeBlockSelectedText"
android:textColor="@color/white"/>
android:textColor="?attr/selectedTextColor"/>
</LinearLayout>
@ -121,7 +122,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsHomeScreenHeaderText"
android:textColor="@color/white"/>
android:textColor="?attr/primaryTextColor"/>
<TextView
android:id="@+id/homeScreenSelected"
@ -131,7 +132,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsHomeScreenSelectedText"
android:textColor="@color/white"/>
android:textColor="?attr/selectedTextColor"/>
</LinearLayout>
@ -151,7 +152,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsCustomFontHeaderText"
android:textColor="@color/white"/>
android:textColor="?attr/primaryTextColor"/>
<TextView
android:id="@+id/customFontSelected"
@ -161,7 +162,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/defaultCopy"
android:textColor="@color/white"/>
android:textColor="?attr/selectedTextColor"/>
</LinearLayout>

7
app/src/main/res/layout/layout_settings_languages.xml
View File

@ -4,7 +4,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_below="@+id/translationDivider"
android:background="@color/colorPrimary">
android:background="?attr/primaryBackgroundColor">
<TextView
android:id="@+id/tvLanguage"
@ -14,6 +14,7 @@
android:drawableStart="@drawable/ic_language"
android:drawablePadding="20dp"
android:text="@string/settingsLanguageHeaderText"
android:textStyle="bold"
android:textColor="@color/colorDarkGreen"/>
<LinearLayout
@ -32,7 +33,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsLanguageSelectorHeader"
android:textColor="@color/white"/>
android:textColor="?attr/primaryTextColor"/>
<TextView
android:id="@+id/tvLanguageSelected"
@ -42,7 +43,7 @@
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsLanguageSelectedHeaderDefault"
android:textColor="@color/white"/>
android:textColor="?attr/selectedTextColor"/>
<TextView
android:id="@+id/helpTranslate"

15
app/src/main/res/layout/my_repos_list.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/backgroundColor" >
android:background="?attr/primaryBackgroundColor" >
<TextView
android:id="@+id/repoType"
@ -20,7 +20,6 @@
android:fitsSystemWindows="true"
android:orientation="vertical"
android:padding="10dp"
android:theme="@style/AppTheme"
tools:context=".activities.MainActivity">
<ImageView
@ -51,7 +50,7 @@
android:layout_weight=".95"
android:layout_marginBottom="5dp"
android:text="@string/repoName"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<ImageView
@ -71,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:text="@string/repoFullname"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
@ -80,7 +79,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/repoDescription"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
android:visibility="gone" />
@ -101,7 +100,7 @@
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:text="@string/repoWatchers"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
@ -114,7 +113,7 @@
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:text="@string/repoStars"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
@ -127,7 +126,7 @@
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:text="@string/repoWatchers"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<ImageView

15
app/src/main/res/layout/starred_repos_list.xml
View File

@ -10,8 +10,7 @@
android:fitsSystemWindows="true"
android:orientation="vertical"
android:padding="10dp"
android:theme="@style/AppTheme"
android:background="@color/backgroundColor"
android:background="?attr/primaryBackgroundColor"
tools:context=".activities.MainActivity">
<TextView
@ -48,7 +47,7 @@
android:layout_weight=".95"
android:layout_marginBottom="5dp"
android:text="@string/repoName"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<ImageView
@ -68,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:text="@string/repoFullname"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
@ -77,7 +76,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/repoDescription"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
android:visibility="gone" />
@ -98,7 +97,7 @@
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:text="@string/repoWatchers"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
<TextView
@ -111,7 +110,7 @@
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:text="@string/repoStars"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
<TextView
@ -124,7 +123,7 @@
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:text="@string/repoWatchers"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
<ImageView

1
app/src/main/res/values/attrs.xml
View File

@ -4,4 +4,5 @@
<attr name="primaryBackgroundColor" format="reference" />
<attr name="inputBackgroundColor" format="reference" />
<attr name="inputTextColor" format="reference" />
<attr name="selectedTextColor" format="reference" />
</resources>

2
app/src/main/res/values/themes.xml
View File

@ -12,6 +12,7 @@
<item name="inputBackgroundColor">@color/inputBackground</item>
<item name="inputTextColor">@color/colorWhite</item>
<item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
</style>
<!-- Light theme -->
@ -25,6 +26,7 @@
<item name="inputBackgroundColor">@color/lightThemeInputBackground</item>
<item name="inputTextColor">@color/lightThemeInputTextColor</item>
<item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
</style>
<style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">