shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added theme selection to settings, updated login layout.

Browse Source
This commit is contained in:
M M Arif
2020-03-06 01:56:42 +05:00
parent b012a7058d
commit 14addf5ed0
12 changed files with 196 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/drawable/ic_arrow_back_24dp.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="24dp"
android:tint="#368F73" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>

51
app/src/main/res/layout/activity_login.xml
View File

@ -64,30 +64,35 @@
</RadioGroup>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_dropdown"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" >
<Spinner
android:id="@+id/httpsSpinner"
android:layout_width="120dp"
android:layout_height="44dp"
android:dropDownWidth="120dp"
android:background="@drawable/spinner"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:paddingTop="10dp" />
android:spinnerMode="dropdown"
android:padding="10dp" />
</RelativeLayout>
<LinearLayout
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/info"
android:layout_width="28dp"
android:layout_height="28dp"
android:src="@drawable/ic_info_24dp"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:layout_marginStart="120dp"
android:layout_marginTop="10dp"
android:contentDescription="@string/urlInfoTooltip"
/>
@ -106,8 +111,8 @@
android:inputType="textUri"
android:background="@drawable/shape_inputs"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:textColorHighlight="?attr/primaryTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/hintColor"
android:hint="@string/instanceUrl" />
<EditText
@ -122,8 +127,8 @@
android:drawablePadding="10dp"
android:background="@drawable/shape_inputs"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:textColorHighlight="?attr/primaryTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/hintColor"
android:hint="@string/userName"
android:inputType="text" />
@ -139,8 +144,8 @@
android:drawablePadding="10dp"
android:background="@drawable/shape_inputs"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:textColorHighlight="?attr/primaryTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/hintColor"
android:hint="@string/passWord"
android:inputType="textPassword" />
@ -156,8 +161,8 @@
android:drawablePadding="10dp"
android:background="@drawable/shape_inputs"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:textColorHighlight="?attr/primaryTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/hintColor"
android:hint="@string/loginOTP"
android:inputType="number" />
@ -173,8 +178,8 @@
android:drawablePadding="10dp"
android:background="@drawable/shape_inputs"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:textColorHighlight="?attr/primaryTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/hintColor"
android:hint="@string/copyToken"
android:inputType="text"
android:visibility="gone" />

2
app/src/main/res/layout/activity_org_detail.xml
View File

@ -13,7 +13,6 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
@ -42,6 +41,7 @@
app:tabTextAppearance="@style/customTabLayout"
app:tabMode="scrollable"
app:tabTextColor="?attr/primaryTextColor"
android:background="?attr/primaryBackgroundColor"
android:layout_width="match_parent"
android:layout_height="wrap_content">

1
app/src/main/res/layout/activity_repo_detail.xml
View File

@ -13,7 +13,6 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar

1
app/src/main/res/layout/fragment_profile.xml
View File

@ -80,6 +80,7 @@
app:tabTextAppearance="@style/customTabLayout"
android:layout_width="match_parent"
app:tabTextColor="?attr/primaryTextColor"
android:background="?attr/primaryBackgroundColor"
android:layout_height="wrap_content">
<com.google.android.material.tabs.TabItem

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

@ -17,6 +17,66 @@
android:textStyle="bold"
android:textColor="@color/colorDarkGreen"/>
<LinearLayout
android:id="@+id/themeSelectionFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/themeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/themeSelectionHeaderText"
android:textColor="?attr/primaryTextColor"/>
<TextView
android:id="@+id/themeSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/themeSelectionSelectedText"
android:textColor="?attr/selectedTextColor"/>
</LinearLayout>
<LinearLayout
android:id="@+id/customFontFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/customFontHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsCustomFontHeaderText"
android:textColor="?attr/primaryTextColor"/>
<TextView
android:id="@+id/customFontSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/defaultCopy"
android:textColor="?attr/selectedTextColor"/>
</LinearLayout>
<LinearLayout
android:id="@+id/timeFrame"
android:layout_width="match_parent"
@ -136,34 +196,4 @@
</LinearLayout>
<LinearLayout
android:id="@+id/customFontFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/customFontHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/settingsCustomFontHeaderText"
android:textColor="?attr/primaryTextColor"/>
<TextView
android:id="@+id/customFontSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/defaultCopy"
android:textColor="?attr/selectedTextColor"/>
</LinearLayout>
</LinearLayout>

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

@ -3,6 +3,7 @@
<attr name="primaryTextColor" format="reference"/>
<attr name="primaryBackgroundColor" format="reference" />
<attr name="inputBackgroundColor" format="reference" />
<attr name="hintColor" format="reference" />
<attr name="inputTextColor" format="reference" />
<attr name="selectedTextColor" format="reference" />
<attr name="alertDialogTheme" format="reference" />

10
app/src/main/res/values/strings.xml
View File

@ -259,6 +259,12 @@
<string name="settingsHomeScreenHeaderText">Home Screen</string>
<string name="settingsHomeScreenSelectedText">My Repositories</string>
<string name="settingshomeScreenSelectorDialogTitle">Select Home Screen</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="themeSelectionSelectedText" translatable="false">Dark</string>
<!-- settings -->
<string name="noMoreData">No more data available</string>
@ -543,8 +549,4 @@
<string name="mergePRSuccessMsg">Pull Request was merged successfully</string>
<string name="mergePR404ErrorMsg">Pull Request is not available for merge</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
</resources>

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

@ -14,8 +14,11 @@
<item name="inputTextColor">@color/colorWhite</item>
<item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
<item name="dialogTheme">@style/AppThemeConfirmDialog</item>
<item name="alertDialogTheme">@style/AppThemeConfirmDialog</item>
<item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
<item name="autoCompleteTextViewStyle">@style/AppThemeDarkSearchAutoCompleteTextView</item>
<item name="hintColor">@color/hintColor</item>
</style>
<!-- Dark theme - default -->
@ -32,41 +35,51 @@
<item name="inputTextColor">@color/lightThemeInputTextColor</item>
<item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
<item name="dialogTheme">@style/AppThemeLightConfirmDialog</item>
<item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
<item name="alertDialogTheme">@style/AppThemeLightConfirmDialog</item>
<item name="popupMenuStyle">@style/AppThemeLightPopupMenuStyle</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
<item name="autoCompleteTextViewStyle">@style/AppThemeLightSearchAutoCompleteTextView</item>
<item name="hintColor">@color/hintColor</item>
</style>
<!-- Light theme -->
<style name="AppThemeLightSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
<item name="android:textColor">@color/lightThemeTextColor</item>
<item name="android:textColorHint">@color/lightThemeTextColor</item>
</style>
<style name="AppThemeDarkSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
<item name="android:textColor">@color/colorWhite</item>
<item name="android:textColorHint">@color/colorWhite</item>
</style>
<style name="AppThemeConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:background">@color/colorPrimary</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textColorPrimary">@color/white</item>
<item name="android:textColor">@color/white</item>
<item name="colorControlNormal">@color/white</item>
<item name="colorControlActivated">@color/white</item>
<item name="colorControlActivated">@color/darkGreen</item>
</style>
<style name="AppThemeLightConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:background">@color/colorPrimary</item>
<item name="android:textColorPrimary">@color/colorPrimary</item>
<style name="AppThemeLightConfirmDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:background">@color/white</item>
<item name="android:textColorPrimary">@color/lightThemeTextColor</item>
<item name="android:textColor">@color/lightThemeTextColor</item>
<item name="colorControlNormal">@color/lightThemeTextColor</item>
<item name="colorControlActivated">@color/lightThemeTextColor</item>
<item name="colorControlActivated">@color/darkGreen</item>
</style>
<style name="AppThemePopupMenuStyle">
<item name="android:itemBackground">@color/colorPrimary</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:colorBackground">@color/colorPrimary</item>
<style name="AppThemePopupMenuStyle" parent="Widget.AppCompat.PopupMenu">
<item name="android:popupBackground">@color/colorPrimary</item>
<item name="android:textColor">@color/white</item>
<item name="android:layout_marginStart">3dp</item>
<item name="android:layout_marginEnd">3dp</item>
</style>
<style name="AppThemeLightPopupMenuStyle">
<style name="AppThemeLightPopupMenuStyle" parent="Widget.AppCompat.Light.PopupMenu">
<item name="android:popupBackground">@color/white</item>
<item name="android:itemBackground">@color/lightThemeBackground</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@color/lightThemeTextColor</item>
<item name="android:colorBackground">@color/lightThemeBackground</item>
<item name="android:layout_marginStart">3dp</item>
<item name="android:layout_marginEnd">3dp</item>
</style>