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 +139 -97
24 changed files with 139 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b012a7058d - Show all commits

3
app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
View File

@ -6,7 +6,6 @@ import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.util.Log;
import android.view.Window;
import com.google.gson.JsonElement;
import org.mian.gitnex.R;
import org.mian.gitnex.clients.RetrofitClient;
@ -45,7 +44,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
//supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));

3
app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
View File

@ -8,7 +8,6 @@ import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.util.Log;
import android.view.Window;
import com.google.gson.JsonElement;
import org.mian.gitnex.R;
import org.mian.gitnex.clients.RetrofitClient;
@ -42,7 +41,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
//supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));

25
app/src/main/res/layout/activity_create_issue.xml
View File

@ -45,7 +45,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor">
android:background="?attr/primaryBackgroundColor">
<LinearLayout
android:layout_width="match_parent"
@ -142,16 +142,25 @@
android:textSize="16sp"
android:layout_marginTop="10dp"/>
<Spinner
android:id="@+id/newIssueMilestoneSpinner"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:background="@drawable/shape_dropdown"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
android:layout_marginBottom="10dp" >
<Spinner
android:id="@+id/newIssueMilestoneSpinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"

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

@ -44,7 +44,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor">
android:background="?attr/primaryBackgroundColor">
<LinearLayout
android:layout_width="match_parent"

33
app/src/main/res/layout/activity_create_release.xml
View File

@ -44,7 +44,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor">
android:background="?attr/primaryBackgroundColor">
<LinearLayout
android:layout_width="match_parent"
@ -79,20 +79,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/releaseBranchText"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:layout_marginTop="10dp"
android:textSize="16sp" />
<Spinner
android:id="@+id/releaseBranch"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:background="@drawable/shape_dropdown"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
android:layout_marginBottom="10dp" >
<Spinner
android:id="@+id/releaseBranch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
@ -151,10 +160,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/releaseTypeText"
android:checked="false"
android:checked="true"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:theme="@style/checkBoxTheme"
android:textColor="?attr/primaryTextColor"/>
<CheckBox
@ -162,10 +170,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/releaseDraftText"
android:checked="false"
android:checked="true"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:theme="@style/checkBoxTheme"
android:textColor="?attr/primaryTextColor"/>
<Button

41
app/src/main/res/layout/activity_edit_issue.xml
View File

@ -45,7 +45,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor">
android:background="?attr/primaryBackgroundColor">
<LinearLayout
android:layout_width="match_parent"
@ -59,8 +59,7 @@
android:layout_height="wrap_content"
android:text="@string/newIssueTitle"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
/>
android:textSize="16sp" />
<EditText
android:id="@+id/editIssueTitle"
@ -70,12 +69,11 @@
android:padding="10dp"
android:textSize="14sp"
tools:ignore="Autofill"
android:inputType="textCapSentences|text"
android:labelFor="@+id/editIssueTitle"
android:background="@drawable/shape_inputs"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:textColorHighlight="?attr/primaryTextColor"/>
android:textColorHighlight="?attr/primaryTextColor" />
<TextView
android:layout_width="match_parent"
@ -100,10 +98,10 @@
android:scrollbars="vertical"
android:gravity="top|start"
android:textSize="14sp"
android:textColor="?attr/primaryTextColor"
android:textColorHint="?attr/primaryTextColor"
android:inputType="textCapSentences|textMultiLine"
android:textColorHighlight="?attr/primaryTextColor" />
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:textColorHighlight="?attr/primaryTextColor"
android:inputType="textCapSentences|textMultiLine" />
<TextView
android:layout_width="match_parent"
@ -133,20 +131,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/newIssueMilestoneTitle"
android:textColor="@color/colorWhite"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
android:layout_marginTop="10dp"/>
<Spinner
android:id="@+id/editIssueMilestoneSpinner"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:background="@drawable/shape_dropdown"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
android:layout_marginBottom="10dp" >
<Spinner
android:id="@+id/editIssueMilestoneSpinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
</RelativeLayout>
<Button
android:id="@+id/editIssueButton"

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

@ -37,8 +37,7 @@
<RelativeLayout
android:id="@+id/relativeMainLayoutFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/AppTheme">
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/pullToRefresh"
@ -193,7 +192,7 @@
android:layout_height="1dp"
android:id="@+id/divider"
android:layout_marginTop="15dp"
android:background="@color/divider" />
android:background="?attr/inputBackgroundColor" />
<androidx.recyclerview.widget.RecyclerView
android:layout_below="@+id/divider"

29
app/src/main/res/layout/activity_new_file.xml
View File

@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/colorPrimary">
android:background="?attr/primaryBackgroundColor">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -15,7 +15,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/primaryBackgroundColor"
tools:ignore="UnusedAttribute">
<ImageView
@ -46,7 +46,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor">
android:background="?attr/primaryBackgroundColor">
<LinearLayout
android:layout_width="match_parent"
@ -122,16 +122,25 @@
android:textSize="16sp"
android:layout_marginTop="10dp"/>
<Spinner
android:id="@+id/newFileBranchesSpinner"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:background="@drawable/shape_dropdown"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
android:layout_marginBottom="10dp" >
<Spinner
android:id="@+id/newFileBranchesSpinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"

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

@ -46,7 +46,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor">
android:background="?attr/primaryBackgroundColor">
<LinearLayout
android:layout_width="match_parent"

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

@ -46,7 +46,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor">
android:background="?attr/primaryBackgroundColor">
<LinearLayout
android:layout_width="match_parent"

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

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:background="@color/colorPrimary"
android:background="?attr/primaryBackgroundColor"
tools:context=".activities.OrgDetailActivity">
<com.google.android.material.appbar.AppBarLayout
@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
android:background="?attr/colorPrimary"
android:background="?attr/primaryBackgroundColor"
app:layout_scrollFlags="enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/app_name">
@ -32,6 +32,7 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="18sp"
android:textColor="?attr/primaryTextColor"
android:id="@+id/toolbar_title" />
</androidx.appcompat.widget.Toolbar>
@ -40,6 +41,7 @@
android:id="@+id/tabs"
app:tabTextAppearance="@style/customTabLayout"
app:tabMode="scrollable"
app:tabTextColor="?attr/primaryTextColor"
android:layout_width="match_parent"
android:layout_height="wrap_content">

10
app/src/main/res/layout/activity_reply_to_issue.xml
View File

@ -57,7 +57,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundColor">
android:background="?attr/primaryBackgroundColor">
<LinearLayout
android:layout_width="match_parent"
@ -80,10 +80,10 @@
android:scrollbars="vertical"
android:gravity="top|start"
android:textSize="14sp"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:inputType="textCapSentences|textMultiLine"
android:textColorHighlight="@color/white" />
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/primaryBackgroundColor"
android:textColorHighlight="?attr/primaryTextColor"
android:inputType="textCapSentences|textMultiLine" />
<Button
android:id="@+id/replyButton"

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

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

3
app/src/main/res/layout/custom_multi_select.xml
View File

@ -24,7 +24,6 @@
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:iconifiedByDefault="true"
android:theme="@style/ThemeOverlay.AppCompat.Dark"
android:queryHint="Search" />
<LinearLayout
@ -41,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:theme="@style/checkBoxTheme"
android:textColor="?attr/primaryTextColor"
android:clickable="false" />
<TextView

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

@ -47,7 +47,7 @@
android:id="@+id/recyclerViewReposSearch"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="?attr/primaryBackgroundColor"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_marginTop="5dp"

4
app/src/main/res/layout/fragment_members_by_org.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="match_parent"
android:background="@color/colorPrimary"
android:background="?attr/primaryBackgroundColor"
android:orientation="vertical">
<GridView
@ -23,7 +23,7 @@
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataMembers"
android:textColor="@color/white"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:visibility="gone" />

8
app/src/main/res/layout/fragment_organization_info.xml
View File

@ -40,7 +40,7 @@
android:textIsSelectable="true"
android:textSize="16sp"
android:paddingTop="5dp"
android:textColor="@color/colorWhite"/>
android:textColor="?attr/primaryTextColor"/>
<TextView
android:layout_width="match_parent"
@ -57,7 +57,7 @@
android:textIsSelectable="true"
android:textSize="16sp"
android:paddingTop="5dp"
android:textColor="@color/colorWhite"/>
android:textColor="?attr/primaryTextColor"/>
<TextView
android:layout_width="match_parent"
@ -76,7 +76,7 @@
android:paddingTop="5dp"
android:textColorLink="@color/lightBlue"
android:autoLink="web"
android:textColor="@color/colorWhite"/>
android:textColor="?attr/primaryTextColor"/>
<TextView
android:layout_width="match_parent"
@ -94,7 +94,7 @@
android:textSize="16sp"
android:paddingTop="5dp"
android:autoLink="web"
android:textColor="@color/colorWhite"/>
android:textColor="?attr/primaryTextColor"/>
</LinearLayout>

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

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

4
app/src/main/res/layout/fragment_repositories_by_org.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" />

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

@ -12,7 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:theme="@style/checkBoxTheme"
android:textColor="?attr/primaryTextColor"
android:clickable="false" />
<TextView

16
app/src/main/res/layout/repo_bottom_sheet_layout.xml
View File

@ -77,7 +77,13 @@
android:textSize="16sp"
android:padding="16dp" />
<View style="@style/lineDividerHorizontal" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginStart="64dp"
android:background="?attr/inputBackgroundColor" />
<TextView
android:id="@+id/addCollaborator"
@ -139,7 +145,13 @@
android:textSize="16sp"
android:padding="16dp" />
<View style="@style/lineDividerHorizontal" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginStart="64dp"
android:background="?attr/inputBackgroundColor" />
<TextView
android:id="@+id/openWebRepo"

16
app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
View File

@ -90,7 +90,13 @@
android:textSize="16sp"
android:padding="16dp" />
<View style="@style/lineDividerHorizontal" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginStart="64dp"
android:background="?attr/inputBackgroundColor" />
<TextView
android:id="@+id/copyIssueUrl"
@ -104,7 +110,13 @@
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<View style="@style/lineDividerHorizontal" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginStart="64dp"
android:background="?attr/inputBackgroundColor" />
<TextView
android:id="@+id/closeIssue"

16
app/src/main/res/values/styles.xml
View File

@ -5,11 +5,6 @@
<item name="android:textSize">16sp</item>
</style>
<style name="checkBoxTheme" parent="Theme.AppCompat.Dialog.Alert">
<item name="colorControlNormal">@color/white</item>
<item name="colorControlActivated">@color/white</item>
</style>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
@ -19,21 +14,10 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="customTabLayout" parent="TextAppearance.Design.Tab">
<item name="android:textSize">16sp</item>
</style>
<style name="lineDividerHorizontal">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
<item name="android:background">@color/divider</item>
<item name="android:layout_marginStart">64dp</item>
<item name="android:layout_marginTop">10dp</item>
<item name="android:layout_marginBottom">10dp</item>
</style>
<style name="radioButtonsInDarkTheme" parent="Theme.AppCompat.Dialog.Alert">
<item name="colorControlNormal">@color/white</item>
<item name="colorControlActivated">@color/white</item>

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

@ -17,6 +17,7 @@
<item name="dialogTheme">@style/AppThemeConfirmDialog</item>
<item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
</style>
<!-- Dark theme - default -->
<!-- Light theme -->
<style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@ -34,6 +35,7 @@
<item name="dialogTheme">@style/AppThemeLightConfirmDialog</item>
<item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
</style>
<!-- Light theme -->
<style name="AppThemeConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:background">@color/colorPrimary</item>